@dxos/plugin-client 0.10.0 → 0.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -19,33 +19,33 @@
         "default": "./src/capabilities/index.ts"
       },
       "types": "./dist/types/src/capabilities/index.d.ts",
-      "node": "./dist/lib/neutral/capabilities/node.mjs",
-      "default": "./dist/lib/neutral/capabilities/index.mjs"
+      "node": "./dist/lib/capabilities/node.mjs",
+      "default": "./dist/lib/capabilities.mjs"
     },
     "#capabilities/node": {
       "source": "./src/capabilities/node.ts",
       "types": "./dist/types/src/capabilities/node.d.ts",
-      "default": "./dist/lib/neutral/capabilities/node.mjs"
+      "default": "./dist/lib/capabilities/node.mjs"
     },
     "#components": {
       "source": "./src/components/index.ts",
       "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+      "default": "./dist/lib/components.mjs"
     },
     "#containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
-      "default": "./dist/lib/neutral/containers/index.mjs"
+      "default": "./dist/lib/containers.mjs"
     },
     "#meta": {
       "source": "./src/meta.ts",
       "types": "./dist/types/src/meta.d.ts",
-      "default": "./dist/lib/neutral/meta.mjs"
+      "default": "./dist/lib/meta.mjs"
     },
     "#operations": {
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
-      "default": "./dist/lib/neutral/operations/index.mjs"
+      "default": "./dist/lib/operations.mjs"
     },
     "#plugin": {
       "source": {
@@ -54,46 +54,46 @@
         "default": "./src/ClientPlugin.ts"
       },
       "types": "./dist/types/src/ClientPlugin.d.ts",
-      "workerd": "./dist/lib/neutral/ClientPlugin.workerd.mjs",
-      "node": "./dist/lib/neutral/ClientPlugin.node.mjs",
-      "default": "./dist/lib/neutral/ClientPlugin.mjs"
+      "workerd": "./dist/lib/ClientPlugin.workerd.mjs",
+      "node": "./dist/lib/ClientPlugin.node.mjs",
+      "default": "./dist/lib/ClientPlugin.mjs"
     },
     "#testing": {
       "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
-      "default": "./dist/lib/neutral/testing/index.mjs"
+      "default": "./dist/lib/testing.mjs"
     },
     "#translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "default": "./dist/lib/translations.mjs"
     },
     "#types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "default": "./dist/lib/types.mjs"
     }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "default": "./dist/lib/neutral/index.mjs"
