@dxos/plugin-space 0.7.5-main.9d2a38b → 0.7.5-main.e94eead

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

@@ -1,19 +1,19 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   SpaceCapabilities
-} from "./chunk-375RB3CZ.mjs";
+} from "./chunk-6RSVVEPS.mjs";
 import {
   COMPOSER_SPACE_LOCK,
   getSpaceDisplayName
-} from "./chunk-5QMAPAZD.mjs";
+} from "./chunk-PGH5L7MV.mjs";
 import {
   CollectionType,
   SpaceAction,
   SpaceForm
-} from "./chunk-HTBGWQEU.mjs";
+} from "./chunk-TRNZQEEN.mjs";
 import {
   SPACE_PLUGIN
-} from "./chunk-7FUVU45N.mjs";
+} from "./chunk-ICCM4YRJ.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 { NavigationAction, useIntentDispatcher, createIntent, useCapability, Capabilities } from "@dxos/app-framework";
+import { createIntent, LayoutAction, useIntentDispatcher, useLayout } 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 location = useCapability(Capabilities.Location);
+  const layout = useLayout();
   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 (location.active.solo?.[0].id === id) {
+      if (layout.active.includes(id)) {
         setOpen(false);
       }
     }
   }, [
     id,
     objects,
-    location
+    layout
   ]);
   const handleClose = useCallback3(async () => dispatch(createIntent(SpaceAction.WaitForObject, {
     id: void 0
@@ -157,12 +157,11 @@ var AwaitingObject = ({ id }) => {
     dispatch
   ]);
   const handleNavigate = useCallback3(() => {
-    void dispatch(createIntent(NavigationAction.Open, {
-      activeParts: {
-        main: [
-          id
-        ]
-      }
+    void dispatch(createIntent(LayoutAction.Open, {
+      part: "main",
+      subject: [
+        id
+      ]
     }));
     void handleClose();
   }, [
@@ -208,14 +207,21 @@ import React4 from "react";
 import { Input, useTranslation as useTranslation4 } from "@dxos/react-ui";
 var BaseObjectSettings = ({ object }) => {
   const { t } = useTranslation4(SPACE_PLUGIN);
+  const inputRef = React4.useRef(null);
   return /* @__PURE__ */ React4.createElement("div", {
     role: "form",
     className: "flex flex-col w-full p-2 gap-1"
   }, /* @__PURE__ */ React4.createElement(Input.Root, null, /* @__PURE__ */ React4.createElement(Input.Label, null, t("name label")), /* @__PURE__ */ React4.createElement(Input.TextInput, {
+    ref: inputRef,
     placeholder: t("name placeholder"),
     value: object.name ?? "",
     onChange: (event) => {
       object.name = event.target.value;
+    },
+    onKeyDown: (event) => {
+      if (event.key === "Enter") {
+        inputRef.current?.blur();
+      }
     }
   })));
 };
@@ -223,20 +229,23 @@ 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, NavigationAction as NavigationAction2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { Capabilities, chain, createIntent as createIntent2, LayoutAction as LayoutAction2, useCapabilities, useIntentDispatcher as useIntentDispatcher2, usePluginManager as usePluginManager2 } from "@dxos/app-framework";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { useClient as useClient2 } from "@dxos/react-client";
-import { getSpace, isReactiveObject, isSpace as isSpace2, useSpaces } from "@dxos/react-client/echo";
+import { getSpace, isReactiveObject, isSpace, 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 React5, { useCallback as useCallback4, useState as useState3 } from "react";
 import { Surface, isSurfaceAvailable, usePluginManager } from "@dxos/app-framework";
-import { getObjectAnnotation, S } from "@dxos/echo-schema";
-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 { getObjectAnnotation } from "@dxos/echo-schema";
+import { invariant } from "@dxos/invariant";
+import { Icon, toLocalizedString, useTranslation as useTranslation5 } from "@dxos/react-ui";
+import { Form as Form2 } from "@dxos/react-ui-form";
 import { SearchList } from "@dxos/react-ui-searchlist";
-import { nonNullable } from "@dxos/util";
+import { mx as mx2 } from "@dxos/react-ui-theme";
+import { isNonNullable } from "@dxos/util";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectPanel.tsx";
 var useInputSurfaceLookup = (baseData) => {
   const pluginManager = usePluginManager();
   return useCallback4(({ prop, schema, inputProps }) => {
@@ -261,38 +270,122 @@ var useInputSurfaceLookup = (baseData) => {
     baseData
   ]);
 };
-var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: initialTarget, name: initialName, defaultSpaceId, resolve, onCreateObject }) => {
+var CreateObjectPanel = ({ classNames, forms, 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);
-  const handleClearSchema = useCallback4(() => setTypename(void 0), []);
-  const handleClearTarget = useCallback4(() => setTarget(void 0), []);
+  const form = forms.find((form2) => getObjectAnnotation(form2.objectSchema)?.typename === typename);
+  const options = forms.map((form2) => getObjectAnnotation(form2.objectSchema)).filter(isNonNullable).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 handleCreateObject = useCallback4(async (props) => {
-    if (!schema || !target) {
+    if (!form || !target) {
       return;
     }
     await onCreateObject?.({
-      schema,
+      form,
       target,
       data: props
     });
   }, [
     onCreateObject,
-    schema,
+    form,
     target
   ]);
-  const metadata = useMemo(() => {
-    if (!typename) {
-      return;
+  const handleSetTypename = useCallback4(async (typename2) => {
+    invariant(target, "target is required", {
+      F: __dxlog_file,
+      L: 94,
+      S: void 0,
+      A: [
+        "target",
+        "'target is required'"
+      ]
+    });
+    const form2 = forms.find((form3) => getObjectAnnotation(form3.objectSchema)?.typename === typename2);
+    if (form2 && !form2.formSchema) {
+      await onCreateObject?.({
+        form: form2,
+        target
+      });
+    } else {
+      setTypename(typename2);
     }
-    return resolve?.(typename);
   }, [
-    resolve,
-    typename
+    forms,
+    onCreateObject,
+    target
   ]);
-  const schemaInput = /* @__PURE__ */ React5.createElement(SearchList.Root, {
+  const inputSurfaceLookup = useInputSurfaceLookup({
+    target
+  });
+  return /* @__PURE__ */ React5.createElement("div", {
+    role: "form",
+    className: mx2("flex flex-col gap-2", classNames)
+  }, !form ? /* @__PURE__ */ React5.createElement(SelectSchema, {
+    options,
+    resolve,
+    onChange: handleSetTypename
+  }) : !target ? /* @__PURE__ */ React5.createElement(SelectSpace, {
+    spaces,
+    defaultSpaceId,
+    onChange: setTarget
+  }) : form.formSchema ? /* @__PURE__ */ React5.createElement(Form2, {
+    classNames: "!p-0",
+    autoFocus: true,
+    values: {
+      name: initialName
+    },
+    schema: form.formSchema,
+    testId: "create-object-form",
+    onSave: handleCreateObject,
+    lookupComponent: inputSurfaceLookup
+  }) : void 0);
+};
+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, {
     label: t("schema input label"),
     classNames: "flex flex-col grow overflow-hidden"
   }, /* @__PURE__ */ React5.createElement(SearchList.Input, {
@@ -308,7 +401,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
       ns: option.typename,
       defaultValue: option.typename
     }),
-    onSelect: () => setTypename(option.typename),
+    onSelect: () => onChange(option.typename),
     classNames: "flex items-center gap-2"
   }, /* @__PURE__ */ React5.createElement("span", {
     className: "flex gap-2 items-center grow truncate"
@@ -319,104 +412,52 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     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/capabilities/index.ts
+import { lazy } from "@dxos/app-framework";
+var AppGraphBuilder = lazy(() => import("./app-graph-builder-TERVM2SL.mjs"));
+var AppGraphSerializer = lazy(() => import("./app-graph-serializer-GZRSWHEN.mjs"));
+var IdentityCreated = lazy(() => import("./identity-created-3CGEXNPO.mjs"));
+var IntentResolver = lazy(() => import("./intent-resolver-BLW4RM6X.mjs"));
+var ReactRoot = lazy(() => import("./react-root-7XXGP56B.mjs"));
+var ReactSurface = lazy(() => import("./react-surface-R2ECJSFB.mjs"));
+var Schema = lazy(() => import("./schema-LOR2EVGY.mjs"));
+var SpaceSettings = lazy(() => import("./settings-H6MXTEQM.mjs"));
+var SpaceState = lazy(() => import("./state-VYA6OFHD.mjs"));
+var SpacesReady = lazy(() => import("./spaces-ready-HKAQG5SA.mjs"));
+
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectDialog.tsx
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectDialog.tsx";
 var CREATE_OBJECT_DIALOG = `${SPACE_PLUGIN}/CreateObjectDialog`;
-var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _shouldNavigate, resolve }) => {
+var CreateObjectDialog = ({ target, typename, name, shouldNavigate: _shouldNavigate }) => {
   const closeRef = useRef(null);
+  const manager = usePluginManager2();
   const { t } = useTranslation6(SPACE_PLUGIN);
   const client = useClient2();
   const spaces = useSpaces();
   const { dispatchPromise: dispatch } = useIntentDispatcher2();
-  const handleCreateObject = useCallback5(async ({ schema, target: _target, data }) => {
-    const target2 = isSpace2(_target) ? _target.properties[CollectionType.typename]?.target : _target;
-    const createObjectIntent = resolve?.(schema.typename)?.createObject;
-    if (!createObjectIntent || !target2) {
+  const forms = useCapabilities(SpaceCapabilities.ObjectForm);
+  const resolve = useCallback5((typename2) => manager.context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename2)?.metadata ?? {}, [
+    manager
+  ]);
+  const handleCreateObject = useCallback5(async ({ form, target: _target, data = {} }) => {
+    const target2 = isSpace(_target) ? _target.properties[CollectionType.typename]?.target : _target;
+    if (!target2) {
       return;
     }
     closeRef.current?.click();
-    const space = isSpace2(target2) ? target2 : getSpace(target2);
-    const result = await dispatch(createObjectIntent(data, {
+    const space = isSpace(target2) ? target2 : getSpace(target2);
+    invariant2(space, "Missing space", {
+      F: __dxlog_file2,
+      L: 75,
+      S: void 0,
+      A: [
+        "space",
+        "'Missing space'"
+      ]
+    });
+    const result = await dispatch(form.getIntent(data, {
       space
     }));
     const object = result.data?.object;
@@ -427,7 +468,9 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
       });
       const shouldNavigate = _shouldNavigate ?? (() => true);
       if (shouldNavigate(object)) {
-        await dispatch(pipe(addObjectIntent, chain(NavigationAction2.Open, {})));
+        await dispatch(pipe(addObjectIntent, chain(LayoutAction2.Open, {
+          part: "main"
+        })));
       } else {
         await dispatch(addObjectIntent);
       }
@@ -440,7 +483,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 min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
+      classNames: "p-0 bs-content 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"
@@ -454,10 +497,9 @@ var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _sh
     }, /* @__PURE__ */ React6.createElement(Icon2, {
       icon: "ph--x--regular",
       size: 4
-    })))), /* @__PURE__ */ React6.createElement("div", {
-      className: "p-4"
-    }, /* @__PURE__ */ React6.createElement(CreateObjectPanel, {
-      schemas,
+    })))), /* @__PURE__ */ React6.createElement(CreateObjectPanel, {
+      classNames: "p-4",
+      forms,
       spaces,
       target,
       typename,
@@ -465,13 +507,14 @@ 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, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
+import { createIntent as createIntent3, LayoutAction as LayoutAction3, 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`;
@@ -481,15 +524,19 @@ var initialValues2 = {
 var CreateSpaceDialog = () => {
   const closeRef = useRef2(null);
   const { t } = useTranslation7(SPACE_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher3();
+  const { dispatch } = useIntentDispatcher3();
   const handleCreateSpace = useCallback6(async (data) => {
-    const result = await dispatch(createIntent3(SpaceAction.Create, data));
-    const target = result.data?.space;
-    if (target) {
-      await dispatch(createIntent3(SpaceAction.OpenCreateObject, {
-        target
+    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
+      }));
+    });
+    await Effect.runPromise(program);
   }, [
     dispatch
   ]);
@@ -497,7 +544,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-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
+      classNames: "p-0 bs-content min-bs-[16rem] max-bs-full md:max-is-[32rem] 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"
@@ -515,6 +562,8 @@ var CreateSpaceDialog = () => {
       className: "p-4"
     }, /* @__PURE__ */ React7.createElement(Form3, {
       testId: "create-space-form",
+      classNames: "!p-0",
+      autoFocus: true,
       values: initialValues2,
       schema: SpaceForm,
       onSave: handleCreateSpace
@@ -525,16 +574,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 mx2 } from "@dxos/react-ui-theme";
+import { baseSurface, descriptionText, mx as mx3 } from "@dxos/react-ui-theme";
 var CollectionMain = ({ collection }) => {
   const { t } = useTranslation8(SPACE_PLUGIN);
   return /* @__PURE__ */ React8.createElement("div", {
     role: "none",
-    className: mx2(baseSurface, "min-bs-screen is-full flex items-center justify-center p-8"),
+    className: mx3(baseSurface, "min-bs-screen is-full flex items-center justify-center p-8"),
     "data-testid": "composer.firstRunMessage"
   }, /* @__PURE__ */ React8.createElement("p", {
     role: "alert",
-    className: mx2(descriptionText, "border border-dashed border-neutral-400/50 rounded-lg p-8 font-normal text-lg max-is-[24rem] break-words")
+    className: mx3(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")));
 };
 
@@ -552,37 +601,62 @@ var CollectionSection = ({ collection }) => {
 
 // packages/plugins/plugin-space/src/components/JoinDialog.tsx
 import React10, { useCallback as useCallback7 } from "react";
-import { createIntent as createIntent4, LayoutAction, NavigationAction as NavigationAction3, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
-import { useGraph } from "@dxos/plugin-graph";
+import { createIntent as createIntent4, LayoutAction as LayoutAction4, useAppGraph, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
+import { log } from "@dxos/log";
 import { ObservabilityAction } from "@dxos/plugin-observability/types";
-import { useSpaces as useSpaces2 } from "@dxos/react-client/echo";
-import { Dialog as Dialog3, useTranslation as useTranslation10 } from "@dxos/react-ui";
+import { useClient as useClient3 } from "@dxos/react-client";
+import { Dialog as Dialog3 } from "@dxos/react-ui";
 import { JoinPanel } from "@dxos/shell/react";
+var __dxlog_file3 = "/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 spaces = useSpaces2();
-  const { graph } = useGraph();
+  const client = useClient3();
+  const { graph } = useAppGraph();
   const handleDone = useCallback7(async (result) => {
     if (result?.spaceKey) {
       await Promise.all([
-        dispatch(createIntent4(LayoutAction.SetLayout, {
-          element: "toast",
+        dispatch(createIntent4(LayoutAction4.AddToast, {
+          part: "toast",
           subject: {
             id: `${SPACE_PLUGIN}/join-success`,
             duration: 5e3,
-            title: t("join success label"),
-            closeLabel: t("dismiss label")
+            title: [
+              "join success label",
+              {
+                ns: SPACE_PLUGIN
+              }
+            ],
+            closeLabel: [
+              "dismiss label",
+              {
+                ns: SPACE_PLUGIN
+              }
+            ]
           }
         })),
-        dispatch(createIntent4(LayoutAction.SetLayout, {
-          element: "dialog",
-          state: false
+        dispatch(createIntent4(LayoutAction4.UpdateDialog, {
+          part: "dialog",
+          options: {
+            state: false
+          }
         }))
       ]);
     }
-    const space = spaces.find(({ key }) => result?.spaceKey?.equals(key));
+    const space = result?.spaceKey ? client.spaces.get(result.spaceKey) : void 0;
+    if (!space) {
+      log.warn("Space not found", result?.spaceKey, {
+        F: __dxlog_file3,
+        L: 56,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    await dispatch(createIntent4(LayoutAction4.SwitchWorkspace, {
+      part: "workspace",
+      subject: space.id
+    }));
     const target = result?.target || (navigableCollections ? space?.id : void 0);
     if (target) {
       await graph.waitForPath({
@@ -590,15 +664,15 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
       }).catch(() => {
       });
       await Promise.all([
-        dispatch(createIntent4(NavigationAction3.Open, {
-          activeParts: {
-            main: [
-              target
-            ]
-          }
+        dispatch(createIntent4(LayoutAction4.Open, {
+          part: "main",
+          subject: [
+            target
+          ]
         })),
-        dispatch(createIntent4(NavigationAction3.Expose, {
-          id: target
+        dispatch(createIntent4(LayoutAction4.Expose, {
+          part: "navigation",
+          subject: target
         }))
       ]);
     }
@@ -613,7 +687,8 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
     }
   }, [
     dispatch,
-    spaces
+    client,
+    graph
   ]);
   return /* @__PURE__ */ React10.createElement(Dialog3.Content, null, /* @__PURE__ */ React10.createElement(JoinPanel, {
     ...props,
@@ -631,11 +706,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 useClient3 } from "@dxos/react-client";
-import { DropdownMenu, toLocalizedString as toLocalizedString2, useTranslation as useTranslation11 } from "@dxos/react-ui";
+import { useClient as useClient4 } from "@dxos/react-client";
+import { DropdownMenu, toLocalizedString as toLocalizedString2, useTranslation as useTranslation10 } from "@dxos/react-ui";
 var MenuFooter = ({ object }) => {
-  const { t } = useTranslation11(SPACE_PLUGIN);
-  const client = useClient3();
+  const { t } = useTranslation10(SPACE_PLUGIN);
+  const client = useClient4();
   const space = getSpace2(object);
   const spaceName = space ? getSpaceDisplayName(space, {
     personal: client.spaces.default === space
@@ -655,8 +730,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 useTranslation12 } from "@dxos/react-ui";
-import { getSize as getSize2, mx as mx3, staticPlaceholderText, warningText } from "@dxos/react-ui-theme";
+import { Tooltip, useTranslation as useTranslation11 } from "@dxos/react-ui";
+import { getSize as getSize2, mx as mx4, staticPlaceholderText, warningText } from "@dxos/react-ui-theme";
 var Status;
 (function(Status2) {
   Status2[Status2["PERSISTED_LOCALLY"] = 0] = "PERSISTED_LOCALLY";
@@ -664,7 +739,7 @@ var Status;
   Status2[Status2["ERROR"] = 2] = "ERROR";
 })(Status || (Status = {}));
 var PersistenceStatus = ({ db }) => {
-  const { t } = useTranslation12(SPACE_PLUGIN);
+  const { t } = useTranslation11(SPACE_PLUGIN);
   const [displayMessage, setDisplayMessage] = useState4(false);
   const [status, naturalSetStatus] = useState4(0);
   const [prevStatus, setPrevStatus] = useState4(0);
@@ -684,17 +759,17 @@ var PersistenceStatus = ({ db }) => {
       return /* @__PURE__ */ React12.createElement("div", {
         className: "flex items-center"
       }, /* @__PURE__ */ React12.createElement(Warning, {
-        className: mx3(getSize2(4), "me-1")
+        className: mx4(getSize2(4), "me-1")
       }), /* @__PURE__ */ React12.createElement("span", {
-        className: mx3("text-sm", warningText)
+        className: mx4("text-sm", warningText)
       }, t("persistence error label")));
     case 1:
       return /* @__PURE__ */ React12.createElement("div", {
         className: "flex items-center"
       }, /* @__PURE__ */ React12.createElement(ArrowsCounterClockwise, {
-        className: mx3(getSize2(4), "me-1")
+        className: mx4(getSize2(4), "me-1")
       }), /* @__PURE__ */ React12.createElement("span", {
-        className: mx3("text-sm", staticPlaceholderText)
+        className: mx4("text-sm", staticPlaceholderText)
       }, t("persistence pending label")));
     case 0:
     default:
@@ -704,18 +779,62 @@ var PersistenceStatus = ({ db }) => {
         role: "status",
         className: "flex items-center"
       }, /* @__PURE__ */ React12.createElement(CheckCircle2, {
-        className: mx3(getSize2(4), "me-1")
+        className: mx4(getSize2(4), "me-1")
       }), displayMessage && /* @__PURE__ */ React12.createElement("span", {
-        className: mx3("text-sm", staticPlaceholderText)
+        className: mx4("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/PopoverAddSpace.tsx
+import React13 from "react";
+import { createIntent as createIntent5, LayoutAction as LayoutAction5, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
+import { IconButton as IconButton3, useTranslation as useTranslation12 } from "@dxos/react-ui";
+var POPOVER_ADD_SPACE = `${SPACE_PLUGIN}/PopoverRenameSpace`;
+var PopoverAddSpace = () => {
+  const { t } = useTranslation12(SPACE_PLUGIN);
+  const { dispatchPromise: dispatch } = useIntentDispatcher5();
+  return /* @__PURE__ */ React13.createElement("div", {
+    role: "none",
+    className: "grid grid-cols-1 gap-1 [&>button]:justify-start"
+  }, /* @__PURE__ */ React13.createElement(IconButton3, {
+    variant: "ghost",
+    label: t("create space label"),
+    icon: "ph--plus--regular",
+    onClick: () => {
+      void dispatch(createIntent5(SpaceAction.OpenCreateSpace));
+      void dispatch(createIntent5(LayoutAction5.UpdatePopover, {
+        part: "popover",
+        options: {
+          anchorId: "",
+          state: false
+        }
+      }));
+    },
+    "data-testid": "spacePlugin.createSpace"
+  }), /* @__PURE__ */ React13.createElement(IconButton3, {
+    variant: "ghost",
+    label: t("join space label"),
+    icon: "ph--sign-in--regular",
+    onClick: () => {
+      void dispatch(createIntent5(SpaceAction.Join));
+      void dispatch(createIntent5(LayoutAction5.UpdatePopover, {
+        part: "popover",
+        options: {
+          anchorId: "",
+          state: false
+        }
+      }));
+    },
+    "data-testid": "spacePlugin.joinSpace"
+  }));
+};
+
 // packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx
-import React13, { useCallback as useCallback8, useRef as useRef3, useState as useState5 } from "react";
-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";
+import React14, { 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 useTranslation13 } from "@dxos/react-ui";
+var __dxlog_file4 = "/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 } = useTranslation13(SPACE_PLUGIN);
@@ -729,10 +848,10 @@ var PopoverRenameObject = ({ object: obj }) => {
       try {
         object.title = name;
       } catch (err) {
-        log.error("Failed to rename object", {
+        log2.error("Failed to rename object", {
           err
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file4,
           L: 30,
           S: void 0,
           C: (f, a) => f(...a)
@@ -743,23 +862,23 @@ var PopoverRenameObject = ({ object: obj }) => {
     object,
     name
   ]);
-  return /* @__PURE__ */ React13.createElement("div", {
+  return /* @__PURE__ */ React14.createElement("div", {
     role: "none",
     className: "p-1 flex gap-2"
-  }, /* @__PURE__ */ React13.createElement("div", {
+  }, /* @__PURE__ */ React14.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ React13.createElement(Input3.Root, null, /* @__PURE__ */ React13.createElement(Input3.Label, {
+  }, /* @__PURE__ */ React14.createElement(Input2.Root, null, /* @__PURE__ */ React14.createElement(Input2.Label, {
     srOnly: true
-  }, t("object name label")), /* @__PURE__ */ React13.createElement(Input3.TextInput, {
+  }, t("object name label")), /* @__PURE__ */ React14.createElement(Input2.TextInput, {
     placeholder: t("object title placeholder"),
     value: name,
     "data-testid": "spacePlugin.renameObject.input",
     onChange: ({ target: { value } }) => setName(value),
     onKeyDown: ({ key }) => key === "Enter" && doneButton.current?.click()
-  }))), /* @__PURE__ */ React13.createElement(Popover.Close, {
+  }))), /* @__PURE__ */ React14.createElement(Popover.Close, {
     asChild: true
-  }, /* @__PURE__ */ React13.createElement(Button4, {
+  }, /* @__PURE__ */ React14.createElement(Button4, {
     ref: doneButton,
     classNames: "self-stretch",
     onClick: handleDone
@@ -769,8 +888,8 @@ 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 Input4, Popover as Popover2, useTranslation as useTranslation14 } from "@dxos/react-ui";
+import React15, { useCallback as useCallback9, useRef as useRef4, useState as useState6 } from "react";
+import { Button as Button5, Input as Input3, Popover as Popover2, useTranslation as useTranslation14 } from "@dxos/react-ui";
 var POPOVER_RENAME_SPACE = `${SPACE_PLUGIN}/PopoverRenameSpace`;
 var PopoverRenameSpace = ({ space }) => {
   const { t } = useTranslation14(SPACE_PLUGIN);
@@ -782,24 +901,24 @@ var PopoverRenameSpace = ({ space }) => {
     space,
     name
   ]);
-  return /* @__PURE__ */ React14.createElement("div", {
+  return /* @__PURE__ */ React15.createElement("div", {
     role: "none",
     className: "p-1 flex gap-2"
-  }, /* @__PURE__ */ React14.createElement("div", {
+  }, /* @__PURE__ */ React15.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ React14.createElement(Input4.Root, null, /* @__PURE__ */ React14.createElement(Input4.Label, {
+  }, /* @__PURE__ */ React15.createElement(Input3.Root, null, /* @__PURE__ */ React15.createElement(Input3.Label, {
     srOnly: true
-  }, t("space name label")), /* @__PURE__ */ React14.createElement(Input4.TextInput, {
+  }, t("space name label")), /* @__PURE__ */ React15.createElement(Input3.TextInput, {
     defaultValue: space.properties.name ?? "",
     placeholder: t("unnamed space label"),
     onChange: ({ target: { value } }) => setName(value),
     // TODO(wittjosiah): Ideally this should access the popover context to close the popover.
     //   Currently this is not possible because Radix does not expose the popover context.
     onKeyDown: ({ key }) => key === "Enter" && doneButton.current?.click()
-  }))), /* @__PURE__ */ React14.createElement(Popover2.Close, {
+  }))), /* @__PURE__ */ React15.createElement(Popover2.Close, {
     asChild: true
-  }, /* @__PURE__ */ React14.createElement(Button5, {
+  }, /* @__PURE__ */ React15.createElement(Button5, {
     ref: doneButton,
     classNames: "self-stretch",
     onClick: handleDone
@@ -809,20 +928,20 @@ 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 React16 from "react";
+import { createIntent as createIntent6, useIntentDispatcher as useIntentDispatcher6 } from "@dxos/app-framework";
 import { IconButton as IconButton4, useTranslation as useTranslation15 } from "@dxos/react-ui";
 var ShareSpaceButton = ({ space }) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher5();
-  return /* @__PURE__ */ React15.createElement(ShareSpaceButtonImpl, {
-    onClick: () => dispatch(createIntent5(SpaceAction.Share, {
+  const { dispatchPromise: dispatch } = useIntentDispatcher6();
+  return /* @__PURE__ */ React16.createElement(ShareSpaceButtonImpl, {
+    onClick: () => dispatch(createIntent6(SpaceAction.Share, {
       space
     }))
   });
 };
 var ShareSpaceButtonImpl = ({ onClick }) => {
   const { t } = useTranslation15(SPACE_PLUGIN);
-  return /* @__PURE__ */ React15.createElement(IconButton4, {
+  return /* @__PURE__ */ React16.createElement(IconButton4, {
     "data-testid": "spacePlugin.shareSpaceButton",
     icon: "ph--users--regular",
     label: t("share space label"),
@@ -831,29 +950,16 @@ 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 { useCapability as useCapability2 } from "@dxos/app-framework";
+import React17, { useCallback as useCallback10, useEffect as useEffect4, useState as useState8 } from "react";
+import { useAppGraph as useAppGraph2, useCapability } from "@dxos/app-framework";
 import { generateName } from "@dxos/display-name";
-import { useGraph as useGraph2 } from "@dxos/plugin-graph";
-import { PublicKey, useClient as useClient4 } from "@dxos/react-client";
+import { PublicKey, useClient as useClient5 } 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 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-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";
 var usePath = (graph, id, timeout) => {
@@ -896,8 +1002,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 = useCapability2(SpaceCapabilities.MutableState);
-  const client = useClient4();
+  const spaceState = useCapability(SpaceCapabilities.MutableState);
+  const client = useClient5();
   const identity = useIdentity();
   const space = spaceKey ? client.spaces.get(spaceKey) : getSpace3(object);
   const spaceMembers = useMembers(space?.key);
@@ -924,7 +1030,7 @@ var SpacePresence = ({ object, spaceKey }) => {
       lastSeen
     };
   }).toSorted((a, b) => a.lastSeen - b.lastSeen);
-  return /* @__PURE__ */ React16.createElement(FullPresence, {
+  return /* @__PURE__ */ React17.createElement(FullPresence, {
     members: membersForObject
   });
 };
@@ -934,38 +1040,38 @@ var FullPresence = (props) => {
   if (members.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ React16.createElement(AvatarGroup.Root, {
+  return /* @__PURE__ */ React17.createElement(AvatarGroup.Root, {
     size,
     classNames: "mbs-2 mie-4",
     "data-testid": "spacePlugin.presence"
-  }, members.slice(0, 3).map((member, i) => /* @__PURE__ */ React16.createElement(Tooltip2.Root, {
+  }, members.slice(0, 3).map((member, i) => /* @__PURE__ */ React17.createElement(Tooltip2.Root, {
     key: member.identity.identityKey.toHex()
-  }, /* @__PURE__ */ React16.createElement(Tooltip2.Trigger, null, /* @__PURE__ */ React16.createElement(PrensenceAvatar, {
+  }, /* @__PURE__ */ React17.createElement(Tooltip2.Trigger, null, /* @__PURE__ */ React17.createElement(PrensenceAvatar, {
     identity: member.identity,
     group: true,
     match: member.currentlyAttended,
     index: members.length - i,
     onClick: () => onMemberClick?.(member)
-  })), /* @__PURE__ */ React16.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React16.createElement(Tooltip2.Content, {
+  })), /* @__PURE__ */ React17.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React17.createElement(Tooltip2.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ React16.createElement("span", null, getName(member.identity)), /* @__PURE__ */ React16.createElement(Tooltip2.Arrow, null))))), members.length > 3 && /* @__PURE__ */ React16.createElement(Tooltip2.Root, null, /* @__PURE__ */ React16.createElement(Tooltip2.Trigger, null, /* @__PURE__ */ React16.createElement(AvatarGroupItem.Root, {
+  }, /* @__PURE__ */ React17.createElement("span", null, getName(member.identity)), /* @__PURE__ */ React17.createElement(Tooltip2.Arrow, null))))), members.length > 3 && /* @__PURE__ */ React17.createElement(Tooltip2.Root, null, /* @__PURE__ */ React17.createElement(Tooltip2.Trigger, null, /* @__PURE__ */ React17.createElement(AvatarGroupItem.Root, {
     status: "inactive"
-  }, /* @__PURE__ */ React16.createElement(Avatar.Frame, {
+  }, /* @__PURE__ */ React17.createElement(Avatar.Frame, {
     style: {
       zIndex: members.length - 4
     }
-  }, /* @__PURE__ */ React16.createElement(Avatar.Fallback, {
+  }, /* @__PURE__ */ React17.createElement(Avatar.Fallback, {
     text: `+${members.length - 3}`
-  })))), /* @__PURE__ */ React16.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React16.createElement(Tooltip2.Content, {
+  })))), /* @__PURE__ */ React17.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React17.createElement(Tooltip2.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ React16.createElement(Tooltip2.Arrow, null), /* @__PURE__ */ React16.createElement(List2, {
+  }, /* @__PURE__ */ React17.createElement(Tooltip2.Arrow, null), /* @__PURE__ */ React17.createElement(List2, {
     classNames: "max-h-56 overflow-y-auto"
-  }, members.map((member) => /* @__PURE__ */ React16.createElement(ListItem2.Root, {
+  }, members.map((member) => /* @__PURE__ */ React17.createElement(ListItem2.Root, {
     key: member.identity.identityKey.toHex(),
     classNames: "flex gap-2 items-center cursor-pointer mbe-2",
     onClick: () => onMemberClick?.(member),
     "data-testid": "identity-list-item"
-  }, /* @__PURE__ */ React16.createElement(PrensenceAvatar, {
+  }, /* @__PURE__ */ React17.createElement(PrensenceAvatar, {
     identity: member.identity,
     showName: true,
     match: member.currentlyAttended
@@ -975,10 +1081,10 @@ var PrensenceAvatar = ({ identity, showName, match, group, index, onClick }) =>
   const Root = group ? AvatarGroupItem.Root : Avatar.Root;
   const status = match ? "current" : "active";
   const fallbackValue = keyToFallback(identity.identityKey);
-  return /* @__PURE__ */ React16.createElement(Root, {
+  return /* @__PURE__ */ React17.createElement(Root, {
     status,
     hue: identity.profile?.data?.hue || fallbackValue.hue
-  }, /* @__PURE__ */ React16.createElement(Avatar.Frame, {
+  }, /* @__PURE__ */ React17.createElement(Avatar.Frame, {
     "data-testid": "spacePlugin.presence.member",
     "data-status": status,
     ...index ? {
@@ -987,16 +1093,16 @@ var PrensenceAvatar = ({ identity, showName, match, group, index, onClick }) =>
       }
     } : {},
     onClick: () => onClick?.()
-  }, /* @__PURE__ */ React16.createElement(Avatar.Fallback, {
+  }, /* @__PURE__ */ React17.createElement(Avatar.Fallback, {
     text: identity.profile?.data?.emoji || fallbackValue.emoji
-  })), showName && /* @__PURE__ */ React16.createElement(Avatar.Label, {
+  })), showName && /* @__PURE__ */ React17.createElement(Avatar.Label, {
     classNames: "text-sm truncate pli-2"
   }, getName(identity)));
 };
 var SmallPresenceLive = ({ id, open, viewers }) => {
   const { hasAttention, isAncestor, isRelated } = useAttention(id);
   const isAttended = hasAttention || isAncestor || isRelated;
-  const { graph } = useGraph2();
+  const { graph } = useAppGraph2();
   const attended = useAttended();
   const startOfAttention = attended.at(-1);
   const path = usePath(graph, startOfAttention);
@@ -1017,7 +1123,7 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
   }, [
     viewers
   ]);
-  return /* @__PURE__ */ React16.createElement(SmallPresence, {
+  return /* @__PURE__ */ React17.createElement(SmallPresence, {
     count: activeViewers.length,
     attended: isAttended,
     containsAttended
@@ -1025,53 +1131,53 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
 };
 var SmallPresence = ({ count = 0, attended, containsAttended }) => {
   const { t } = useTranslation16(SPACE_PLUGIN);
-  return /* @__PURE__ */ React16.createElement(Tooltip2.Root, null, /* @__PURE__ */ React16.createElement(Tooltip2.Trigger, {
+  return /* @__PURE__ */ React17.createElement(Tooltip2.Root, null, /* @__PURE__ */ React17.createElement(Tooltip2.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React16.createElement(AttentionGlyph, {
+  }, /* @__PURE__ */ React17.createElement(AttentionGlyph, {
     attended,
     containsAttended,
     presence: count > 1 ? "many" : count === 1 ? "one" : "none",
     classNames: "self-center mie-1"
-  })), /* @__PURE__ */ React16.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React16.createElement(Tooltip2.Content, {
+  })), /* @__PURE__ */ React17.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React17.createElement(Tooltip2.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ React16.createElement("span", null, t("presence label", {
+  }, /* @__PURE__ */ React17.createElement("span", null, t("presence label", {
     count
-  })), /* @__PURE__ */ React16.createElement(Tooltip2.Arrow, null))));
+  })), /* @__PURE__ */ React17.createElement(Tooltip2.Arrow, null))));
 };
 
 // packages/plugins/plugin-space/src/components/SpacePluginSettings.tsx
-import React17 from "react";
-import { Input as Input5, useTranslation as useTranslation17 } from "@dxos/react-ui";
-import { DeprecatedFormInput } from "@dxos/react-ui-form";
+import React18 from "react";
+import { Input as Input4, useTranslation as useTranslation17 } from "@dxos/react-ui";
+import { DeprecatedFormContainer, DeprecatedFormInput } from "@dxos/react-ui-form";
 var SpacePluginSettings = ({ settings }) => {
   const { t } = useTranslation17(SPACE_PLUGIN);
-  return /* @__PURE__ */ React17.createElement(React17.Fragment, null, /* @__PURE__ */ React17.createElement(DeprecatedFormInput, {
+  return /* @__PURE__ */ React18.createElement(DeprecatedFormContainer, null, /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
     label: t("show hidden spaces label")
-  }, /* @__PURE__ */ React17.createElement(Input5.Switch, {
+  }, /* @__PURE__ */ React18.createElement(Input4.Switch, {
     checked: settings.showHidden,
     onCheckedChange: (checked) => settings.showHidden = !!checked
   })));
 };
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx
-import React18, { useCallback as useCallback11, useState as useState9 } from "react";
-import { log as log2 } from "@dxos/log";
+import React19, { useCallback as useCallback11, useState as useState9 } from "react";
+import { log as log3 } from "@dxos/log";
 import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
-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 }) => {
+import { useClient as useClient6 } from "@dxos/react-client";
+import { Input as Input5, Toolbar, useTranslation as useTranslation18 } from "@dxos/react-ui";
+import { DeprecatedFormContainer as DeprecatedFormContainer2, DeprecatedFormInput as DeprecatedFormInput2 } from "@dxos/react-ui-form";
+import { HuePicker, IconPicker } from "@dxos/react-ui-pickers";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx";
+var SpaceSettingsPanel = ({ space }) => {
   const { t } = useTranslation18(SPACE_PLUGIN);
-  const client = useClient5();
+  const client = useClient6();
   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) => {
-      log2.catch(err, void 0, {
-        F: __dxlog_file2,
+      log3.catch(err, void 0, {
+        F: __dxlog_file5,
         L: 36,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1081,35 +1187,49 @@ var SpaceSettingsPanel = ({ classNames, space }) => {
   }, [
     space
   ]);
-  return /* @__PURE__ */ React18.createElement("div", {
-    role: "form",
-    className: mx4("flex flex-col", classNames)
-  }, /* @__PURE__ */ React18.createElement(DeprecatedFormInput2, {
+  return /* @__PURE__ */ React19.createElement(DeprecatedFormContainer2, null, /* @__PURE__ */ React19.createElement(DeprecatedFormInput2, {
     label: t("name label")
-  }, /* @__PURE__ */ React18.createElement(Input6.TextInput, {
+  }, /* @__PURE__ */ React19.createElement(Input5.TextInput, {
     placeholder: t("unnamed space label"),
     value: space.properties.name ?? "",
     onChange: (event) => {
       space.properties.name = event.target.value;
     }
-  })), edgeEnabled && /* @__PURE__ */ React18.createElement(DeprecatedFormInput2, {
+  })), /* @__PURE__ */ React19.createElement(DeprecatedFormInput2, {
+    label: t("icon label")
+  }, /* @__PURE__ */ React19.createElement(Toolbar.Root, null, /* @__PURE__ */ React19.createElement(IconPicker, {
+    value: space.properties.icon,
+    onChange: (nextIcon) => space.properties.icon = nextIcon,
+    onReset: () => {
+      space.properties.icon = void 0;
+    }
+  }))), /* @__PURE__ */ React19.createElement(DeprecatedFormInput2, {
+    label: t("hue label")
+  }, /* @__PURE__ */ React19.createElement(Toolbar.Root, null, /* @__PURE__ */ React19.createElement(HuePicker, {
+    value: space.properties.hue,
+    onChange: (nextHue) => space.properties.hue = nextHue,
+    onReset: () => {
+      space.properties.hue = void 0;
+    }
+  }))), edgeEnabled && /* @__PURE__ */ React19.createElement(DeprecatedFormInput2, {
     label: t("edge replication label")
-  }, /* @__PURE__ */ React18.createElement(Input6.Switch, {
+  }, /* @__PURE__ */ React19.createElement(Input5.Switch, {
     checked: edgeReplication,
     onCheckedChange: toggleEdgeReplication
   })));
 };
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsDialog.tsx
-import React19, { useState as useState10 } from "react";
-import { useClient as useClient6 } from "@dxos/react-client";
+import React20, { useMemo, useState as useState10 } from "react";
+import { Surface as Surface2, useCapabilities as useCapabilities2 } 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 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 } = useTranslation19(SPACE_PLUGIN);
-  const client = useClient6();
+  const client = useClient7();
   const [tabsActivePart, setTabsActivePart] = useState10("list");
   const [selected, setSelected] = useState10(initialTab);
   const locked = space.properties[COMPOSER_SPACE_LOCK];
@@ -1117,81 +1237,97 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
     personal: client.spaces.default === space,
     namesCache
   });
+  const panels = useCapabilities2(SpaceCapabilities.SettingsPanel);
+  const data = useMemo(() => ({
+    subject: space
+  }), [
+    space
+  ]);
   return (
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
-    /* @__PURE__ */ React19.createElement(Dialog4.Content, {
+    /* @__PURE__ */ React20.createElement(Dialog4.Content, {
       classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
-    }, /* @__PURE__ */ React19.createElement("div", {
+    }, /* @__PURE__ */ React20.createElement("div", {
       role: "none",
       className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
-    }, /* @__PURE__ */ React19.createElement(Dialog4.Title, {
+    }, /* @__PURE__ */ React20.createElement(Dialog4.Title, {
       onClick: () => setTabsActivePart("list"),
       "aria-description": t("click to return to tablist description"),
       classNames: "flex cursor-pointer items-center group/title"
-    }, /* @__PURE__ */ React19.createElement(Icon4, {
+    }, /* @__PURE__ */ React20.createElement(Icon4, {
       icon: "ph--caret-left--regular",
       size: 4,
       classNames: [
         "@md:hidden",
         tabsActivePart === "list" && "invisible"
       ]
-    }), /* @__PURE__ */ React19.createElement("span", {
+    }), /* @__PURE__ */ React20.createElement("span", {
       className: tabsActivePart !== "list" ? "group-hover/title:underline @md:group-hover/title:no-underline underline-offset-4 decoration-1" : ""
-    }, toLocalizedString3(name, t))), /* @__PURE__ */ React19.createElement(Dialog4.Close, {
+    }, toLocalizedString3(name, t))), /* @__PURE__ */ React20.createElement(Dialog4.Close, {
       asChild: true
-    }, /* @__PURE__ */ React19.createElement(Button6, {
+    }, /* @__PURE__ */ React20.createElement(Button6, {
       density: "fine",
       variant: "ghost",
       autoFocus: true
-    }, /* @__PURE__ */ React19.createElement(Icon4, {
+    }, /* @__PURE__ */ React20.createElement(Icon4, {
       icon: "ph--x--regular",
       size: 4
-    })))), /* @__PURE__ */ React19.createElement(Tabs.Root, {
+    })))), /* @__PURE__ */ React20.createElement(Tabs.Root, {
       orientation: "vertical",
       value: selected,
       onValueChange: setSelected,
       activePart: tabsActivePart,
       onActivePartChange: setTabsActivePart,
       classNames: "flex flex-col flex-1 mbs-2"
-    }, /* @__PURE__ */ React19.createElement(Tabs.Viewport, {
+    }, /* @__PURE__ */ React20.createElement(Tabs.Viewport, {
       classNames: "flex-1 min-bs-0"
-    }, /* @__PURE__ */ React19.createElement("div", {
+    }, /* @__PURE__ */ React20.createElement("div", {
       role: "none",
       className: "overflow-y-auto pli-3 @md:pis-2 @md:pie-0 mbe-4 border-r border-separator"
-    }, /* @__PURE__ */ React19.createElement(Tabs.Tablist, {
+    }, /* @__PURE__ */ React20.createElement(Tabs.Tablist, {
       classNames: "flex flex-col max-bs-none min-is-[200px] gap-4 overflow-y-auto"
-    }, /* @__PURE__ */ React19.createElement("div", {
+    }, /* @__PURE__ */ React20.createElement("div", {
       role: "none",
       className: "flex flex-col ml-1"
-    }, /* @__PURE__ */ React19.createElement(Tabs.Tab, {
+    }, /* @__PURE__ */ React20.createElement(Tabs.Tab, {
       value: "settings"
-    }, t("settings tab label")), /* @__PURE__ */ React19.createElement(Tabs.Tab, {
+    }, t("settings tab label")), /* @__PURE__ */ React20.createElement(Tabs.Tab, {
       value: "members",
       disabled: locked
-    }, t("members tab label"))))), /* @__PURE__ */ React19.createElement(Tabs.Tabpanel, {
+    }, t("members tab label")), panels.map((panel) => /* @__PURE__ */ React20.createElement(Tabs.Tab, {
+      key: panel.id,
+      value: panel.id
+    }, toLocalizedString3(panel.label, t)))))), /* @__PURE__ */ React20.createElement(Tabs.Tabpanel, {
       value: "settings",
       classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
-    }, /* @__PURE__ */ React19.createElement(SpaceSettingsPanel, {
+    }, /* @__PURE__ */ React20.createElement(SpaceSettingsPanel, {
       space
-    })), /* @__PURE__ */ React19.createElement(Tabs.Tabpanel, {
+    })), /* @__PURE__ */ React20.createElement(Tabs.Tabpanel, {
       value: "members",
       classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
-    }, /* @__PURE__ */ React19.createElement(Clipboard.Provider, null, /* @__PURE__ */ React19.createElement(SpacePanel, {
+    }, /* @__PURE__ */ React20.createElement(Clipboard.Provider, null, /* @__PURE__ */ React20.createElement(SpacePanel, {
       space,
       hideHeading: true,
       target,
       createInvitationUrl
+    }))), panels.map((panel) => /* @__PURE__ */ React20.createElement(Tabs.Tabpanel, {
+      key: panel.id,
+      value: panel.id,
+      classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
+    }, /* @__PURE__ */ React20.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 { useGraph as useGraph3 } from "@dxos/plugin-graph";
+import React21, { useEffect as useEffect6, useState as useState12 } from "react";
+import { useAppGraph as useAppGraph3 } from "@dxos/app-framework";
 import { QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
 import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
-import { useClient as useClient8 } from "@dxos/react-client";
+import { useClient as useClient9 } 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";
 
@@ -1199,8 +1335,8 @@ import { AttentionGlyph as AttentionGlyph2, useAttended as useAttended2, useAtte
 import { useEffect as useEffect5, useState as useState11 } from "react";
 import { Context } from "@dxos/context";
 import { EdgeService } from "@dxos/protocols";
-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";
+import { useClient as useClient8 } from "@dxos/react-client";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/sync-state.ts";
 var createEmptyEdgeSyncState = () => ({
   missingOnLocal: 0,
   missingOnRemote: 0,
@@ -1220,11 +1356,11 @@ var getSyncSummary = (syncMap) => {
 };
 var isEdgePeerId = (peerId, spaceId) => peerId.startsWith(`${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`);
 var useSyncState = () => {
-  const client = useClient7();
+  const client = useClient8();
   const [spaceState, setSpaceState] = useState11({});
   useEffect5(() => {
     const ctx = new Context(void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file6,
       L: 48
     });
     const createSubscriptions = (spaces) => {
@@ -1259,7 +1395,7 @@ var useSpaceSyncState = (space) => {
   const [spaceState, setSpaceState] = useState11();
   useEffect5(() => {
     const ctx = new Context(void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file6,
       L: 87
     });
     space.crud.subscribeToSyncState(ctx, ({ peers = [] }) => {
@@ -1280,7 +1416,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 = useClient8();
+  const client = useClient9();
   useEffect6(() => {
     client.services.services.EdgeAgentService?.queryEdgeStatus().subscribe(({ status: status2 }) => {
       setStatus(status2);
@@ -1295,7 +1431,7 @@ var InlineSyncStatus = ({ space, open }) => {
   const id = space.id;
   const { hasAttention, isAncestor, isRelated } = useAttention2(id);
   const isAttended = hasAttention || isAncestor || isRelated;
-  const { graph } = useGraph3();
+  const { graph } = useAppGraph3();
   const attended = useAttended2();
   const startOfAttention = attended.at(-1);
   const path = usePath(graph, startOfAttention);
@@ -1304,30 +1440,30 @@ var InlineSyncStatus = ({ space, open }) => {
   const edgeSyncEnabled = space.internal.data.edgeReplication === EdgeReplicationSetting2.ENABLED;
   const syncState = useSpaceSyncState(space);
   const syncing = connectedToEdge && edgeSyncEnabled && syncState && syncState.missingOnLocal > 0;
-  return /* @__PURE__ */ React20.createElement(Tooltip3.Root, null, /* @__PURE__ */ React20.createElement(Tooltip3.Trigger, {
+  return /* @__PURE__ */ React21.createElement(Tooltip3.Root, null, /* @__PURE__ */ React21.createElement(Tooltip3.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React20.createElement(AttentionGlyph2, {
+  }, /* @__PURE__ */ React21.createElement(AttentionGlyph2, {
     syncing,
     attended: isAttended,
     containsAttended,
     classNames: "self-center mie-1"
-  })), /* @__PURE__ */ React20.createElement(Tooltip3.Portal, null, /* @__PURE__ */ React20.createElement(Tooltip3.Content, {
+  })), /* @__PURE__ */ React21.createElement(Tooltip3.Portal, null, /* @__PURE__ */ React21.createElement(Tooltip3.Content, {
     side: "bottom",
     classNames: "z-[70]"
-  }, /* @__PURE__ */ React20.createElement("span", null, t("syncing label")), /* @__PURE__ */ React20.createElement(Tooltip3.Arrow, null))));
+  }, /* @__PURE__ */ React21.createElement("span", null, t("syncing label")), /* @__PURE__ */ React21.createElement(Tooltip3.Arrow, null))));
 };
 
 // packages/plugins/plugin-space/src/components/SyncStatus/SyncStatus.tsx
-import React22, { useCallback as useCallback12, useEffect as useEffect8, useState as useState14 } from "react";
+import React23, { useCallback as useCallback12, useEffect as useEffect8, useState as useState14 } from "react";
 import { StatusBar } from "@dxos/plugin-status-bar";
-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 { useClient as useClient11 } from "@dxos/react-client";
+import { Icon as Icon6, Input as Input6, 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 useClient9 } from "@dxos/react-client";
+import React22, { useEffect as useEffect7, useState as useState13 } from "react";
+import { useClient as useClient10 } from "@dxos/react-client";
 import { useSpace } from "@dxos/react-client/echo";
 import { Icon as Icon5, toLocalizedString as toLocalizedString4, useTranslation as useTranslation21 } from "@dxos/react-ui";
 import { mx as mx5 } from "@dxos/react-ui-theme";
@@ -1362,7 +1498,7 @@ var useActive = (count) => {
 };
 var SpaceRowContainer = ({ spaceId, state }) => {
   const { t } = useTranslation21(SPACE_PLUGIN);
-  const client = useClient9();
+  const client = useClient10();
   const space = useSpace(spaceId);
   if (!space) {
     return null;
@@ -1370,7 +1506,7 @@ var SpaceRowContainer = ({ spaceId, state }) => {
   const spaceName = toLocalizedString4(getSpaceDisplayName(space, {
     personal: space === client.spaces.default
   }), t);
-  return /* @__PURE__ */ React21.createElement(SpaceRow, {
+  return /* @__PURE__ */ React22.createElement(SpaceRow, {
     spaceId,
     spaceName,
     state
@@ -1379,19 +1515,19 @@ var SpaceRowContainer = ({ spaceId, state }) => {
 var SpaceRow = ({ spaceId, spaceName, state: { localDocumentCount, remoteDocumentCount, missingOnLocal, missingOnRemote } }) => {
   const downActive = useActive(localDocumentCount);
   const upActive = useActive(remoteDocumentCount);
-  return /* @__PURE__ */ React21.createElement("div", {
+  return /* @__PURE__ */ React22.createElement("div", {
     className: "flex items-center mx-0.5 gap-0.5 cursor-pointer",
     title: spaceId,
     onClick: () => {
       void navigator.clipboard.writeText(spaceId);
     }
-  }, /* @__PURE__ */ React21.createElement("span", {
+  }, /* @__PURE__ */ React22.createElement("span", {
     className: "is-1/2 truncate"
-  }, spaceName), /* @__PURE__ */ React21.createElement(Icon5, {
+  }, spaceName), /* @__PURE__ */ React22.createElement(Icon5, {
     icon: "ph--arrow-fat-line-left--regular",
     size: 3,
     classNames: mx5(downActive && "animate-[pulse_1s_infinite]")
-  }), /* @__PURE__ */ React21.createElement(Candle, {
+  }), /* @__PURE__ */ React22.createElement(Candle, {
     up: {
       count: remoteDocumentCount,
       total: remoteDocumentCount + missingOnRemote
@@ -1401,44 +1537,44 @@ var SpaceRow = ({ spaceId, spaceName, state: { localDocumentCount, remoteDocumen
       total: localDocumentCount + missingOnLocal
     },
     title: spaceId
-  }), /* @__PURE__ */ React21.createElement(Icon5, {
+  }), /* @__PURE__ */ React22.createElement(Icon5, {
     icon: "ph--arrow-fat-line-right--regular",
     size: 3,
     classNames: mx5(upActive && "animate-[pulse_1s_step-start_infinite]")
   }));
 };
 var Candle = ({ classNames, up, down }) => {
-  return /* @__PURE__ */ React21.createElement("div", {
+  return /* @__PURE__ */ React22.createElement("div", {
     className: mx5("grid grid-cols-[1fr_2rem_1fr] w-full h-3", classNames)
-  }, /* @__PURE__ */ React21.createElement(Bar, {
+  }, /* @__PURE__ */ React22.createElement(Bar, {
     classNames: "justify-end",
     ...up
-  }), /* @__PURE__ */ React21.createElement("div", {
+  }), /* @__PURE__ */ React22.createElement("div", {
     className: "relative"
-  }, /* @__PURE__ */ React21.createElement("div", {
+  }, /* @__PURE__ */ React22.createElement("div", {
     className: mx5("absolute inset-0 flex items-center justify-center text-xs", styles.barBg)
-  }, up.total)), /* @__PURE__ */ React21.createElement(Bar, down));
+  }, up.total)), /* @__PURE__ */ React22.createElement(Bar, down));
 };
 var Bar = ({ classNames, count, total }) => {
   let p = count / total * 100;
   if (count < total) {
     p = Math.min(p, 95);
   }
-  return /* @__PURE__ */ React21.createElement("div", {
+  return /* @__PURE__ */ React22.createElement("div", {
     className: mx5("relative flex w-full", styles.barBg, classNames)
-  }, /* @__PURE__ */ React21.createElement("div", {
+  }, /* @__PURE__ */ React22.createElement("div", {
     className: mx5("shrink-0", styles.barFg),
     style: {
       width: `${p}%`
     }
-  }), count !== total && /* @__PURE__ */ React21.createElement("div", {
+  }), count !== total && /* @__PURE__ */ React22.createElement("div", {
     className: "absolute top-0 bottom-0 flex items-center mx-0.5 text-black text-xs"
   }, count));
 };
 
 // packages/plugins/plugin-space/src/components/SyncStatus/save-tracker.ts
 import { Context as Context2 } from "@dxos/context";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/save-tracker.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SyncStatus/save-tracker.ts";
 var createClientSaveTracker = (client, cb) => {
   const unsubscribeCallbacks = {};
   const state = {};
@@ -1466,7 +1602,7 @@ var createClientSaveTracker = (client, cb) => {
 };
 var createSpaceSaveTracker = (space, cb) => {
   const ctx = new Context2(void 0, {
-    F: __dxlog_file4,
+    F: __dxlog_file7,
     L: 40
   });
   void space.waitUntilReady().then(() => {
@@ -1529,7 +1665,7 @@ var getIcon = (status) => {
 
 // packages/plugins/plugin-space/src/components/SyncStatus/SyncStatus.tsx
 var SyncStatus = () => {
-  const client = useClient10();
+  const client = useClient11();
   const state = useSyncState();
   const [saved, setSaved] = useState14(true);
   useEffect8(() => {
@@ -1537,7 +1673,7 @@ var SyncStatus = () => {
       setSaved(state2 === "saved");
     });
   }, []);
-  return /* @__PURE__ */ React22.createElement(SyncStatusIndicator, {
+  return /* @__PURE__ */ React23.createElement(SyncStatusIndicator, {
     state,
     saved
   });
@@ -1570,27 +1706,25 @@ var SyncStatusIndicator = ({ state, saved }) => {
     needsToDownload
   ]);
   const title = t(`${status} label`);
-  const icon = /* @__PURE__ */ React22.createElement(Icon6, {
+  const icon = /* @__PURE__ */ React23.createElement(Icon6, {
     icon: getIcon(status),
     size: 4,
     classNames
   });
   if (offline) {
-    return /* @__PURE__ */ React22.createElement(StatusBar.Item, {
+    return /* @__PURE__ */ React23.createElement(StatusBar.Item, {
       title
     }, icon);
   } else {
-    return /* @__PURE__ */ React22.createElement(Popover3.Root, null, /* @__PURE__ */ React22.createElement(Popover3.Trigger, {
+    return /* @__PURE__ */ React23.createElement(Popover3.Root, null, /* @__PURE__ */ React23.createElement(Popover3.Trigger, {
       asChild: true
-    }, /* @__PURE__ */ React22.createElement(StatusBar.Button, {
+    }, /* @__PURE__ */ React23.createElement(StatusBar.Button, {
       title
-    }, icon)), /* @__PURE__ */ React22.createElement(Popover3.Portal, null, /* @__PURE__ */ React22.createElement(Popover3.Content, {
-      sideOffset: 16
-    }, /* @__PURE__ */ React22.createElement(SyncStatusDetail, {
+    }, icon)), /* @__PURE__ */ React23.createElement(Popover3.Portal, null, /* @__PURE__ */ React23.createElement(Popover3.Content, null, /* @__PURE__ */ React23.createElement(SyncStatusDetail, {
       state,
       summary,
       debug: false
-    }))));
+    }), /* @__PURE__ */ React23.createElement(Popover3.Arrow, null))));
   }
 };
 var SyncStatusDetail = ({ classNames, state, summary, debug }) => {
@@ -1600,30 +1734,30 @@ var SyncStatusDetail = ({ classNames, state, summary, debug }) => {
   const handleCheckedChange = useCallback12((state2) => setShowAll(state2), [
     setShowAll
   ]);
-  return /* @__PURE__ */ React22.createElement("div", {
+  return /* @__PURE__ */ React23.createElement("div", {
     className: mx6("flex flex-col gap-3 p-2 text-xs min-w-96", classNames)
-  }, /* @__PURE__ */ React22.createElement("div", {
+  }, /* @__PURE__ */ React23.createElement("div", {
     role: "none",
     className: "flex items-center"
-  }, /* @__PURE__ */ React22.createElement("h1", {
+  }, /* @__PURE__ */ React23.createElement("h1", {
     className: "flex-1"
-  }, t("sync status title")), /* @__PURE__ */ React22.createElement("div", {
+  }, t("sync status title")), /* @__PURE__ */ React23.createElement("div", {
     className: "flex items-center gap-2"
-  }, /* @__PURE__ */ React22.createElement(Input7.Root, null, /* @__PURE__ */ React22.createElement(Input7.Label, {
+  }, /* @__PURE__ */ React23.createElement(Input6.Root, null, /* @__PURE__ */ React23.createElement(Input6.Label, {
     classNames: "text-xs"
-  }, t("show all label")), /* @__PURE__ */ React22.createElement(Input7.Checkbox, {
+  }, t("show all label")), /* @__PURE__ */ React23.createElement(Input6.Checkbox, {
     checked: showAll,
     onCheckedChange: handleCheckedChange
-  })))), /* @__PURE__ */ React22.createElement("div", {
+  })))), /* @__PURE__ */ React23.createElement("div", {
     className: "flex flex-col gap-2"
-  }, entries.length === 0 && /* @__PURE__ */ React22.createElement("div", {
+  }, entries.length === 0 && /* @__PURE__ */ React23.createElement("div", {
     role: "none",
     className: "flex justify-center"
-  }, t("no sync status label")), entries.map(([spaceId, state2]) => /* @__PURE__ */ React22.createElement(SpaceRowContainer, {
+  }, t("no sync status label")), entries.map(([spaceId, state2]) => /* @__PURE__ */ React23.createElement(SpaceRowContainer, {
     key: spaceId,
     spaceId,
     state: state2
-  }))), debug && /* @__PURE__ */ React22.createElement(SyntaxHighlighter, {
+  }))), debug && /* @__PURE__ */ React23.createElement(SyntaxHighlighter, {
     language: "json"
   }, JSON.stringify(summary, null, 2)));
 };
@@ -1642,6 +1776,8 @@ export {
   JoinDialog,
   MenuFooter,
   PersistenceStatus,
+  POPOVER_ADD_SPACE,
+  PopoverAddSpace,
   POPOVER_RENAME_OBJECT,
   PopoverRenameObject,
   POPOVER_RENAME_SPACE,
@@ -1666,8 +1802,9 @@ export {
   IntentResolver,
   ReactRoot,
   ReactSurface,
+  Schema,
   SpaceSettings,
   SpaceState,
   SpacesReady
 };
-//# sourceMappingURL=chunk-GVOPDPS2.mjs.map
+//# sourceMappingURL=chunk-DIKRH2IK.mjs.map