@dxos/plugin-space 0.7.5-labs.e27f9b9 → 0.7.5-main.2567c87

package/dist/lib/node-esm/{chunk-TIFAXTJ5.mjs → chunk-GVOPDPS2.mjs}

@@ -1,19 +1,19 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   SpaceCapabilities
-} from "./chunk-LGL4A5B5.mjs";
+} from "./chunk-375RB3CZ.mjs";
 import {
   COMPOSER_SPACE_LOCK,
   getSpaceDisplayName
-} from "./chunk-77RE7Y5J.mjs";
+} from "./chunk-5QMAPAZD.mjs";
 import {
   CollectionType,
   SpaceAction,
   SpaceForm
-} from "./chunk-S6VAU6VJ.mjs";
+} from "./chunk-HTBGWQEU.mjs";
 import {
   SPACE_PLUGIN
-} from "./chunk-ICCM4YRJ.mjs";
+} from "./chunk-7FUVU45N.mjs";
 
 // packages/plugins/plugin-space/src/components/AdvancedObjectSettings/AdvancedObjectSettings.tsx
 import React2, { useCallback as useCallback2, useState } from "react";
@@ -112,7 +112,7 @@ var AdvancedObjectSettings = ({ object }) => {
 // packages/plugins/plugin-space/src/components/AwaitingObject.tsx
 import { CheckCircle, CircleDashed, CircleNotch } from "@phosphor-icons/react";
 import React3, { useCallback as useCallback3, useEffect, useState as useState2 } from "react";
-import { createIntent, LayoutAction, useIntentDispatcher, useLayout } from "@dxos/app-framework";
+import { NavigationAction, useIntentDispatcher, createIntent, useCapability, Capabilities } from "@dxos/app-framework";
 import { useClient } from "@dxos/react-client";
 import { Filter, fullyQualifiedId, useQuery } from "@dxos/react-client/echo";
 import { Button, Toast, useTranslation as useTranslation3 } from "@dxos/react-ui";
@@ -125,7 +125,7 @@ var AwaitingObject = ({ id }) => {
   const [found, setFound] = useState2(false);
   const { t } = useTranslation3(SPACE_PLUGIN);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const layout = useLayout();
+  const location = useCapability(Capabilities.Location);
   const client = useClient();
   const objects = useQuery(client.spaces, Filter.all());
   useEffect(() => {
@@ -142,14 +142,14 @@ var AwaitingObject = ({ id }) => {
   useEffect(() => {
     if (objects.findIndex((object) => fullyQualifiedId(object) === id) > -1) {
       setFound(true);
-      if (layout.active.includes(id)) {
+      if (location.active.solo?.[0].id === id) {
         setOpen(false);
       }
     }
   }, [
     id,
     objects,
-    layout
+    location
   ]);
   const handleClose = useCallback3(async () => dispatch(createIntent(SpaceAction.WaitForObject, {
     id: void 0
@@ -157,11 +157,12 @@ var AwaitingObject = ({ id }) => {
     dispatch
   ]);
   const handleNavigate = useCallback3(() => {
-    void dispatch(createIntent(LayoutAction.Open, {
-      part: "main",
-      subject: [
-        id
-      ]
+    void dispatch(createIntent(NavigationAction.Open, {
+      activeParts: {
+        main: [
+          id
+        ]
+      }
     }));
     void handleClose();
   }, [
@@ -222,19 +223,19 @@ var BaseObjectSettings = ({ object }) => {
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectDialog.tsx
 import { pipe } from "effect";
 import React6, { useCallback as useCallback5, useRef } from "react";
-import { chain, createIntent as createIntent2, LayoutAction as LayoutAction2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { chain, createIntent as createIntent2, NavigationAction as NavigationAction2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
 import { useClient as useClient2 } from "@dxos/react-client";
-import { getSpace, isReactiveObject, isSpace, useSpaces } from "@dxos/react-client/echo";
+import { getSpace, isReactiveObject, isSpace as isSpace2, useSpaces } from "@dxos/react-client/echo";
 import { Button as Button2, Dialog, Icon as Icon2, useTranslation as useTranslation6 } from "@dxos/react-ui";
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectPanel.tsx
 import React5, { useCallback as useCallback4, useMemo, useState as useState3 } from "react";
 import { Surface, isSurfaceAvailable, usePluginManager } from "@dxos/app-framework";
 import { getObjectAnnotation, S } from "@dxos/echo-schema";
-import { Icon, toLocalizedString, useTranslation as useTranslation5 } from "@dxos/react-ui";
-import { Form as Form2 } from "@dxos/react-ui-form";
+import { isSpace } from "@dxos/react-client/echo";
+import { Icon, IconButton as IconButton3, Input as Input2, toLocalizedString, useTranslation as useTranslation5 } from "@dxos/react-ui";
+import { Form as Form2, InputHeader } from "@dxos/react-ui-form";
 import { SearchList } from "@dxos/react-ui-searchlist";
-import { mx as mx2 } from "@dxos/react-ui-theme";
 import { nonNullable } from "@dxos/util";
 var useInputSurfaceLookup = (baseData) => {
   const pluginManager = usePluginManager();
@@ -260,22 +261,14 @@ var useInputSurfaceLookup = (baseData) => {
     baseData
   ]);
 };
-var CreateObjectPanel = ({ classNames, schemas, spaces, typename: initialTypename, target: initialTarget, name: initialName, defaultSpaceId, resolve, onCreateObject }) => {
+var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: initialTarget, name: initialName, defaultSpaceId, resolve, onCreateObject }) => {
   const { t } = useTranslation5(SPACE_PLUGIN);
   const [typename, setTypename] = useState3(initialTypename);
   const [target, setTarget] = useState3(initialTarget);
   const schema = schemas.find((schema2) => getObjectAnnotation(schema2)?.typename === typename);
-  const options = schemas.map(getObjectAnnotation).filter(nonNullable).sort((a, b) => {
-    const nameA = t("typename label", {
-      ns: a.typename,
-      defaultValue: a.typename
-    });
-    const nameB = t("typename label", {
-      ns: b.typename,
-      defaultValue: b.typename
-    });
-    return nameA.localeCompare(nameB);
-  });
+  const options = schemas.map(getObjectAnnotation).filter(nonNullable);
+  const handleClearSchema = useCallback4(() => setTypename(void 0), []);
+  const handleClearTarget = useCallback4(() => setTarget(void 0), []);
   const handleCreateObject = useCallback4(async (props) => {
     if (!schema || !target) {
       return;
@@ -299,78 +292,7 @@ var CreateObjectPanel = ({ classNames, schemas, spaces, typename: initialTypenam
     resolve,
     typename
   ]);
-  const inputSurfaceLookup = useInputSurfaceLookup({
-    target
-  });
-  const form = useMemo(() => {
-    const schema2 = metadata?.creationSchema ?? S.Struct({
-      name: S.optional(S.String)
-    });
-    return /* @__PURE__ */ React5.createElement(Form2, {
-      classNames: "!p-0",
-      autoFocus: true,
-      values: {
-        name: initialName
-      },
-      schema: schema2,
-      testId: "create-object-form",
-      onSave: handleCreateObject,
-      lookupComponent: inputSurfaceLookup
-    });
-  }, [
-    initialName,
-    handleCreateObject,
-    metadata
-  ]);
-  return /* @__PURE__ */ React5.createElement("div", {
-    role: "form",
-    className: mx2("flex flex-col gap-2", classNames)
-  }, !schema ? /* @__PURE__ */ React5.createElement(SelectSchema, {
-    options,
-    resolve,
-    onChange: setTypename
-  }) : !target ? /* @__PURE__ */ React5.createElement(SelectSpace, {
-    spaces,
-    defaultSpaceId,
-    onChange: setTarget
-  }) : form);
-};
-var SelectSpace = ({ spaces, defaultSpaceId, onChange }) => {
-  const { t } = useTranslation5(SPACE_PLUGIN);
-  return /* @__PURE__ */ React5.createElement(SearchList.Root, {
-    label: t("space input label"),
-    classNames: "flex flex-col grow overflow-hidden"
-  }, /* @__PURE__ */ React5.createElement(SearchList.Input, {
-    autoFocus: true,
-    "data-testid": "create-object-form.space-input",
-    placeholder: t("space input placeholder"),
-    classNames: "px-1 my-2"
-  }), /* @__PURE__ */ React5.createElement(SearchList.Content, {
-    classNames: "max-bs-[24rem] overflow-auto"
-  }, spaces.sort((a, b) => {
-    const aName = toLocalizedString(getSpaceDisplayName(a, {
-      personal: a.id === defaultSpaceId
-    }), t);
-    const bName = toLocalizedString(getSpaceDisplayName(b, {
-      personal: b.id === defaultSpaceId
-    }), t);
-    return aName.localeCompare(bName);
-  }).map((space) => /* @__PURE__ */ React5.createElement(SearchList.Item, {
-    key: space.id,
-    value: toLocalizedString(getSpaceDisplayName(space, {
-      personal: space.id === defaultSpaceId
-    }), t),
-    onSelect: () => onChange(space),
-    classNames: "flex items-center gap-2"
-  }, /* @__PURE__ */ React5.createElement("span", {
-    className: "grow truncate"
-  }, toLocalizedString(getSpaceDisplayName(space, {
-    personal: space.id === defaultSpaceId
-  }), t))))));
-};
-var SelectSchema = ({ options, resolve, onChange }) => {
-  const { t } = useTranslation5(SPACE_PLUGIN);
-  return /* @__PURE__ */ React5.createElement(SearchList.Root, {
+  const schemaInput = /* @__PURE__ */ React5.createElement(SearchList.Root, {
     label: t("schema input label"),
     classNames: "flex flex-col grow overflow-hidden"
   }, /* @__PURE__ */ React5.createElement(SearchList.Input, {
@@ -386,7 +308,7 @@ var SelectSchema = ({ options, resolve, onChange }) => {
       ns: option.typename,
       defaultValue: option.typename
     }),
-    onSelect: () => onChange(option.typename),
+    onSelect: () => setTypename(option.typename),
     classNames: "flex items-center gap-2"
   }, /* @__PURE__ */ React5.createElement("span", {
     className: "flex gap-2 items-center grow truncate"
@@ -397,6 +319,85 @@ var SelectSchema = ({ options, resolve, onChange }) => {
     ns: option.typename,
     defaultValue: option.typename
   }))))));
+  const spaceInput = /* @__PURE__ */ React5.createElement(SearchList.Root, {
+    label: t("space input label"),
+    classNames: "flex flex-col grow overflow-hidden"
+  }, /* @__PURE__ */ React5.createElement(SearchList.Input, {
+    autoFocus: true,
+    "data-testid": "create-object-form.space-input",
+    placeholder: t("space input placeholder"),
+    classNames: "px-1 my-2"
+  }), /* @__PURE__ */ React5.createElement(SearchList.Content, {
+    classNames: "max-bs-[24rem] overflow-auto"
+  }, spaces.map((space) => /* @__PURE__ */ React5.createElement(SearchList.Item, {
+    key: space.id,
+    value: toLocalizedString(getSpaceDisplayName(space, {
+      personal: space.id === defaultSpaceId
+    }), t),
+    onSelect: () => setTarget(space),
+    classNames: "flex items-center gap-2"
+  }, /* @__PURE__ */ React5.createElement("span", {
+    className: "grow truncate"
+  }, toLocalizedString(getSpaceDisplayName(space, {
+    personal: space.id === defaultSpaceId
+  }), t))))));
+  const inputSurfaceLookup = useInputSurfaceLookup({
+    target
+  });
+  const form = useMemo(() => {
+    const schema2 = metadata?.creationSchema ?? S.Struct({
+      name: S.optional(S.String)
+    });
+    return /* @__PURE__ */ React5.createElement(Form2, {
+      autoFocus: true,
+      values: {
+        name: initialName
+      },
+      schema: schema2,
+      testId: "create-object-form",
+      onSave: handleCreateObject,
+      lookupComponent: inputSurfaceLookup
+    });
+  }, [
+    initialName,
+    handleCreateObject,
+    metadata
+  ]);
+  return /* @__PURE__ */ React5.createElement("div", {
+    role: "form",
+    className: "flex flex-col gap-2"
+  }, target && /* @__PURE__ */ React5.createElement("div", {
+    role: "none"
+  }, /* @__PURE__ */ React5.createElement(Input2.Root, null, /* @__PURE__ */ React5.createElement(InputHeader, null, /* @__PURE__ */ React5.createElement(Input2.Label, null, t(isSpace(target) ? "creating in space label" : "creating in collection label"))), /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "flex gap-2"
+  }, /* @__PURE__ */ React5.createElement(Input2.TextInput, {
+    disabled: true,
+    value: isSpace(target) ? toLocalizedString(getSpaceDisplayName(target, {
+      personal: target.id === defaultSpaceId
+    }), t) : target.name || t("unnamed collection label")
+  }), /* @__PURE__ */ React5.createElement(IconButton3, {
+    iconOnly: true,
+    icon: "ph--x--regular",
+    label: t("clear input label"),
+    onClick: handleClearTarget
+  })))), schema && /* @__PURE__ */ React5.createElement("div", {
+    role: "none"
+  }, /* @__PURE__ */ React5.createElement(Input2.Root, null, /* @__PURE__ */ React5.createElement(InputHeader, null, /* @__PURE__ */ React5.createElement(Input2.Label, null, t("creating object type label"))), /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "flex gap-2"
+  }, /* @__PURE__ */ React5.createElement(Input2.TextInput, {
+    disabled: true,
+    value: t("typename label", {
+      ns: schema.typename,
+      defaultValue: schema.typename
+    })
+  }), /* @__PURE__ */ React5.createElement(IconButton3, {
+    iconOnly: true,
+    icon: "ph--x--regular",
+    label: t("clear input label"),
+    onClick: handleClearSchema
+  })))), !schema ? schemaInput : !target ? spaceInput : form);
 };
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectDialog.tsx
@@ -408,13 +409,13 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
   const spaces = useSpaces();
   const { dispatchPromise: dispatch } = useIntentDispatcher2();
   const handleCreateObject = useCallback5(async ({ schema, target: _target, data }) => {
-    const target2 = isSpace(_target) ? _target.properties[CollectionType.typename]?.target : _target;
+    const target2 = isSpace2(_target) ? _target.properties[CollectionType.typename]?.target : _target;
     const createObjectIntent = resolve?.(schema.typename)?.createObject;
     if (!createObjectIntent || !target2) {
       return;
     }
     closeRef.current?.click();
-    const space = isSpace(target2) ? target2 : getSpace(target2);
+    const space = isSpace2(target2) ? target2 : getSpace(target2);
     const result = await dispatch(createObjectIntent(data, {
       space
     }));
@@ -426,9 +427,7 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
       });
       const shouldNavigate = _shouldNavigate ?? (() => true);
       if (shouldNavigate(object)) {
-        await dispatch(pipe(addObjectIntent, chain(LayoutAction2.Open, {
-          part: "main"
-        })));
+        await dispatch(pipe(addObjectIntent, chain(NavigationAction2.Open, {})));
       } else {
         await dispatch(addObjectIntent);
       }
@@ -441,7 +440,7 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
     /* @__PURE__ */ React6.createElement(Dialog.Content, {
-      classNames: "p-0 bs-content max-bs-full md:max-is-[40rem] overflow-hidden"
+      classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
     }, /* @__PURE__ */ React6.createElement("div", {
       role: "none",
       className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
@@ -455,8 +454,9 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
     }, /* @__PURE__ */ React6.createElement(Icon2, {
       icon: "ph--x--regular",
       size: 4
-    })))), /* @__PURE__ */ React6.createElement(CreateObjectPanel, {
-      classNames: "p-4",
+    })))), /* @__PURE__ */ React6.createElement("div", {
+      className: "p-4"
+    }, /* @__PURE__ */ React6.createElement(CreateObjectPanel, {
       schemas,
       spaces,
       target,
@@ -465,14 +465,13 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
       defaultSpaceId: client.spaces.default.id,
       resolve,
       onCreateObject: handleCreateObject
-    }))
+    })))
   );
 };
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateSpaceDialog.tsx
-import { Effect } from "effect";
 import React7, { useCallback as useCallback6, useRef as useRef2 } from "react";
-import { createIntent as createIntent3, LayoutAction as LayoutAction3, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
+import { createIntent as createIntent3, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
 import { Button as Button3, Dialog as Dialog2, Icon as Icon3, useTranslation as useTranslation7 } from "@dxos/react-ui";
 import { Form as Form3 } from "@dxos/react-ui-form";
 var CREATE_SPACE_DIALOG = `${SPACE_PLUGIN}/CreateSpaceDialog`;
@@ -482,19 +481,15 @@ var initialValues2 = {
 var CreateSpaceDialog = () => {
   const closeRef = useRef2(null);
   const { t } = useTranslation7(SPACE_PLUGIN);
-  const { dispatch } = useIntentDispatcher3();
+  const { dispatchPromise: dispatch } = useIntentDispatcher3();
   const handleCreateSpace = useCallback6(async (data) => {
-    const program = Effect.gen(function* () {
-      const { space } = yield* dispatch(createIntent3(SpaceAction.Create, data));
-      yield* dispatch(createIntent3(LayoutAction3.SwitchWorkspace, {
-        part: "workspace",
-        subject: space.id
-      }));
-      yield* dispatch(createIntent3(SpaceAction.OpenCreateObject, {
-        target: space
+    const result = await dispatch(createIntent3(SpaceAction.Create, data));
+    const target = result.data?.space;
+    if (target) {
+      await dispatch(createIntent3(SpaceAction.OpenCreateObject, {
+        target
       }));
-    });
-    await Effect.runPromise(program);
+    }
   }, [
     dispatch
   ]);
@@ -502,7 +497,7 @@ var CreateSpaceDialog = () => {
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
     /* @__PURE__ */ React7.createElement(Dialog2.Content, {
-      classNames: "p-0 bs-content min-bs-[16rem] max-bs-full md:max-is-[32rem] overflow-hidden"
+      classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
     }, /* @__PURE__ */ React7.createElement("div", {
       role: "none",
       className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
@@ -530,16 +525,16 @@ var CreateSpaceDialog = () => {
 // packages/plugins/plugin-space/src/components/CollectionMain.tsx
 import React8 from "react";
 import { useTranslation as useTranslation8 } from "@dxos/react-ui";
-import { baseSurface, descriptionText, mx as mx3 } from "@dxos/react-ui-theme";
+import { baseSurface, descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
 var CollectionMain = ({ collection }) => {
   const { t } = useTranslation8(SPACE_PLUGIN);
   return /* @__PURE__ */ React8.createElement("div", {
     role: "none",
-    className: mx3(baseSurface, "min-bs-screen is-full flex items-center justify-center p-8"),
+    className: mx2(baseSurface, "min-bs-screen is-full flex items-center justify-center p-8"),
     "data-testid": "composer.firstRunMessage"
   }, /* @__PURE__ */ React8.createElement("p", {
     role: "alert",
-    className: mx3(descriptionText, "border border-dashed border-neutral-400/50 rounded-lg p-8 font-normal text-lg max-is-[24rem] break-words")
+    className: mx2(descriptionText, "border border-dashed border-neutral-400/50 rounded-lg p-8 font-normal text-lg max-is-[24rem] break-words")
   }, collection.name ?? t("unnamed collection label")));
 };
 
@@ -557,62 +552,37 @@ var CollectionSection = ({ collection }) => {
 
 // packages/plugins/plugin-space/src/components/JoinDialog.tsx
 import React10, { useCallback as useCallback7 } from "react";
-import { createIntent as createIntent4, LayoutAction as LayoutAction4, useAppGraph, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
-import { log } from "@dxos/log";
+import { createIntent as createIntent4, LayoutAction, NavigationAction as NavigationAction3, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
+import { useGraph } from "@dxos/plugin-graph";
 import { ObservabilityAction } from "@dxos/plugin-observability/types";
-import { useClient as useClient3 } from "@dxos/react-client";
-import { Dialog as Dialog3 } from "@dxos/react-ui";
+import { useSpaces as useSpaces2 } from "@dxos/react-client/echo";
+import { Dialog as Dialog3, useTranslation as useTranslation10 } from "@dxos/react-ui";
 import { JoinPanel } from "@dxos/shell/react";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/JoinDialog.tsx";
 var JOIN_DIALOG = `${SPACE_PLUGIN}/JoinDialog`;
 var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
+  const { t } = useTranslation10(SPACE_PLUGIN);
   const { dispatchPromise: dispatch } = useIntentDispatcher4();
-  const client = useClient3();
-  const { graph } = useAppGraph();
+  const spaces = useSpaces2();
+  const { graph } = useGraph();
   const handleDone = useCallback7(async (result) => {
     if (result?.spaceKey) {
       await Promise.all([
-        dispatch(createIntent4(LayoutAction4.AddToast, {
-          part: "toast",
+        dispatch(createIntent4(LayoutAction.SetLayout, {
+          element: "toast",
           subject: {
             id: `${SPACE_PLUGIN}/join-success`,
             duration: 5e3,
-            title: [
-              "join success label",
-              {
-                ns: SPACE_PLUGIN
-              }
-            ],
-            closeLabel: [
-              "dismiss label",
-              {
-                ns: SPACE_PLUGIN
-              }
-            ]
+            title: t("join success label"),
+            closeLabel: t("dismiss label")
           }
         })),
-        dispatch(createIntent4(LayoutAction4.UpdateDialog, {
-          part: "dialog",
-          options: {
-            state: false
-          }
+        dispatch(createIntent4(LayoutAction.SetLayout, {
+          element: "dialog",
+          state: false
         }))
       ]);
     }
-    const space = result?.spaceKey ? client.spaces.get(result.spaceKey) : void 0;
-    if (!space) {
-      log.warn("Space not found", result?.spaceKey, {
-        F: __dxlog_file,
-        L: 56,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    await dispatch(createIntent4(LayoutAction4.SwitchWorkspace, {
-      part: "workspace",
-      subject: space.id
-    }));
+    const space = spaces.find(({ key }) => result?.spaceKey?.equals(key));
     const target = result?.target || (navigableCollections ? space?.id : void 0);
     if (target) {
       await graph.waitForPath({
@@ -620,15 +590,15 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
       }).catch(() => {
       });
       await Promise.all([
-        dispatch(createIntent4(LayoutAction4.Open, {
-          part: "main",
-          subject: [
-            target
-          ]
+        dispatch(createIntent4(NavigationAction3.Open, {
+          activeParts: {
+            main: [
+              target
+            ]
+          }
         })),
-        dispatch(createIntent4(LayoutAction4.Expose, {
-          part: "navigation",
-          subject: target
+        dispatch(createIntent4(NavigationAction3.Expose, {
+          id: target
         }))
       ]);
     }
@@ -643,8 +613,7 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
     }
   }, [
     dispatch,
-    client,
-    graph
+    spaces
   ]);
   return /* @__PURE__ */ React10.createElement(Dialog3.Content, null, /* @__PURE__ */ React10.createElement(JoinPanel, {
     ...props,
@@ -662,11 +631,11 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
 import { Planet } from "@phosphor-icons/react";
 import React11 from "react";
 import { getSpace as getSpace2 } from "@dxos/client/echo";
-import { useClient as useClient4 } from "@dxos/react-client";
-import { DropdownMenu, toLocalizedString as toLocalizedString2, useTranslation as useTranslation10 } from "@dxos/react-ui";
+import { useClient as useClient3 } from "@dxos/react-client";
+import { DropdownMenu, toLocalizedString as toLocalizedString2, useTranslation as useTranslation11 } from "@dxos/react-ui";
 var MenuFooter = ({ object }) => {
-  const { t } = useTranslation10(SPACE_PLUGIN);
-  const client = useClient4();
+  const { t } = useTranslation11(SPACE_PLUGIN);
+  const client = useClient3();
   const space = getSpace2(object);
   const spaceName = space ? getSpaceDisplayName(space, {
     personal: client.spaces.default === space
@@ -686,8 +655,8 @@ var MenuFooter = ({ object }) => {
 import { ArrowsCounterClockwise, CheckCircle as CheckCircle2, Warning } from "@phosphor-icons/react";
 import React12, { useEffect as useEffect2, useState as useState4 } from "react";
 import { debounce } from "@dxos/async";
-import { Tooltip, useTranslation as useTranslation11 } from "@dxos/react-ui";
-import { getSize as getSize2, mx as mx4, staticPlaceholderText, warningText } from "@dxos/react-ui-theme";
+import { Tooltip, useTranslation as useTranslation12 } from "@dxos/react-ui";
+import { getSize as getSize2, mx as mx3, staticPlaceholderText, warningText } from "@dxos/react-ui-theme";
 var Status;
 (function(Status2) {
   Status2[Status2["PERSISTED_LOCALLY"] = 0] = "PERSISTED_LOCALLY";
@@ -695,7 +664,7 @@ var Status;
   Status2[Status2["ERROR"] = 2] = "ERROR";
 })(Status || (Status = {}));
 var PersistenceStatus = ({ db }) => {
-  const { t } = useTranslation11(SPACE_PLUGIN);
+  const { t } = useTranslation12(SPACE_PLUGIN);
   const [displayMessage, setDisplayMessage] = useState4(false);
   const [status, naturalSetStatus] = useState4(0);
   const [prevStatus, setPrevStatus] = useState4(0);
@@ -715,17 +684,17 @@ var PersistenceStatus = ({ db }) => {
       return /* @__PURE__ */ React12.createElement("div", {
         className: "flex items-center"
       }, /* @__PURE__ */ React12.createElement(Warning, {
-        className: mx4(getSize2(4), "me-1")
+        className: mx3(getSize2(4), "me-1")
       }), /* @__PURE__ */ React12.createElement("span", {
-        className: mx4("text-sm", warningText)
+        className: mx3("text-sm", warningText)
       }, t("persistence error label")));
     case 1:
       return /* @__PURE__ */ React12.createElement("div", {
         className: "flex items-center"
       }, /* @__PURE__ */ React12.createElement(ArrowsCounterClockwise, {
-        className: mx4(getSize2(4), "me-1")
+        className: mx3(getSize2(4), "me-1")
       }), /* @__PURE__ */ React12.createElement("span", {
-        className: mx4("text-sm", staticPlaceholderText)
+        className: mx3("text-sm", staticPlaceholderText)
       }, t("persistence pending label")));
     case 0:
     default:
@@ -735,21 +704,21 @@ var PersistenceStatus = ({ db }) => {
         role: "status",
         className: "flex items-center"
       }, /* @__PURE__ */ React12.createElement(CheckCircle2, {
-        className: mx4(getSize2(4), "me-1")
+        className: mx3(getSize2(4), "me-1")
       }), displayMessage && /* @__PURE__ */ React12.createElement("span", {
-        className: mx4("text-sm", staticPlaceholderText)
+        className: mx3("text-sm", staticPlaceholderText)
       }, t("persisted locally label"))), /* @__PURE__ */ React12.createElement(Tooltip.Portal, null, /* @__PURE__ */ React12.createElement(Tooltip.Content, null, t("persisted locally message"), /* @__PURE__ */ React12.createElement(Tooltip.Arrow, null))));
   }
 };
 
 // packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx
 import React13, { useCallback as useCallback8, useRef as useRef3, useState as useState5 } from "react";
-import { log as log2 } from "@dxos/log";
-import { Button as Button4, Input as Input2, Popover, useTranslation as useTranslation12 } from "@dxos/react-ui";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx";
+import { log } from "@dxos/log";
+import { Button as Button4, Input as Input3, Popover, useTranslation as useTranslation13 } from "@dxos/react-ui";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx";
 var POPOVER_RENAME_OBJECT = `${SPACE_PLUGIN}/PopoverRenameObject`;
 var PopoverRenameObject = ({ object: obj }) => {
-  const { t } = useTranslation12(SPACE_PLUGIN);
+  const { t } = useTranslation13(SPACE_PLUGIN);
   const doneButton = useRef3(null);
   const object = obj;
   const [name, setName] = useState5(object.name || object.title || "");
@@ -760,10 +729,10 @@ var PopoverRenameObject = ({ object: obj }) => {
       try {
         object.title = name;
       } catch (err) {
-        log2.error("Failed to rename object", {
+        log.error("Failed to rename object", {
           err
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file,
           L: 30,
           S: void 0,
           C: (f, a) => f(...a)
@@ -780,9 +749,9 @@ var PopoverRenameObject = ({ object: obj }) => {
   }, /* @__PURE__ */ React13.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ React13.createElement(Input2.Root, null, /* @__PURE__ */ React13.createElement(Input2.Label, {
+  }, /* @__PURE__ */ React13.createElement(Input3.Root, null, /* @__PURE__ */ React13.createElement(Input3.Label, {
     srOnly: true
-  }, t("object name label")), /* @__PURE__ */ React13.createElement(Input2.TextInput, {
+  }, t("object name label")), /* @__PURE__ */ React13.createElement(Input3.TextInput, {
     placeholder: t("object title placeholder"),
     value: name,
     "data-testid": "spacePlugin.renameObject.input",
@@ -801,10 +770,10 @@ var PopoverRenameObject = ({ object: obj }) => {
 
 // packages/plugins/plugin-space/src/components/PopoverRenameSpace.tsx
 import React14, { useCallback as useCallback9, useRef as useRef4, useState as useState6 } from "react";
-import { Button as Button5, Input as Input3, Popover as Popover2, useTranslation as useTranslation13 } from "@dxos/react-ui";
+import { Button as Button5, Input as Input4, Popover as Popover2, useTranslation as useTranslation14 } from "@dxos/react-ui";
 var POPOVER_RENAME_SPACE = `${SPACE_PLUGIN}/PopoverRenameSpace`;
 var PopoverRenameSpace = ({ space }) => {
-  const { t } = useTranslation13(SPACE_PLUGIN);
+  const { t } = useTranslation14(SPACE_PLUGIN);
   const doneButton = useRef4(null);
   const [name, setName] = useState6(space.properties.name ?? "");
   const handleDone = useCallback9(() => {
@@ -819,9 +788,9 @@ var PopoverRenameSpace = ({ space }) => {
   }, /* @__PURE__ */ React14.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ React14.createElement(Input3.Root, null, /* @__PURE__ */ React14.createElement(Input3.Label, {
+  }, /* @__PURE__ */ React14.createElement(Input4.Root, null, /* @__PURE__ */ React14.createElement(Input4.Label, {
     srOnly: true
-  }, t("space name label")), /* @__PURE__ */ React14.createElement(Input3.TextInput, {
+  }, t("space name label")), /* @__PURE__ */ React14.createElement(Input4.TextInput, {
     defaultValue: space.properties.name ?? "",
     placeholder: t("unnamed space label"),
     onChange: ({ target: { value } }) => setName(value),
@@ -842,7 +811,7 @@ var PopoverRenameSpace = ({ space }) => {
 // packages/plugins/plugin-space/src/components/ShareSpaceButton.tsx
 import React15 from "react";
 import { createIntent as createIntent5, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
-import { IconButton as IconButton3, useTranslation as useTranslation14 } from "@dxos/react-ui";
+import { IconButton as IconButton4, useTranslation as useTranslation15 } from "@dxos/react-ui";
 var ShareSpaceButton = ({ space }) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher5();
   return /* @__PURE__ */ React15.createElement(ShareSpaceButtonImpl, {
@@ -852,8 +821,8 @@ var ShareSpaceButton = ({ space }) => {
   });
 };
 var ShareSpaceButtonImpl = ({ onClick }) => {
-  const { t } = useTranslation14(SPACE_PLUGIN);
-  return /* @__PURE__ */ React15.createElement(IconButton3, {
+  const { t } = useTranslation15(SPACE_PLUGIN);
+  return /* @__PURE__ */ React15.createElement(IconButton4, {
     "data-testid": "spacePlugin.shareSpaceButton",
     icon: "ph--users--regular",
     label: t("share space label"),
@@ -863,26 +832,27 @@ var ShareSpaceButtonImpl = ({ onClick }) => {
 
 // packages/plugins/plugin-space/src/components/SpacePresence.tsx
 import React16, { useCallback as useCallback10, useEffect as useEffect4, useState as useState8 } from "react";
-import { useAppGraph as useAppGraph2, useCapability } from "@dxos/app-framework";
+import { useCapability as useCapability2 } from "@dxos/app-framework";
 import { generateName } from "@dxos/display-name";
-import { PublicKey, useClient as useClient5 } from "@dxos/react-client";
+import { useGraph as useGraph2 } from "@dxos/plugin-graph";
+import { PublicKey, useClient as useClient4 } from "@dxos/react-client";
 import { getSpace as getSpace3, useMembers, fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
-import { Avatar, AvatarGroup, AvatarGroupItem, Tooltip as Tooltip2, useTranslation as useTranslation15, List as List2, ListItem as ListItem2, useDefaultValue } from "@dxos/react-ui";
+import { Avatar, AvatarGroup, AvatarGroupItem, Tooltip as Tooltip2, useTranslation as useTranslation16, List as List2, ListItem as ListItem2, useDefaultValue } from "@dxos/react-ui";
 import { AttentionGlyph, useAttended, useAttention } from "@dxos/react-ui-attention";
 import { ComplexMap, keyToFallback } from "@dxos/util";
 
 // packages/plugins/plugin-space/src/capabilities/index.ts
 import { lazy } from "@dxos/app-framework";
-var AppGraphBuilder = lazy(() => import("./app-graph-builder-MS6BI5EW.mjs"));
-var AppGraphSerializer = lazy(() => import("./app-graph-serializer-AWAWDSCM.mjs"));
-var IdentityCreated = lazy(() => import("./identity-created-3AUSSVEK.mjs"));
-var IntentResolver = lazy(() => import("./intent-resolver-UKXKZN2V.mjs"));
-var ReactRoot = lazy(() => import("./react-root-R3FZKA2B.mjs"));
-var ReactSurface = lazy(() => import("./react-surface-RH57RBYI.mjs"));
-var SpaceSettings = lazy(() => import("./settings-VBAUB37B.mjs"));
-var SpaceState = lazy(() => import("./state-5GH2D5U4.mjs"));
-var SpacesReady = lazy(() => import("./spaces-ready-ABADUX2P.mjs"));
+var AppGraphBuilder = lazy(() => import("./app-graph-builder-NEHQ5Z63.mjs"));
+var AppGraphSerializer = lazy(() => import("./app-graph-serializer-UWWS5OVC.mjs"));
+var IdentityCreated = lazy(() => import("./identity-created-HMNY2MPB.mjs"));
+var IntentResolver = lazy(() => import("./intent-resolver-P5EVBOGP.mjs"));
+var ReactRoot = lazy(() => import("./react-root-OUPJA4RY.mjs"));
+var ReactSurface = lazy(() => import("./react-surface-7EVWCKIP.mjs"));
+var SpaceSettings = lazy(() => import("./settings-EDK6WI3V.mjs"));
+var SpaceState = lazy(() => import("./state-BMISGQ2O.mjs"));
+var SpacesReady = lazy(() => import("./spaces-ready-CH3W7OGN.mjs"));
 
 // packages/plugins/plugin-space/src/hooks/usePath.ts
 import { useEffect as useEffect3, useState as useState7 } from "react";
@@ -926,8 +896,8 @@ var ACTIVITY_DURATION = 3e4;
 var noViewers = new ComplexMap(PublicKey.hash);
 var getName = (identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
 var SpacePresence = ({ object, spaceKey }) => {
-  const spaceState = useCapability(SpaceCapabilities.MutableState);
-  const client = useClient5();
+  const spaceState = useCapability2(SpaceCapabilities.MutableState);
+  const client = useClient4();
   const identity = useIdentity();
   const space = spaceKey ? client.spaces.get(spaceKey) : getSpace3(object);
   const spaceMembers = useMembers(space?.key);
@@ -1026,7 +996,7 @@ var PrensenceAvatar = ({ identity, showName, match, group, index, onClick }) =>
 var SmallPresenceLive = ({ id, open, viewers }) => {
   const { hasAttention, isAncestor, isRelated } = useAttention(id);
   const isAttended = hasAttention || isAncestor || isRelated;
-  const { graph } = useAppGraph2();
+  const { graph } = useGraph2();
   const attended = useAttended();
   const startOfAttention = attended.at(-1);
   const path = usePath(graph, startOfAttention);
@@ -1054,7 +1024,7 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
   });
 };
 var SmallPresence = ({ count = 0, attended, containsAttended }) => {
-  const { t } = useTranslation15(SPACE_PLUGIN);
+  const { t } = useTranslation16(SPACE_PLUGIN);
   return /* @__PURE__ */ React16.createElement(Tooltip2.Root, null, /* @__PURE__ */ React16.createElement(Tooltip2.Trigger, {
     asChild: true
   }, /* @__PURE__ */ React16.createElement(AttentionGlyph, {
@@ -1071,13 +1041,13 @@ var SmallPresence = ({ count = 0, attended, containsAttended }) => {
 
 // packages/plugins/plugin-space/src/components/SpacePluginSettings.tsx
 import React17 from "react";
-import { Input as Input4, useTranslation as useTranslation16 } from "@dxos/react-ui";
-import { DeprecatedFormContainer, DeprecatedFormInput } from "@dxos/react-ui-form";
+import { Input as Input5, useTranslation as useTranslation17 } from "@dxos/react-ui";
+import { DeprecatedFormInput } from "@dxos/react-ui-form";
 var SpacePluginSettings = ({ settings }) => {
-  const { t } = useTranslation16(SPACE_PLUGIN);
-  return /* @__PURE__ */ React17.createElement(DeprecatedFormContainer, null, /* @__PURE__ */ React17.createElement(DeprecatedFormInput, {
+  const { t } = useTranslation17(SPACE_PLUGIN);
+  return /* @__PURE__ */ React17.createElement(React17.Fragment, null, /* @__PURE__ */ React17.createElement(DeprecatedFormInput, {
     label: t("show hidden spaces label")
-  }, /* @__PURE__ */ React17.createElement(Input4.Switch, {
+  }, /* @__PURE__ */ React17.createElement(Input5.Switch, {
     checked: settings.showHidden,
     onCheckedChange: (checked) => settings.showHidden = !!checked
   })));
@@ -1085,23 +1055,24 @@ var SpacePluginSettings = ({ settings }) => {
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx
 import React18, { useCallback as useCallback11, useState as useState9 } from "react";
-import { log as log3 } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
-import { useClient as useClient6 } from "@dxos/react-client";
-import { Input as Input5, useTranslation as useTranslation17 } from "@dxos/react-ui";
-import { DeprecatedFormContainer as DeprecatedFormContainer2, DeprecatedFormInput as DeprecatedFormInput2 } from "@dxos/react-ui-form";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx";
+import { useClient as useClient5 } from "@dxos/react-client";
+import { Input as Input6, useTranslation as useTranslation18 } from "@dxos/react-ui";
+import { DeprecatedFormInput as DeprecatedFormInput2 } from "@dxos/react-ui-form";
+import { mx as mx4 } from "@dxos/react-ui-theme";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx";
 var SpaceSettingsPanel = ({ classNames, space }) => {
-  const { t } = useTranslation17(SPACE_PLUGIN);
-  const client = useClient6();
+  const { t } = useTranslation18(SPACE_PLUGIN);
+  const client = useClient5();
   const edgeEnabled = Boolean(client.config.values.runtime?.client?.edgeFeatures?.echoReplicator);
   const [edgeReplication, setEdgeReplication] = useState9(space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED);
   const toggleEdgeReplication = useCallback11(async (next) => {
     setEdgeReplication(next);
     await space?.internal.setEdgeReplicationPreference(next ? EdgeReplicationSetting.ENABLED : EdgeReplicationSetting.DISABLED).catch((err) => {
-      log3.catch(err, void 0, {
-        F: __dxlog_file3,
-        L: 35,
+      log2.catch(err, void 0, {
+        F: __dxlog_file2,
+        L: 36,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1110,9 +1081,12 @@ var SpaceSettingsPanel = ({ classNames, space }) => {
   }, [
     space
   ]);
-  return /* @__PURE__ */ React18.createElement(DeprecatedFormContainer2, null, /* @__PURE__ */ React18.createElement(DeprecatedFormInput2, {
+  return /* @__PURE__ */ React18.createElement("div", {
+    role: "form",
+    className: mx4("flex flex-col", classNames)
+  }, /* @__PURE__ */ React18.createElement(DeprecatedFormInput2, {
     label: t("name label")
-  }, /* @__PURE__ */ React18.createElement(Input5.TextInput, {
+  }, /* @__PURE__ */ React18.createElement(Input6.TextInput, {
     placeholder: t("unnamed space label"),
     value: space.properties.name ?? "",
     onChange: (event) => {
@@ -1120,23 +1094,22 @@ var SpaceSettingsPanel = ({ classNames, space }) => {
     }
   })), edgeEnabled && /* @__PURE__ */ React18.createElement(DeprecatedFormInput2, {
     label: t("edge replication label")
-  }, /* @__PURE__ */ React18.createElement(Input5.Switch, {
+  }, /* @__PURE__ */ React18.createElement(Input6.Switch, {
     checked: edgeReplication,
     onCheckedChange: toggleEdgeReplication
   })));
 };
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsDialog.tsx
-import React19, { useMemo as useMemo2, useState as useState10 } from "react";
-import { Surface as Surface2, useCapabilities } from "@dxos/app-framework";
-import { useClient as useClient7 } from "@dxos/react-client";
-import { Button as Button6, Clipboard, Dialog as Dialog4, Icon as Icon4, toLocalizedString as toLocalizedString3, useTranslation as useTranslation18 } from "@dxos/react-ui";
+import React19, { useState as useState10 } from "react";
+import { useClient as useClient6 } from "@dxos/react-client";
+import { Button as Button6, Clipboard, Dialog as Dialog4, Icon as Icon4, toLocalizedString as toLocalizedString3, useTranslation as useTranslation19 } from "@dxos/react-ui";
 import { Tabs } from "@dxos/react-ui-tabs";
 import { SpacePanel } from "@dxos/shell/react";
 var SPACE_SETTINGS_DIALOG = `${SPACE_PLUGIN}/SpaceSettingsDialog`;
 var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "members", namesCache }) => {
-  const { t } = useTranslation18(SPACE_PLUGIN);
-  const client = useClient7();
+  const { t } = useTranslation19(SPACE_PLUGIN);
+  const client = useClient6();
   const [tabsActivePart, setTabsActivePart] = useState10("list");
   const [selected, setSelected] = useState10(initialTab);
   const locked = space.properties[COMPOSER_SPACE_LOCK];
@@ -1144,12 +1117,6 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
     personal: client.spaces.default === space,
     namesCache
   });
-  const panels = useCapabilities(SpaceCapabilities.SettingsPanel);
-  const data = useMemo2(() => ({
-    subject: space
-  }), [
-    space
-  ]);
   return (
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
@@ -1202,10 +1169,7 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
     }, t("settings tab label")), /* @__PURE__ */ React19.createElement(Tabs.Tab, {
       value: "members",
       disabled: locked
-    }, t("members tab label")), panels.map((panel) => /* @__PURE__ */ React19.createElement(Tabs.Tab, {
-      key: panel.id,
-      value: panel.id
-    }, toLocalizedString3(panel.label, t)))))), /* @__PURE__ */ React19.createElement(Tabs.Tabpanel, {
+    }, t("members tab label"))))), /* @__PURE__ */ React19.createElement(Tabs.Tabpanel, {
       value: "settings",
       classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
     }, /* @__PURE__ */ React19.createElement(SpaceSettingsPanel, {
@@ -1218,32 +1182,25 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
       hideHeading: true,
       target,
       createInvitationUrl
-    }))), panels.map((panel) => /* @__PURE__ */ React19.createElement(Tabs.Tabpanel, {
-      key: panel.id,
-      value: panel.id,
-      classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
-    }, /* @__PURE__ */ React19.createElement(Surface2, {
-      role: `space-settings--${panel.id}`,
-      data
     }))))))
   );
 };
 
 // packages/plugins/plugin-space/src/components/SyncStatus/InlineSyncStatus.tsx
 import React20, { useEffect as useEffect6, useState as useState12 } from "react";
-import { useAppGraph as useAppGraph3 } from "@dxos/app-framework";
+import { useGraph as useGraph3 } from "@dxos/plugin-graph";
 import { QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
 import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
-import { useClient as useClient9 } from "@dxos/react-client";
-import { Tooltip as Tooltip3, useTranslation as useTranslation19 } from "@dxos/react-ui";
+import { useClient as useClient8 } from "@dxos/react-client";
+import { Tooltip as Tooltip3, useTranslation as useTranslation20 } from "@dxos/react-ui";
 import { AttentionGlyph as AttentionGlyph2, useAttended as useAttended2, useAttention as useAttention2 } from "@dxos/react-ui-attention";
 
 // packages/plugins/plugin-space/src/components/SyncStatus/sync-state.ts
 import { useEffect as useEffect5, useState as useState11 } from "react";
 import { Context } from "@dxos/context";
 import { EdgeService } from "@dxos/protocols";
-import { useClient as useClient8 } from "@dxos/react-client";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/sync-state.ts";
+import { useClient as useClient7 } from "@dxos/react-client";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/sync-state.ts";
 var createEmptyEdgeSyncState = () => ({
   missingOnLocal: 0,
   missingOnRemote: 0,
@@ -1263,11 +1220,11 @@ var getSyncSummary = (syncMap) => {
 };
 var isEdgePeerId = (peerId, spaceId) => peerId.startsWith(`${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`);
 var useSyncState = () => {
-  const client = useClient8();
+  const client = useClient7();
   const [spaceState, setSpaceState] = useState11({});
   useEffect5(() => {
     const ctx = new Context(void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 48
     });
     const createSubscriptions = (spaces) => {
@@ -1302,7 +1259,7 @@ var useSpaceSyncState = (space) => {
   const [spaceState, setSpaceState] = useState11();
   useEffect5(() => {
     const ctx = new Context(void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 87
     });
     space.crud.subscribeToSyncState(ctx, ({ peers = [] }) => {
@@ -1323,7 +1280,7 @@ var useSpaceSyncState = (space) => {
 // packages/plugins/plugin-space/src/components/SyncStatus/InlineSyncStatus.tsx
 var useEdgeStatus = () => {
   const [status, setStatus] = useState12(QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED);
-  const client = useClient9();
+  const client = useClient8();
   useEffect6(() => {
     client.services.services.EdgeAgentService?.queryEdgeStatus().subscribe(({ status: status2 }) => {
       setStatus(status2);
@@ -1334,11 +1291,11 @@ var useEdgeStatus = () => {
   return status;
 };
 var InlineSyncStatus = ({ space, open }) => {
-  const { t } = useTranslation19(SPACE_PLUGIN);
+  const { t } = useTranslation20(SPACE_PLUGIN);
   const id = space.id;
   const { hasAttention, isAncestor, isRelated } = useAttention2(id);
   const isAttended = hasAttention || isAncestor || isRelated;
-  const { graph } = useAppGraph3();
+  const { graph } = useGraph3();
   const attended = useAttended2();
   const startOfAttention = attended.at(-1);
   const path = usePath(graph, startOfAttention);
@@ -1363,16 +1320,16 @@ var InlineSyncStatus = ({ space, open }) => {
 // packages/plugins/plugin-space/src/components/SyncStatus/SyncStatus.tsx
 import React22, { useCallback as useCallback12, useEffect as useEffect8, useState as useState14 } from "react";
 import { StatusBar } from "@dxos/plugin-status-bar";
-import { useClient as useClient11 } from "@dxos/react-client";
-import { Icon as Icon6, Input as Input6, Popover as Popover3, useTranslation as useTranslation21 } from "@dxos/react-ui";
+import { useClient as useClient10 } from "@dxos/react-client";
+import { Icon as Icon6, Input as Input7, Popover as Popover3, useTranslation as useTranslation22 } from "@dxos/react-ui";
 import { SyntaxHighlighter } from "@dxos/react-ui-syntax-highlighter";
 import { mx as mx6 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-space/src/components/SyncStatus/Space.tsx
 import React21, { useEffect as useEffect7, useState as useState13 } from "react";
-import { useClient as useClient10 } from "@dxos/react-client";
+import { useClient as useClient9 } from "@dxos/react-client";
 import { useSpace } from "@dxos/react-client/echo";
-import { Icon as Icon5, toLocalizedString as toLocalizedString4, useTranslation as useTranslation20 } from "@dxos/react-ui";
+import { Icon as Icon5, toLocalizedString as toLocalizedString4, useTranslation as useTranslation21 } from "@dxos/react-ui";
 import { mx as mx5 } from "@dxos/react-ui-theme";
 var SYNC_STALLED_TIMEOUT = 5e3;
 var styles = {
@@ -1404,8 +1361,8 @@ var useActive = (count) => {
   return active;
 };
 var SpaceRowContainer = ({ spaceId, state }) => {
-  const { t } = useTranslation20(SPACE_PLUGIN);
-  const client = useClient10();
+  const { t } = useTranslation21(SPACE_PLUGIN);
+  const client = useClient9();
   const space = useSpace(spaceId);
   if (!space) {
     return null;
@@ -1481,7 +1438,7 @@ var Bar = ({ classNames, count, total }) => {
 
 // packages/plugins/plugin-space/src/components/SyncStatus/save-tracker.ts
 import { Context as Context2 } from "@dxos/context";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/save-tracker.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/save-tracker.ts";
 var createClientSaveTracker = (client, cb) => {
   const unsubscribeCallbacks = {};
   const state = {};
@@ -1509,7 +1466,7 @@ var createClientSaveTracker = (client, cb) => {
 };
 var createSpaceSaveTracker = (space, cb) => {
   const ctx = new Context2(void 0, {
-    F: __dxlog_file5,
+    F: __dxlog_file4,
     L: 40
   });
   void space.waitUntilReady().then(() => {
@@ -1572,7 +1529,7 @@ var getIcon = (status) => {
 
 // packages/plugins/plugin-space/src/components/SyncStatus/SyncStatus.tsx
 var SyncStatus = () => {
-  const client = useClient11();
+  const client = useClient10();
   const state = useSyncState();
   const [saved, setSaved] = useState14(true);
   useEffect8(() => {
@@ -1586,7 +1543,7 @@ var SyncStatus = () => {
   });
 };
 var SyncStatusIndicator = ({ state, saved }) => {
-  const { t } = useTranslation21(SPACE_PLUGIN);
+  const { t } = useTranslation22(SPACE_PLUGIN);
   const summary = getSyncSummary(state);
   const offline = Object.values(state).length === 0;
   const needsToUpload = summary.differentDocuments > 0 || summary.missingOnRemote > 0;
@@ -1627,16 +1584,18 @@ var SyncStatusIndicator = ({ state, saved }) => {
       asChild: true
     }, /* @__PURE__ */ React22.createElement(StatusBar.Button, {
       title
-    }, icon)), /* @__PURE__ */ React22.createElement(Popover3.Portal, null, /* @__PURE__ */ React22.createElement(Popover3.Content, null, /* @__PURE__ */ React22.createElement(SyncStatusDetail, {
+    }, icon)), /* @__PURE__ */ React22.createElement(Popover3.Portal, null, /* @__PURE__ */ React22.createElement(Popover3.Content, {
+      sideOffset: 16
+    }, /* @__PURE__ */ React22.createElement(SyncStatusDetail, {
       state,
       summary,
       debug: false
-    }), /* @__PURE__ */ React22.createElement(Popover3.Arrow, null))));
+    }))));
   }
 };
 var SyncStatusDetail = ({ classNames, state, summary, debug }) => {
   const [showAll, setShowAll] = useState14(false);
-  const { t } = useTranslation21(SPACE_PLUGIN);
+  const { t } = useTranslation22(SPACE_PLUGIN);
   const entries = Object.entries(state).filter(([_, value]) => showAll || value.missingOnLocal + value.missingOnRemote > 0).toSorted(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
   const handleCheckedChange = useCallback12((state2) => setShowAll(state2), [
     setShowAll
@@ -1650,9 +1609,9 @@ var SyncStatusDetail = ({ classNames, state, summary, debug }) => {
     className: "flex-1"
   }, t("sync status title")), /* @__PURE__ */ React22.createElement("div", {
     className: "flex items-center gap-2"
-  }, /* @__PURE__ */ React22.createElement(Input6.Root, null, /* @__PURE__ */ React22.createElement(Input6.Label, {
+  }, /* @__PURE__ */ React22.createElement(Input7.Root, null, /* @__PURE__ */ React22.createElement(Input7.Label, {
     classNames: "text-xs"
-  }, t("show all label")), /* @__PURE__ */ React22.createElement(Input6.Checkbox, {
+  }, t("show all label")), /* @__PURE__ */ React22.createElement(Input7.Checkbox, {
     checked: showAll,
     onCheckedChange: handleCheckedChange
   })))), /* @__PURE__ */ React22.createElement("div", {
@@ -1711,4 +1670,4 @@ export {
   SpaceState,
   SpacesReady
 };
-//# sourceMappingURL=chunk-TIFAXTJ5.mjs.map
+//# sourceMappingURL=chunk-GVOPDPS2.mjs.map