+      "import": "./dist/lib/index.mjs"
     },
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
-      "default": "./dist/lib/neutral/plugin.mjs"
+      "import": "./dist/lib/plugin.mjs"
     },
     "./testing": {
       "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
-      "default": "./dist/lib/neutral/testing/index.mjs"
+      "import": "./dist/lib/testing.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "import": "./dist/lib/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -103,41 +103,46 @@
     "src"
   ],
   "dependencies": {
+    "@effect-atom/atom": "^0.5.3",
     "@effect/cli": "0.75.2",
     "@effect/platform": "0.96.2",
     "effect": "3.21.4",
     "react-qr-rounded": "^1.0.0",
     "yaml": "^2.8.2",
-    "@dxos/app-framework": "0.10.0",
-    "@dxos/app-toolkit": "0.10.0",
-    "@dxos/cli-util": "0.10.0",
-    "@dxos/client": "0.10.0",
-    "@dxos/client-protocol": "0.10.0",
-    "@dxos/context": "0.10.0",
-    "@dxos/compute": "0.10.0",
-    "@dxos/config": "0.10.0",
-    "@dxos/credentials": "0.10.0",
-    "@dxos/echo-client": "0.10.0",
-    "@dxos/echo": "0.10.0",
-    "@dxos/edge-client": "0.10.0",
-    "@dxos/effect": "0.10.0",
-    "@dxos/functions": "0.10.0",
-    "@dxos/echo-protocol": "0.10.0",
-    "@dxos/invariant": "0.10.0",
-    "@dxos/client-services": "0.10.0",
-    "@dxos/keys": "0.10.0",
-    "@dxos/log": "0.10.0",
-    "@dxos/plugin-graph": "0.10.0",
-    "@dxos/plugin-observability": "0.10.0",
-    "@dxos/protocols": "0.10.0",
-    "@dxos/react-client": "0.10.0",
-    "@dxos/react-ui-form": "0.10.0",
-    "@dxos/async": "0.10.0",
-    "@dxos/react-ui-list": "0.10.0",
-    "@dxos/react-ui-pickers": "0.10.0",
-    "@dxos/react-ui-syntax-highlighter": "0.10.0",
-    "@dxos/util": "0.10.0",
-    "@dxos/shell": "0.10.0"
+    "@dxos/app-framework": "0.11.1",
+    "@dxos/app-toolkit": "0.11.1",
+    "@dxos/async": "0.11.1",
+    "@dxos/cli-util": "0.11.1",
+    "@dxos/client": "0.11.1",
+    "@dxos/client-protocol": "0.11.1",
+    "@dxos/client-services": "0.11.1",
+    "@dxos/compute": "0.11.1",
+    "@dxos/compute-runtime": "0.11.1",
+    "@dxos/config": "0.11.1",
+    "@dxos/context": "0.11.1",
+    "@dxos/credentials": "0.11.1",
+    "@dxos/echo": "0.11.1",
+    "@dxos/echo-client": "0.11.1",
+    "@dxos/echo-protocol": "0.11.1",
+    "@dxos/edge-client": "0.11.1",
+    "@dxos/effect": "0.11.1",
+    "@dxos/errors": "0.11.1",
+    "@dxos/halo": "0.11.1",
+    "@dxos/halo-adapter-client": "0.11.1",
+    "@dxos/halo-react": "0.11.1",
+    "@dxos/invariant": "0.11.1",
+    "@dxos/keys": "0.11.1",
+    "@dxos/log": "0.11.1",
+    "@dxos/plugin-graph": "0.11.1",
+    "@dxos/plugin-observability": "0.11.1",
+    "@dxos/protocols": "0.11.1",
+    "@dxos/react-client": "0.11.1",
+    "@dxos/react-ui-form": "0.11.1",
+    "@dxos/react-ui-list": "0.11.1",
+    "@dxos/react-ui-pickers": "0.11.1",
+    "@dxos/react-ui-syntax-highlighter": "0.11.1",
+    "@dxos/shell": "0.11.1",
+    "@dxos/util": "0.11.1"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -147,11 +152,11 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "vite": "^8.0.16",
-    "@dxos/react-ui": "0.10.0",
-    "@dxos/plugin-testing": "0.10.0",
-    "@dxos/storybook-utils": "0.10.0",
-    "@dxos/ui-theme": "0.10.0"
+    "vite": "^8.1.4",
+    "@dxos/plugin-testing": "0.11.1",
+    "@dxos/react-ui": "0.11.1",
+    "@dxos/storybook-utils": "0.11.1",
+    "@dxos/ui-theme": "0.11.1"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -159,8 +164,8 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "@dxos/ui-theme": "0.10.0",
-    "@dxos/react-ui": "0.10.0"
+    "@dxos/react-ui": "^0.11.1",
+    "@dxos/ui-theme": "^0.11.1"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientPlugin.ts

@@ -13,10 +13,14 @@ import {
   LayerSpecs,
   Migrations,
   NavigationHandler,
+  NavigationTargetLoader,
   OperationHandler,
   ReactContext,
   ReactSurface,
+  RemoteTraceMonitor,
   SchemaDefs,
+  SpaceReplicationProgress,
+  TraceProgress,
 } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';
@@ -25,8 +29,8 @@ import { type ClientPluginOptions } from '#types';
 
 export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addNavigationHandlerModule(({ invitationProp }) => ({
-    activate: () => NavigationHandler({ invitationProp }),
+  AppPlugin.addNavigationHandlerModule(({ invitationProp, invitationUrlHandler }) => ({
+    activate: () => NavigationHandler({ invitationProp, invitationUrlHandler }),
   })),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addReactContextModule({ activate: ReactContext }),
@@ -43,6 +47,10 @@ export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
     activatesOn: ClientEvents.ClientReady,
     activate: AccountCache,
   }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    activate: NavigationTargetLoader,
+  }),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
     activate: HubHttpClient,
@@ -57,10 +65,25 @@ export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
     firesBeforeActivation: [ClientEvents.SetupMigration],
     activate: Migrations,
   }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(ClientEvents.SpacesReady, AppActivationEvents.ProgressRegistryReady),
+    activate: SpaceReplicationProgress,
+  }),
+  // Project remote (edge) trace progress into the registry (DX-1125). Same activation as
+  // SpaceReplicationProgress: process-manager runtime, monitor, and registry are all available.
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(ClientEvents.SpacesReady, AppActivationEvents.ProgressRegistryReady),
+    activate: TraceProgress,
+  }),
   Plugin.addModule({
     activatesOn: ActivationEvents.SetupProcessManager,
     activate: LayerSpecs,
   }),
+  // Swarm-backed remote trace source (DX-1125). Collected when the process-manager runtime is built.
+  Plugin.addModule({
+    activatesOn: ActivationEvents.SetupProcessManager,
+    activate: RemoteTraceMonitor,
+  }),
   Plugin.addModule(
     ({
       shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',

package/src/capabilities/app-graph-builder.ts

@@ -6,9 +6,9 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
+import { ConnectionState } from '@dxos/client/mesh';
 import { Operation } from '@dxos/compute';
 import { CreateAtom, GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
-import { ConnectionState } from '@dxos/react-client/mesh';
 
 import { meta } from '#meta';
 import { ClientOperation } from '#operations';

package/src/capabilities/client.ts

@@ -7,6 +7,7 @@ import * as Effect from 'effect/Effect';
 import { Capabilities, Capability, Plugin } from '@dxos/app-framework';
 import { Client, ClientService } from '@dxos/client';
 import { EffectEx } from '@dxos/effect';
+import { makeIdentityService, makeSpaceService } from '@dxos/halo-adapter-client';
 import { log } from '@dxos/log';
 
 import { ClientEvents } from '#types';
@@ -44,6 +45,27 @@ export default Capability.makeModule(
       });
     });
 
+    // Interim fix: when a guest tab reconnects to a newly-elected leader worker (e.g. after the
+    // previous leader tab closes), its proxies are left in a broken state. Force a full reload to
+    // re-establish a clean session until the reconnect flow can recover in place.
+    // TODO(dmaretskyi): Remove once guest tabs recover from a leader handover without reloading.
+    //
+    // `client.reset()` also fires this event (its teardown reconnects this tab to a fresh worker),
+    // and reset must reload too, but to a different URL. `reload()` re-requests the *current* URL
+    // (path included); after a reset the current route (e.g. the Devices settings panel where reset
+    // was triggered) points at now-deleted data, so reopening it shows stale/broken UI. Navigating
+    // to `origin` instead drops the path and boots the app fresh — which is also what the app's own
+    // post-reset flow targets. The two branches differ only when the path isn't already `/`; a
+    // normal reconnect keeps the user where they were, a reset returns them to the root.
+    client.services.reconnected?.on(() => {
+      log.info('client reconnected, reloading to re-establish session');
+      if (client.resetting) {
+        window.location.href = window.location.origin;
+      } else {
+        window.location.reload();
+      }
+    });
+
     let spacesReadyFired = false;
     const subscription = client.spaces.subscribe(async () => {
       if (!spacesReadyFired) {
@@ -75,6 +97,10 @@ export default Capability.makeModule(
         }),
       ),
       Capability.contributes(Capabilities.Layer, ClientService.fromClient(client)),
+      // HALO service instances for imperative consumers (so plugins read identity/spaces
+      // through @dxos/halo instead of the client directly).
+      Capability.contributes(ClientCapabilities.IdentityService, makeIdentityService(client)),
+      Capability.contributes(ClientCapabilities.SpaceService, makeSpaceService(client)),
     ];
   }),
 );

package/src/capabilities/index.ts

@@ -13,10 +13,20 @@ export const LayerSpecs = Capability.lazy<void, Capability.Any[]>('LayerSpecs',
 export const Migrations = Capability.lazy('Migrations', () => import('./migrations'));
 export { NavigationHandler } from './navigation-handler';
 export type { NavigationHandlerOptions } from './navigation-handler';
+export const NavigationTargetLoader = Capability.lazy(
+  'NavigationTargetLoader',
+  () => import('./navigation-target-loader'),
+);
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
   'OperationHandler',
   () => import('./operation-handler'),
 );
 export const ReactContext = Capability.lazy('ReactContext', () => import('./react-context'));
+export const RemoteTraceMonitor = Capability.lazy('RemoteTraceMonitor', () => import('./remote-trace-monitor'));
 export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
 export const SchemaDefs = Capability.lazy('SchemaDefs', () => import('./schema-defs'));
+export const SpaceReplicationProgress = Capability.lazy(
+  'SpaceReplicationProgress',
+  () => import('./space-replication-progress'),
+);
+export const TraceProgress = Capability.lazy('TraceProgress', () => import('./trace-progress'));

package/src/capabilities/layer-specs.ts

@@ -8,8 +8,10 @@ import * as Layer from 'effect/Layer';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { ClientService } from '@dxos/client';
 import { Credential, LayerSpec } from '@dxos/compute';
+import { accessTokenResolverFromEdge, credentialsLayerFromDatabase } from '@dxos/compute-runtime';
 import { Database } from '@dxos/echo';
-import { credentialsLayerFromDatabase } from '@dxos/functions';
+import { Identity, Space } from '@dxos/halo';
+import { layerIdentity, layerSpace } from '@dxos/halo-adapter-client';
 import { invariant } from '@dxos/invariant';
 
 import { ClientCapabilities } from '#types';
@@ -72,19 +74,79 @@ const DatabaseLayerSpec = LayerSpec.make(
     ),
 );
 
+/**
+ * Resolves server-custodied access tokens through EDGE. Application-scoped: the resolver's cache is
+ * keyed by token id and is worth sharing across spaces.
+ */
+const AccessTokenResolverLayerSpec = LayerSpec.make(
+  {
+    affinity: 'application',
+    requires: [Capability.Service],
+    provides: [Credential.AccessTokenResolver],
+  },
+  () =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        const client = yield* Capability.get(ClientCapabilities.Client);
+        return accessTokenResolverFromEdge(() => client.edge.http);
+      }).pipe(Effect.orDie),
+    ),
+);
+
 const CredentialsLayerSpec = LayerSpec.make(
   {
     affinity: 'space',
-    requires: [Database.Service],
+    requires: [Database.Service, Credential.AccessTokenResolver],
     provides: [Credential.CredentialsService],
   },
   () => credentialsLayerFromDatabase(),
 );
 
+/**
+ * The HALO {@link Identity.Service} backed by the client adapter. Application-scoped: it manages
+ * the local identity and its devices for the whole client.
+ */
+const IdentityLayerSpec = LayerSpec.make(
+  {
+    affinity: 'application',
+    requires: [ClientService],
+    provides: [Identity.Service],
+  },
+  () =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        const client = yield* ClientService;
+        return layerIdentity(client);
+      }),
+    ),
+);
+
+/**
+ * The HALO {@link Space.Service} backed by the client adapter. Application-scoped: its verbs are
+ * keyed by {@link SpaceId} and cover every space on the client, not a single space slice.
+ */
+const SpaceLayerSpec = LayerSpec.make(
+  {
+    affinity: 'application',
+    requires: [ClientService],
+    provides: [Space.Service],
+  },
+  () =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        const client = yield* ClientService;
+        return layerSpace(client);
+      }),
+    ),
+);
+
 export default Capability.makeModule(() =>
   Effect.succeed([
     Capability.contributes(Capabilities.LayerSpec, ClientLayerSpec),
     Capability.contributes(Capabilities.LayerSpec, DatabaseLayerSpec),
+    Capability.contributes(Capabilities.LayerSpec, AccessTokenResolverLayerSpec),
     Capability.contributes(Capabilities.LayerSpec, CredentialsLayerSpec),
+    Capability.contributes(Capabilities.LayerSpec, IdentityLayerSpec),
+    Capability.contributes(Capabilities.LayerSpec, SpaceLayerSpec),
   ]),
 );

package/src/capabilities/migrations.ts

@@ -5,6 +5,8 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
+import { log } from '@dxos/log';
+import { RpcClosedError } from '@dxos/protocols';
 
 import { ClientCapabilities } from '#types';
 
@@ -20,7 +22,13 @@ export default Capability.makeModule(
       (_migrations: any[]) => {
         const migrations = Array.from(new Set(_migrations.flat()));
         const spaces = client.spaces.get();
-        void Promise.all(spaces.map((space: any) => space.internal.db.runMigrations(migrations)));
+        // Migrations run fire-and-forget from the subscription callback; an in-flight flush can be
+        // interrupted when the client shuts down, which surfaces as a benign RpcClosedError race.
+        void Promise.all(spaces.map((space: any) => space.internal.db.runMigrations(migrations))).catch((err) => {
+          if (!(err instanceof RpcClosedError)) {
+            log.catch(err);
+          }
+        });
       },
       { immediate: true },
     );

package/src/capabilities/navigation-handler/navigation-handler.ts

@@ -5,16 +5,20 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 import { log } from '@dxos/log';
 
+import { meta } from '#meta';
+
 import { ClientOperation } from '../../operations';
 
 export type NavigationHandlerOptions = {
   invitationProp?: string;
   tokenProp?: string;
   tokenTypeProp?: string;
+  /** Set false when another plugin (e.g. plugin-onboarding) owns the invitation URL param. */
+  invitationUrlHandler?: boolean;
 };
 
 /**
@@ -26,6 +30,7 @@ export default Capability.makeModule(
     invitationProp = 'deviceInvitationCode',
     tokenProp = 'token',
     tokenTypeProp = 'type',
+    invitationUrlHandler = true,
   }: NavigationHandlerOptions = {}) {
     const capabilities = yield* Capability.Service;
     const operationService = yield* Capability.get(Capabilities.OperationInvoker);
@@ -34,7 +39,7 @@ export default Capability.makeModule(
       Effect.gen(function* () {
         const token = url.searchParams.get(tokenProp);
         const tokenType = url.searchParams.get(tokenTypeProp);
-        const invitationCode = url.searchParams.get(invitationProp);
+        const invitationCode = invitationUrlHandler ? url.searchParams.get(invitationProp) : null;
 
         if (token && tokenType === 'login') {
           log('login token received via navigation');
@@ -47,9 +52,21 @@ export default Capability.makeModule(
           yield* Operation.invoke(ClientOperation.JoinIdentity, { invitationCode });
         }
       }).pipe(
+        Effect.catchAll((error) =>
+          Effect.gen(function* () {
+            log.warn('navigation handler failed', { error });
+            yield* Operation.invoke(LayoutOperation.AddToast, {
+              id: `${meta.profile.key}/navigation-failed`,
+              title: ['navigation-failed-toast.title', { ns: meta.profile.key }],
+              description: ['navigation-failed-toast.description', { ns: meta.profile.key }],
+              icon: 'ph--warning--regular',
+            }).pipe(
+              Effect.catchAll((toastError) => Effect.sync(() => log.warn('failed to add toast', { toastError }))),
+            );
+          }),
+        ),
         Effect.provideService(Capability.Service, capabilities),
         Effect.provideService(Operation.Service, operationService),
-        Effect.orDie,
       );
 
     return Capability.contributes(AppCapabilities.NavigationHandler, handler);

package/src/capabilities/navigation-target-loader.ts

@@ -0,0 +1,70 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, NotFound } from '@dxos/app-toolkit';
+import { Context } from '@dxos/context';
+import { Database, EID } from '@dxos/echo';
+import { EntityId, SpaceId } from '@dxos/keys';
+
+import { meta } from '#meta';
+import { ClientCapabilities } from '#types';
+
+/** Cap on the remote edge existence check so an unreachable edge cannot block navigation. */
+const EDGE_EXISTENCE_TIMEOUT = '3 seconds';
+
+/**
+ * Loads a navigation target by `(spaceId, entityId)` on behalf of the layout plugins, so they can
+ * restore a URL-addressed plank without depending on the client for object loading. Loads the object
+ * into local ECHO (materializing its graph node) when it exists locally, and otherwise checks remote
+ * existence via edge. See {@link AppCapabilities.NavigationTargetLoader}.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const client = yield* Capability.get(ClientCapabilities.Client);
+
+    // Remote existence check (does not materialize a local node); reuses the shared edge checker.
+    const checkRemote = NotFound.createEdgeExistenceChecker((spaceId, body) =>
+      client.edge.http.execQuery(new Context(), spaceId, body),
+    );
+
+    const loader: AppCapabilities.NavigationTargetLoader = {
+      id: meta.profile.key,
+      load: ({ spaceId, entityId }) =>
+        Effect.gen(function* () {
+          if (!SpaceId.isValid(spaceId) || !EntityId.isValid(entityId)) {
+            return false;
+          }
+          const eid = EID.make({ spaceId, entityId });
+
+          // Local first: loading the object populates the collection/type-section refs that address
+          // it, so the next graph expansion materializes its node. Wait for the space to be ready so a
+          // cold restore (space not yet loaded when the URL is resolved) still finds it.
+          const space = client.spaces.get(spaceId);
+          if (space) {
+            const loaded = yield* Effect.promise(() => space.waitUntilReady()).pipe(
+              Effect.flatMap(() => Database.load(space.db.makeRef(eid))),
+              Effect.as(true),
+              Effect.catchAll(() => Effect.succeed(false)),
+            );
+            if (loaded) {
+              return true;
+            }
+          }
+
+          // Remote fallback: confirms the object exists somewhere, even if it has not replicated
+          // locally yet (in which case the node cannot render until it does). Bounded so an
+          // unreachable edge cannot hang navigation.
+          return yield* checkRemote(eid).pipe(
+            Effect.timeout(EDGE_EXISTENCE_TIMEOUT),
+            Effect.catchAll(() => Effect.succeed(false)),
+          );
+        }),
+    };
+
+    return Capability.contributes(AppCapabilities.NavigationTargetLoader, loader);
+  }),
+);

package/src/capabilities/react-context.tsx

@@ -2,11 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
-import React, { ReactNode } from 'react';
+import React, { type ReactNode, useMemo } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { useCapability } from '@dxos/app-framework/ui';
+import { Identity, Space } from '@dxos/halo';
+import { makeIdentityService, makeSpaceService } from '@dxos/halo-adapter-client';
+import { HaloProvider } from '@dxos/halo-react';
 import { ClientProvider } from '@dxos/react-client';
 
 import { meta } from '#meta';
@@ -18,7 +22,21 @@ export default Capability.makeModule(() =>
       id: meta.profile.key,
       context: ({ children }: { children?: ReactNode }) => {
         const client = useCapability(ClientCapabilities.Client);
-        return <ClientProvider client={client}>{children}</ClientProvider>;
+        // Wrap the tree with the HALO services (via the client adapter) so `@dxos/halo-react`
+        // hooks resolve. Kept inside ClientProvider while consumers migrate off `@dxos/client`.
+        const services = useMemo(
+          () =>
+            Context.empty().pipe(
+              Context.add(Identity.Service, makeIdentityService(client)),
+              Context.add(Space.Service, makeSpaceService(client)),
+            ),
+          [client],
+        );
+        return (
+          <ClientProvider client={client}>
+            <HaloProvider services={services}>{children}</HaloProvider>
+          </ClientProvider>
+        );
       },
     }),
   ),