@dxos/shell 0.4.10-main.d560ca0 → 0.4.10-main.f68a1ca

package/dist/lib/browser/react.mjs

@@ -922,7 +922,7 @@ import { Dialog, useId as useId9 } from "@dxos/react-ui";
 // packages/sdk/shell/src/panels/IdentityPanel/IdentityPanel.tsx
 import React29, { useEffect as useEffect3, useMemo as useMemo3 } from "react";
 import { generateName as generateName3 } from "@dxos/display-name";
-import { log as log5 } from "@dxos/log";
+import { log as log6 } from "@dxos/log";
 import { useClient as useClient3 } from "@dxos/react-client";
 import { useIdentity, useDevices, useHaloInvitations as useHaloInvitations2 } from "@dxos/react-client/halo";
 import { useInvitationStatus as useInvitationStatus2 } from "@dxos/react-client/invitations";
@@ -946,6 +946,24 @@ var identityMachine = createMachine({
     src: (context) => context.identitySubscribable
   },
   states: {
+    unknown: {
+      always: [
+        {
+          cond: "initiallyManagingDeviceInvitation",
+          target: "managingDeviceInvitation",
+          actions: "log"
+        },
+        {
+          cond: "initiallyManagingProfile",
+          target: "managingProfile",
+          actions: "log"
+        },
+        {
+          target: "choosingAction",
+          actions: "log"
+        }
+      ]
+    },
     choosingAction: {},
     managingDeviceInvitation: {},
     managingAgent: {
@@ -976,7 +994,8 @@ var identityMachine = createMachine({
         }
       }
     },
-    signingOut: {}
+    confirmingResetStorage: {},
+    confirmingJoinNewIdentity: {}
   },
   on: {
     unchooseAction: {
@@ -1008,8 +1027,12 @@ var identityMachine = createMachine({
       target: ".managingProfile",
       actions: "log"
     },
-    chooseSignOut: {
-      target: ".signingOut",
+    chooseJoinNewIdentity: {
+      target: ".confirmingJoinNewIdentity",
+      actions: "log"
+    },
+    chooseResetStorage: {
+      target: ".confirmingResetStorage",
       actions: "log"
     },
     chooseAgent: {
@@ -1018,6 +1041,10 @@ var identityMachine = createMachine({
     }
   }
 }, {
+  guards: {
+    initiallyManagingDeviceInvitation: ({ initialDisposition }, _event) => initialDisposition === "manage-device-invitation",
+    initiallyManagingProfile: ({ initialDisposition }, _event) => initialDisposition === "manage-profile"
+  },
   actions: {
     setIdentity: assign({
       identity: (context, event) => event?.identity ?? null
@@ -1034,7 +1061,7 @@ var identityMachine = createMachine({
         context
       }, {
         F: __dxlog_file,
-        L: 104,
+        L: 126,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1110,7 +1137,7 @@ var DeviceManager = ({ devices, active, send }) => {
 };
 
 // packages/sdk/shell/src/panels/IdentityPanel/steps/IdentityActionChooser.tsx
-import { CaretRight, Devices, Plus, Power, UserGear, HardDrive } from "@phosphor-icons/react";
+import { CaretRight, Devices, Plus, Power, UserGear, HardDrive, Intersect } from "@phosphor-icons/react";
 import React25, { useCallback as useCallback4 } from "react";
 import { log as log2 } from "@dxos/log";
 import { useAgentHostingProviderClient, useClient as useClient2 } from "@dxos/react-client";
@@ -1168,7 +1195,20 @@ var IdentityActionChooserImpl = ({ onCreateInvitationClick, active, send, onDone
     density: "coarse"
   }, /* @__PURE__ */ React25.createElement("div", {
     className: "grow justify-center flex flex-col gap-1"
-  }, agentHostingEnabled && /* @__PURE__ */ React25.createElement(Action, {
+  }, /* @__PURE__ */ React25.createElement(Action, {
+    "data-testid": "manage-profile",
+    onClick: () => send?.({
+      type: "chooseProfile"
+    }),
+    classNames: "plb-4"
+  }, /* @__PURE__ */ React25.createElement(UserGear, {
+    className: getSize8(6)
+  }), /* @__PURE__ */ React25.createElement("span", {
+    className: "grow mli-3"
+  }, t("choose profile label")), /* @__PURE__ */ React25.createElement(CaretRight, {
+    weight: "bold",
+    className: getSize8(4)
+  })), agentHostingEnabled && /* @__PURE__ */ React25.createElement(Action, {
     "data-testid": "manage-agent",
     onClick: () => send?.({
       type: "chooseAgent"
@@ -1194,35 +1234,35 @@ var IdentityActionChooserImpl = ({ onCreateInvitationClick, active, send, onDone
     weight: "bold",
     className: getSize8(4)
   })), /* @__PURE__ */ React25.createElement(Action, {
-    "data-testid": "manage-devices",
+    "data-testid": "devices-panel.join-new-identity",
     onClick: () => send?.({
-      type: "chooseDevices"
+      type: "chooseJoinNewIdentity"
     }),
     classNames: "plb-4"
-  }, /* @__PURE__ */ React25.createElement(Devices, {
+  }, /* @__PURE__ */ React25.createElement(Intersect, {
     className: getSize8(6)
   }), /* @__PURE__ */ React25.createElement("span", {
     className: "grow mli-3"
-  }, t("choose devices label")), /* @__PURE__ */ React25.createElement(CaretRight, {
+  }, t("choose join new identity label")), /* @__PURE__ */ React25.createElement(CaretRight, {
     weight: "bold",
     className: getSize8(4)
   })), /* @__PURE__ */ React25.createElement(Action, {
-    "data-testid": "manage-profile",
+    "data-testid": "manage-devices",
     onClick: () => send?.({
-      type: "chooseProfile"
+      type: "chooseDevices"
     }),
     classNames: "plb-4"
-  }, /* @__PURE__ */ React25.createElement(UserGear, {
+  }, /* @__PURE__ */ React25.createElement(Devices, {
     className: getSize8(6)
   }), /* @__PURE__ */ React25.createElement("span", {
     className: "grow mli-3"
-  }, t("choose profile label")), /* @__PURE__ */ React25.createElement(CaretRight, {
+  }, t("choose devices label")), /* @__PURE__ */ React25.createElement(CaretRight, {
     weight: "bold",
     className: getSize8(4)
   })), /* @__PURE__ */ React25.createElement(Action, {
     "data-testid": "devices-panel.sign-out",
     onClick: () => send?.({
-      type: "chooseSignOut"
+      type: "chooseResetStorage"
     }),
     classNames: "plb-4"
   }, /* @__PURE__ */ React25.createElement(Power, {
@@ -1341,54 +1381,6 @@ var ProfileFormImpl = (props) => {
   }, t("done label"))));
 };
 
-// packages/sdk/shell/src/panels/IdentityPanel/steps/SignOutChooser.tsx
-import { Warning } from "@phosphor-icons/react";
-import React27 from "react";
-import { Message, useTranslation as useTranslation13 } from "@dxos/react-ui";
-import { getSize as getSize9, mx as mx18 } from "@dxos/react-ui-theme";
-var SignOutChooser = (props) => {
-  const { t } = useTranslation13("os");
-  const onResetDevice = () => {
-    if (window.confirm(t("reset device confirm message"))) {
-      void props.onResetDevice?.();
-    }
-  };
-  return /* @__PURE__ */ React27.createElement(SignOutChooserImpl, {
-    disabled: !props.active,
-    onBack: () => props.send?.({
-      type: "unchooseAction"
-    }),
-    onResetDevice,
-    onJoinNewIdentity: props.onJoinNewIdentity
-  });
-};
-var SignOutChooserImpl = ({ disabled, onResetDevice, onJoinNewIdentity, onBack }) => {
-  const { t } = useTranslation13("os");
-  return /* @__PURE__ */ React27.createElement(React27.Fragment, null, /* @__PURE__ */ React27.createElement("div", {
-    role: "none",
-    className: "grow flex flex-col justify-center"
-  }, /* @__PURE__ */ React27.createElement(Message.Root, {
-    valence: "error"
-  }, /* @__PURE__ */ React27.createElement(Message.Title, null, /* @__PURE__ */ React27.createElement(Warning, {
-    className: mx18(getSize9(6), "inline mie-2")
-  }), t("sign out chooser title")), /* @__PURE__ */ React27.createElement(Message.Body, null, t("sign out chooser message")))), /* @__PURE__ */ React27.createElement(Actions, null, /* @__PURE__ */ React27.createElement(Action, {
-    disabled,
-    onClick: onBack
-  }, t("back label")), /* @__PURE__ */ React27.createElement(Action, {
-    variant: "primary",
-    "data-testid": "sign-out.join-new-identity",
-    classNames: "!bg-error-500 hover:!bg-error-550",
-    disabled,
-    onClick: onJoinNewIdentity
-  }, t("join new identity label")), /* @__PURE__ */ React27.createElement(Action, {
-    variant: "primary",
-    "data-testid": "sign-out.reset-device",
-    classNames: "!bg-error-500 hover:!bg-error-550",
-    disabled,
-    onClick: onResetDevice
-  }, t("reset device label"))));
-};
-
 // packages/sdk/shell/src/panels/IdentityPanel/useAgentHandlers.ts
 import { useCallback as useCallback5, useEffect as useEffect2, useState as useState5 } from "react";
 import { invariant } from "@dxos/invariant";
@@ -1490,11 +1482,11 @@ var useAgentHandlers = ({ client, invitations, identity }) => {
 
 // packages/sdk/shell/src/steps/InvitationManager.tsx
 import { Check as Check4, X as X3 } from "@phosphor-icons/react";
-import React28, { useMemo as useMemo2 } from "react";
+import React27, { useMemo as useMemo2 } from "react";
 import { QR } from "react-qr-rounded";
 import { Invitation as Invitation5 } from "@dxos/react-client/invitations";
-import { useId as useId4, useTranslation as useTranslation14 } from "@dxos/react-ui";
-import { descriptionText as descriptionText7, getSize as getSize10, mx as mx19 } from "@dxos/react-ui-theme";
+import { useId as useId4, useTranslation as useTranslation13 } from "@dxos/react-ui";
+import { descriptionText as descriptionText7, getSize as getSize9, mx as mx18 } from "@dxos/react-ui-theme";
 import { hexToEmoji as hexToEmoji3 } from "@dxos/util";
 
 // packages/sdk/shell/src/util/invitationStatusValue.ts
@@ -1540,13 +1532,13 @@ var invitationStatusValue = /* @__PURE__ */ new Map([
 
 // packages/sdk/shell/src/steps/InvitationManager.tsx
 var InvitationManagerView = ({ children, ...props }) => {
-  return /* @__PURE__ */ React28.createElement(Viewport.View, {
+  return /* @__PURE__ */ React27.createElement(Viewport.View, {
     ...props,
     classNames: "grow flex flex-col justify-around items-center"
   }, children);
 };
 var InvitationManager = ({ invitationUrl, active, send, status, type, authCode, id = "0" }) => {
-  const { t } = useTranslation14("os");
+  const { t } = useTranslation13("os");
   const qrLabel = useId4("invitation-manager__qr-code");
   const statusValue = type === Invitation5.Type.MULTIUSE ? 0 : invitationStatusValue.get(status) ?? 0;
   const showAuthCode = statusValue === 3;
@@ -1564,50 +1556,50 @@ var InvitationManager = ({ invitationUrl, active, send, status, type, authCode,
   }, [
     statusValue
   ]);
-  return /* @__PURE__ */ React28.createElement(React28.Fragment, null, /* @__PURE__ */ React28.createElement(Viewport.Root, {
+  return /* @__PURE__ */ React27.createElement(React27.Fragment, null, /* @__PURE__ */ React27.createElement(Viewport.Root, {
     activeView,
     classNames: "grow plb-1"
-  }, /* @__PURE__ */ React28.createElement(Viewport.Views, null, /* @__PURE__ */ React28.createElement(InvitationManagerView, {
+  }, /* @__PURE__ */ React27.createElement(Viewport.Views, null, /* @__PURE__ */ React27.createElement(InvitationManagerView, {
     id: "showing qr",
     emoji
-  }, /* @__PURE__ */ React28.createElement("p", {
+  }, /* @__PURE__ */ React27.createElement("p", {
     className: "text-sm mlb-1 font-normal text-center"
-  }, t(type === Invitation5.Type.MULTIUSE ? "invite many qr label" : "invite one qr label")), /* @__PURE__ */ React28.createElement("div", {
+  }, t(type === Invitation5.Type.MULTIUSE ? "invite many qr label" : "invite one qr label")), /* @__PURE__ */ React27.createElement("div", {
     role: "none",
-    className: mx19(descriptionText7, "is-full max-is-[14rem] relative")
-  }, /* @__PURE__ */ React28.createElement(QR, {
+    className: mx18(descriptionText7, "is-full max-is-[14rem] relative")
+  }, /* @__PURE__ */ React27.createElement(QR, {
     rounding: 100,
     backgroundColor: "transparent",
     color: "currentColor",
-    className: mx19("is-full bs-full p-2", showAuthCode && "invisible"),
+    className: mx18("is-full bs-full p-2", showAuthCode && "invisible"),
     "aria-labelledby": qrLabel,
     errorCorrectionLevel: "Q",
     cutout: true
-  }, invitationUrl ?? "never"), /* @__PURE__ */ React28.createElement(Centered, null, /* @__PURE__ */ React28.createElement(Emoji, {
+  }, invitationUrl ?? "never"), /* @__PURE__ */ React27.createElement(Centered, null, /* @__PURE__ */ React27.createElement(Emoji, {
     text: emoji
-  }))), /* @__PURE__ */ React28.createElement("span", {
+  }))), /* @__PURE__ */ React27.createElement("span", {
     id: qrLabel,
     className: "sr-only"
-  }, t("qr label")), /* @__PURE__ */ React28.createElement(CopyButton, {
+  }, t("qr label")), /* @__PURE__ */ React27.createElement(CopyButton, {
     variant: "ghost",
     value: invitationUrl ?? "never"
-  })), /* @__PURE__ */ React28.createElement(InvitationManagerView, {
+  })), /* @__PURE__ */ React27.createElement(InvitationManagerView, {
     id: "showing auth code"
-  }, /* @__PURE__ */ React28.createElement(Label, null, t("auth code message")), /* @__PURE__ */ React28.createElement(AuthCode, {
+  }, /* @__PURE__ */ React27.createElement(Label, null, t("auth code message")), /* @__PURE__ */ React27.createElement(AuthCode, {
     code: authCode,
     large: true,
     classNames: "text-black dark:text-white"
-  }), /* @__PURE__ */ React28.createElement(Label, null, "Be sure the other device is showing this symbol:"), emoji && /* @__PURE__ */ React28.createElement(Emoji, {
+  }), /* @__PURE__ */ React27.createElement(Label, null, "Be sure the other device is showing this symbol:"), emoji && /* @__PURE__ */ React27.createElement(Emoji, {
     text: emoji
-  })), /* @__PURE__ */ React28.createElement(InvitationManagerView, {
+  })), /* @__PURE__ */ React27.createElement(InvitationManagerView, {
     id: "showing final"
-  }, statusValue > 0 ? /* @__PURE__ */ React28.createElement(Check4, {
-    className: mx19("m-1.5", getSize10(6))
-  }) : /* @__PURE__ */ React28.createElement(X3, {
-    className: mx19("m-1.5", getSize10(6))
-  })))), /* @__PURE__ */ React28.createElement(Actions, {
+  }, statusValue > 0 ? /* @__PURE__ */ React27.createElement(Check4, {
+    className: mx18("m-1.5", getSize9(6))
+  }) : /* @__PURE__ */ React27.createElement(X3, {
+    className: mx18("m-1.5", getSize9(6))
+  })))), /* @__PURE__ */ React27.createElement(Actions, {
     classNames: "mbs-4"
-  }, /* @__PURE__ */ React28.createElement(Action, {
+  }, /* @__PURE__ */ React27.createElement(Action, {
     disabled: !active,
     onClick: () => send?.({
       type: "deselectInvitation"
@@ -1615,8 +1607,75 @@ var InvitationManager = ({ invitationUrl, active, send, status, type, authCode,
   }, t("back label"))));
 };
 
+// packages/sdk/shell/src/steps/ConfirmReset.tsx
+import { Warning } from "@phosphor-icons/react";
+import React28, { useState as useState6 } from "react";
+import { log as log5 } from "@dxos/log";
+import { Message, useTranslation as useTranslation14 } from "@dxos/react-ui";
+import { getSize as getSize10, mx as mx19 } from "@dxos/react-ui-theme";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/steps/ConfirmReset.tsx";
+var ConfirmReset = ({ active, onCancel, onConfirm, mode }) => {
+  const { t } = useTranslation14("os");
+  const [validationMessage, setValidationMessage] = useState6("");
+  const [pending, setPending] = useState6(false);
+  const processReset = async () => {
+    setPending(true);
+    return onConfirm?.().then(() => setPending(false), (error) => {
+      log5.catch(error, void 0, {
+        F: __dxlog_file5,
+        L: 38,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      setValidationMessage(t("failed to reset identity message"));
+      setPending(false);
+    });
+  };
+  return /* @__PURE__ */ React28.createElement(ConfirmResetImpl, {
+    disabled: !active,
+    pending,
+    validationMessage,
+    onConfirm: processReset,
+    onCancel,
+    mode
+  });
+};
+var ConfirmResetImpl = ({ disabled, pending, validationMessage, onConfirm, onCancel, mode }) => {
+  const { t } = useTranslation14("os");
+  const confirmationValue = t("confirmation value");
+  const [inputValue, setInputValue] = useState6("");
+  return /* @__PURE__ */ React28.createElement(React28.Fragment, null, /* @__PURE__ */ React28.createElement("div", {
+    role: "none",
+    className: "grow flex flex-col gap-2 justify-center"
+  }, /* @__PURE__ */ React28.createElement(Message.Root, {
+    valence: "error"
+  }, /* @__PURE__ */ React28.createElement(Message.Title, null, /* @__PURE__ */ React28.createElement(Warning, {
+    className: mx19(getSize10(6), "inline mie-2")
+  }), t("sign out chooser title")), /* @__PURE__ */ React28.createElement(Message.Body, null, t("sign out chooser message"))), /* @__PURE__ */ React28.createElement(Input, {
+    validationMessage,
+    label: /* @__PURE__ */ React28.createElement(StepHeading, {
+      className: "text-start mlb-2"
+    }, t(mode === "join new identity" ? "join new identity input label" : "reset storage input label", {
+      confirmationValue
+    })),
+    disabled,
+    "data-testid": "reset-identity-input",
+    placeholder: confirmationValue,
+    onChange: ({ target: { value } }) => setInputValue(value)
+  })), /* @__PURE__ */ React28.createElement(Actions, null, onCancel && /* @__PURE__ */ React28.createElement(Action, {
+    disabled,
+    onClick: onCancel,
+    "data-testid": "reset-identity-input-cancel"
+  }, t("cancel label")), onConfirm && /* @__PURE__ */ React28.createElement(Action, {
+    variant: "destructive",
+    disabled: disabled || pending || inputValue !== confirmationValue,
+    onClick: onConfirm,
+    "data-testid": "reset-identity-input-confirm"
+  }, pending ? t("reset in progress label") : t("reset device label"))));
+};
+
 // packages/sdk/shell/src/panels/IdentityPanel/IdentityPanel.tsx
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/IdentityPanel/IdentityPanel.tsx";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/IdentityPanel/IdentityPanel.tsx";
 var viewStyles = "pbs-1 pbe-3 pli-3";
 var IdentityHeading = ({ titleId, title, identity, onDone }) => {
   const fallbackValue = keyToFallback2(identity.identityKey);
@@ -1641,7 +1700,7 @@ var IdentityHeading = ({ titleId, title, identity, onDone }) => {
   }, identity.profile?.displayName ?? generateName3(identity.identityKey.toHex()))));
 };
 var IdentityPanelImpl = (props) => {
-  const { identity, titleId, activeView, onUpdateProfile, onResetDevice, onJoinNewIdentity, IdentityActionChooser: IdentityActionChooserComponent = IdentityActionChooser, InvitationManager: InvitationManagerComponent = InvitationManager, onDone, ...rest } = props;
+  const { identity, titleId, activeView, onUpdateProfile, onResetStorage, onJoinNewIdentity, IdentityActionChooser: IdentityActionChooserComponent = IdentityActionChooser, InvitationManager: InvitationManagerComponent = InvitationManager, onDone, ...rest } = props;
   const { t } = useTranslation15("os");
   const title = useMemo3(() => {
     switch (activeView) {
@@ -1656,6 +1715,7 @@ var IdentityPanelImpl = (props) => {
     activeView,
     t
   ]);
+  const onCancelReset = () => rest.send?.("unchooseAction");
   return /* @__PURE__ */ React29.createElement(DensityProvider2, {
     density: "fine"
   }, /* @__PURE__ */ React29.createElement(IdentityHeading, {
@@ -1692,14 +1752,6 @@ var IdentityPanelImpl = (props) => {
     active: activeView === "update profile form",
     identity,
     onUpdateProfile
-  })), /* @__PURE__ */ React29.createElement(Viewport.View, {
-    classNames: viewStyles,
-    id: "signing out"
-  }, /* @__PURE__ */ React29.createElement(SignOutChooser, {
-    send: rest.send,
-    active: activeView === "signing out",
-    onResetDevice,
-    onJoinNewIdentity
   })), /* @__PURE__ */ React29.createElement(Viewport.View, {
     classNames: viewStyles,
     id: "agent manager"
@@ -1707,6 +1759,24 @@ var IdentityPanelImpl = (props) => {
     send: rest.send,
     active: activeView === "agent manager",
     ...rest
+  })), /* @__PURE__ */ React29.createElement(Viewport.View, {
+    classNames: viewStyles,
+    id: "confirm join new identity"
+  }, /* @__PURE__ */ React29.createElement(ConfirmReset, {
+    active: activeView === "confirm join new identity",
+    ...rest,
+    mode: "join new identity",
+    onConfirm: onJoinNewIdentity,
+    onCancel: onCancelReset
+  })), /* @__PURE__ */ React29.createElement(Viewport.View, {
+    classNames: viewStyles,
+    id: "confirm reset storage"
+  }, /* @__PURE__ */ React29.createElement(ConfirmReset, {
+    active: activeView === "confirm reset storage",
+    ...rest,
+    mode: "reset storage",
+    onConfirm: onResetStorage,
+    onCancel: onCancelReset
   })))));
 };
 var IdentityPanelWithInvitationImpl = ({ invitation, ...props }) => {
@@ -1716,7 +1786,7 @@ var IdentityPanelWithInvitationImpl = ({ invitation, ...props }) => {
     ...invitationStatus
   });
 };
-var IdentityPanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => code, ...props }) => {
+var IdentityPanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => code, initialDisposition = "default", ...props }) => {
   const titleId = useId5("identityPanel__heading", propsTitleId);
   const client = useClient3();
   const devices = useDevices();
@@ -1728,20 +1798,24 @@ var IdentityPanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => co
     invitations
   });
   if (!identity) {
-    log5.error("IdentityPanel rendered with no active identity.", void 0, {
-      F: __dxlog_file5,
-      L: 132,
+    log6.error("IdentityPanel rendered with no active identity.", void 0, {
+      F: __dxlog_file6,
+      L: 145,
       S: void 0,
       C: (f, a) => f(...a)
     });
     return null;
   }
-  const [identityState, identitySend, identityService] = useIdentityMachine(client);
+  const [identityState, identitySend, identityService] = useIdentityMachine(client, {
+    context: {
+      initialDisposition
+    }
+  });
   useEffect3(() => {
     const subscription = identityService.subscribe((state) => {
-      log5("[state]", state, {
-        F: __dxlog_file5,
-        L: 139,
+      log6("[state]", state, {
+        F: __dxlog_file6,
+        L: 154,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1767,8 +1841,10 @@ var IdentityPanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => co
         }
       ].some(identityState.matches):
         return "update profile form";
-      case identityState.matches("signingOut"):
-        return "signing out";
+      case identityState.matches("confirmingResetStorage"):
+        return "confirm reset storage";
+      case identityState.matches("confirmingJoinNewIdentity"):
+        return "confirm join new identity";
       case [
         {
           managingAgent: "idle"
@@ -1808,9 +1884,9 @@ var IdentityPanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => co
 };
 
 // packages/sdk/shell/src/panels/JoinPanel/JoinPanel.tsx
-import React39, { useCallback as useCallback7, useEffect as useEffect5, useMemo as useMemo4 } from "react";
+import React38, { useCallback as useCallback7, useEffect as useEffect5, useMemo as useMemo4 } from "react";
 import { log as log10 } from "@dxos/log";
-import { useClient as useClient6, useMulticastObservable } from "@dxos/react-client";
+import { useClient as useClient5, useMulticastObservable } from "@dxos/react-client";
 import { useIdentity as useIdentity2 } from "@dxos/react-client/halo";
 import { DensityProvider as DensityProvider3, useId as useId7, useThemeContext as useThemeContext4 } from "@dxos/react-ui";
 
@@ -1851,14 +1927,14 @@ var JoinHeading = /* @__PURE__ */ forwardRef8(({ mode, titleId, onExit, exitActi
 import { useMachine as useMachine2 } from "@xstate/react";
 import { useCallback as useCallback6 } from "react";
 import { assign as assign2, createMachine as createMachine2 } from "xstate";
-import { log as log6 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { AlreadyJoinedError } from "@dxos/react-client";
 import { Invitation as Invitation6, InvitationEncoder as InvitationEncoder3 } from "@dxos/react-client/invitations";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/joinMachine.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/joinMachine.ts";
 var getInvitationSubscribable = (Kind, invitation) => {
-  log6("[subscribing to invitation]", invitation, {
-    F: __dxlog_file6,
-    L: 88,
+  log7("[subscribing to invitation]", invitation, {
+    F: __dxlog_file7,
+    L: 90,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1866,12 +1942,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
     subscribe: (next, onError, complete) => invitation.subscribe((invitation2) => {
       switch (invitation2.state) {
         case Invitation6.State.CONNECTING: {
-          log6("[invitation connecting]", {
+          log7("[invitation connecting]", {
             Kind,
             invitation: invitation2
           }, {
-            F: __dxlog_file6,
-            L: 99,
+            F: __dxlog_file7,
+            L: 101,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1881,12 +1957,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
           });
         }
         case Invitation6.State.CONNECTED: {
-          log6("[invitation connected]", {
+          log7("[invitation connected]", {
             Kind,
             invitation: invitation2
           }, {
-            F: __dxlog_file6,
-            L: 104,
+            F: __dxlog_file7,
+            L: 106,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1896,12 +1972,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
           });
         }
         case Invitation6.State.READY_FOR_AUTHENTICATION: {
-          log6("[invitation ready for authentication]", {
+          log7("[invitation ready for authentication]", {
             Kind,
             invitation: invitation2
           }, {
-            F: __dxlog_file6,
-            L: 109,
+            F: __dxlog_file7,
+            L: 111,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1911,12 +1987,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
           });
         }
         case Invitation6.State.AUTHENTICATING: {
-          log6("[invitation authenticating]", {
+          log7("[invitation authenticating]", {
             Kind,
             invitation: invitation2
           }, {
-            F: __dxlog_file6,
-            L: 114,
+            F: __dxlog_file7,
+            L: 116,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1926,12 +2002,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
           });
         }
         case Invitation6.State.SUCCESS: {
-          log6("[invitation success]", {
+          log7("[invitation success]", {
             Kind,
             invitation: invitation2
           }, {
-            F: __dxlog_file6,
-            L: 119,
+            F: __dxlog_file7,
+            L: 121,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1942,11 +2018,11 @@ var getInvitationSubscribable = (Kind, invitation) => {
           return complete?.();
         }
         case Invitation6.State.CANCELLED: {
-          log6.warn("[invitation cancelled]", {
+          log7.warn("[invitation cancelled]", {
             Kind
           }, {
-            F: __dxlog_file6,
-            L: 125,
+            F: __dxlog_file7,
+            L: 127,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1956,11 +2032,11 @@ var getInvitationSubscribable = (Kind, invitation) => {
           });
         }
         case Invitation6.State.TIMEOUT: {
-          log6.error("[invitation timeout]", {
+          log7.error("[invitation timeout]", {
             Kind
           }, {
-            F: __dxlog_file6,
-            L: 130,
+            F: __dxlog_file7,
+            L: 132,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1972,12 +2048,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
       }
     }, (error) => {
       if (error instanceof AlreadyJoinedError) {
-        log6("[already joined]", {
+        log7("[already joined]", {
           Kind,
           error
         }, {
-          F: __dxlog_file6,
-          L: 137,
+          F: __dxlog_file7,
+          L: 139,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1987,12 +2063,12 @@ var getInvitationSubscribable = (Kind, invitation) => {
         });
         return complete?.();
       }
-      log6.error("[invitation errored]", {
+      log7.error("[invitation errored]", {
         Kind,
         error
       }, {
-        F: __dxlog_file6,
-        L: 142,
+        F: __dxlog_file7,
+        L: 144,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2164,6 +2240,7 @@ var joinMachine = createMachine2({
   id: "join",
   predictableActionArguments: true,
   context: {
+    initialDisposition: "default",
     mode: "default",
     identity: null,
     halo: {},
@@ -2178,6 +2255,11 @@ var joinMachine = createMachine2({
           target: "resettingIdentity",
           actions: "log"
         },
+        {
+          cond: "initiallyAcceptingHaloInvitation",
+          target: "#join.choosingIdentity.acceptingHaloInvitation",
+          actions: "log"
+        },
         {
           cond: "noSelectedIdentity",
           target: "choosingIdentity",
@@ -2260,6 +2342,7 @@ var joinMachine = createMachine2({
   guards: {
     existingIdentity: ({ identity, mode }, _event) => mode === "halo-only" && !!identity,
     noSelectedIdentity: ({ identity }, _event) => !identity,
+    initiallyAcceptingHaloInvitation: ({ identity, initialDisposition }, _event) => !identity && initialDisposition === "accept-halo-invitation",
     hasHaloUnredeemedCode: ({ halo }, _event) => !!halo.unredeemedCode,
     noSpaceInvitation: ({ space }, _event) => !space.invitation && !space.unredeemedCode
   },
@@ -2311,13 +2394,13 @@ var joinMachine = createMachine2({
       } : context.space
     }),
     log: (context, event) => {
-      log6("[transition]", {
+      log7("[transition]", {
         event,
         haloInvitation: context.halo.invitation,
         spaceInvitation: context.space.invitation
       }, {
-        F: __dxlog_file6,
-        L: 406,
+        F: __dxlog_file7,
+        L: 416,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2329,9 +2412,9 @@ var defaultCodeFromUrl = (invitationType, text) => {
     const searchParams = new URLSearchParams(text.substring(text.lastIndexOf("?")));
     return searchParams.get(`${invitationType}InvitationCode`) ?? searchParams.get(`${invitationType}Invitation`) ?? searchParams.get("invitationCode") ?? searchParams.get("invitation") ?? text;
   } catch (err) {
-    log6.catch(err, void 0, {
-      F: __dxlog_file6,
-      L: 433,
+    log7.catch(err, void 0, {
+      F: __dxlog_file7,
+      L: 443,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2350,9 +2433,9 @@ var useJoinMachine = (client, options) => {
           invitationSubscribable: getInvitationSubscribable("Halo", invitationObservable)
         };
       } catch (err) {
-        log6.error("Could not redeem device invitation code", err, {
-          F: __dxlog_file6,
-          L: 454,
+        log7.error("Could not redeem device invitation code", err, {
+          F: __dxlog_file7,
+          L: 464,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -2375,9 +2458,9 @@ var useJoinMachine = (client, options) => {
           invitationSubscribable: getInvitationSubscribable("Space", invitationObservable)
         };
       } catch (err) {
-        log6.error("Could not redeem space invitation code", err, {
-          F: __dxlog_file6,
-          L: 476,
+        log7.error("Could not redeem space invitation code", err, {
+          F: __dxlog_file7,
+          L: 486,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -2540,17 +2623,17 @@ var IdentityAdded = (props) => {
 };
 
 // packages/sdk/shell/src/panels/JoinPanel/steps/IdentityInput.tsx
-import React33, { useState as useState6 } from "react";
-import { log as log7 } from "@dxos/log";
+import React33, { useState as useState7 } from "react";
+import { log as log8 } from "@dxos/log";
 import { useClient as useClient4 } from "@dxos/react-client";
 import { useTranslation as useTranslation19 } from "@dxos/react-ui";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/steps/IdentityInput.tsx";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/steps/IdentityInput.tsx";
 var IdentityInput = (props) => {
   const { send, method } = props;
   const isRecover = method === "recover identity";
   const client = useClient4();
   const { t } = useTranslation19("os");
-  const [validationMessage, setValidationMessage] = useState6("");
+  const [validationMessage, setValidationMessage] = useState7("");
   const createIdentity = (displayName) => {
     void client.halo.createIdentity({
       [isRecover ? "seedphrase" : "displayName"]: displayName
@@ -2560,8 +2643,8 @@ var IdentityInput = (props) => {
         identity
       });
     }, (error) => {
-      log7.catch(error, void 0, {
-        F: __dxlog_file7,
+      log8.catch(error, void 0, {
+        F: __dxlog_file8,
         L: 37,
         S: void 0,
         C: (f, a) => f(...a)
@@ -2579,7 +2662,7 @@ var IdentityInputImpl = (props) => {
   const { method, send, active, onDisplayNameConfirm, validationMessage } = props;
   const disabled = !active;
   const { t } = useTranslation19("os");
-  const [inputValue, setInputValue] = useState6("");
+  const [inputValue, setInputValue] = useState7("");
   const isRecover = method === "recover identity";
   return /* @__PURE__ */ React33.createElement(React33.Fragment, null, /* @__PURE__ */ React33.createElement("div", {
     role: "none",
@@ -2629,18 +2712,18 @@ var InvitationAccepted = (props) => {
 };
 
 // packages/sdk/shell/src/panels/JoinPanel/steps/InvitationInput.tsx
-import React35, { useState as useState7, useEffect as useEffect4, cloneElement as cloneElement4 } from "react";
-import { log as log8 } from "@dxos/log";
+import React35, { useState as useState8, useEffect as useEffect4, cloneElement as cloneElement4 } from "react";
+import { log as log9 } from "@dxos/log";
 import { useTranslation as useTranslation21 } from "@dxos/react-ui";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/steps/InvitationInput.tsx";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/steps/InvitationInput.tsx";
 var invitationCodeFromUrl = (text) => {
   try {
     const searchParams = new URLSearchParams(text.substring(text.lastIndexOf("?")));
     const invitation = searchParams.get("spaceInvitationCode") ?? searchParams.get("deviceInvitationCode");
     return invitation ?? text;
   } catch (err) {
-    log8.catch(err, void 0, {
-      F: __dxlog_file8,
+    log9.catch(err, void 0, {
+      F: __dxlog_file9,
       L: 25,
       S: void 0,
       C: (f, a) => f(...a)
@@ -2652,7 +2735,7 @@ var InvitationInput = (props) => {
   const { Kind, active, send, unredeemedCode, onExit, exitActionParent, onDone, doneActionParent, succeededKeys } = props;
   const disabled = !active;
   const { t } = useTranslation21("os");
-  const [inputValue, setInputValue] = useState7(unredeemedCode ?? "");
+  const [inputValue, setInputValue] = useState8(unredeemedCode ?? "");
   useEffect4(() => {
     unredeemedCode && setInputValue(unredeemedCode ?? "");
   }, [
@@ -2771,7 +2854,7 @@ var InvitationRescuer = (props) => {
 };
 
 // packages/sdk/shell/src/panels/JoinPanel/steps/InvitationAuthenticator.tsx
-import React37, { useState as useState8 } from "react";
+import React37, { useState as useState9 } from "react";
 import { Input as Input2, useTranslation as useTranslation23 } from "@dxos/react-ui";
 import { hexToEmoji as hexToEmoji4 } from "@dxos/util";
 var pinLength = 6;
@@ -2779,7 +2862,7 @@ var InvitationAuthenticator = ({ failed, Kind, active, pending, invitationId, on
   const disabled = !active || pending;
   const { t } = useTranslation23("os");
   const invitationType = Kind.toLowerCase();
-  const [authCode, setAuthCode] = useState8("");
+  const [authCode, setAuthCode] = useState9("");
   const onChange = ({ target: { value } }) => {
     setAuthCode(value);
     if (value.length === pinLength) {
@@ -2822,64 +2905,6 @@ var InvitationAuthenticator = ({ failed, Kind, active, pending, invitationId, on
   }, t("next label"))));
 };
 
-// packages/sdk/shell/src/panels/JoinPanel/steps/ResetIdentity.tsx
-import React38, { useState as useState9 } from "react";
-import { log as log9 } from "@dxos/log";
-import { useClient as useClient5 } from "@dxos/react-client";
-import { useTranslation as useTranslation24 } from "@dxos/react-ui";
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/steps/ResetIdentity.tsx";
-var ResetIdentity = ({ send, active }) => {
-  const client = useClient5();
-  const { t } = useTranslation24("os");
-  const [validationMessage, setValidationMessage] = useState9("");
-  const [pending, setPending] = useState9(false);
-  const resetIdentity = () => {
-    setPending(true);
-    void client.reset().then(() => send?.({
-      type: "resetIdentity"
-    }), (error) => {
-      log9.catch(error, void 0, {
-        F: __dxlog_file9,
-        L: 35,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      setValidationMessage(t("failed to reset identity message"));
-      setPending(false);
-    });
-  };
-  return /* @__PURE__ */ React38.createElement(ResetIdentityImpl, {
-    disabled: !active,
-    pending,
-    validationMessage,
-    onConfirm: () => resetIdentity()
-  });
-};
-var ResetIdentityImpl = ({ disabled, pending, validationMessage, onConfirm }) => {
-  const { t } = useTranslation24("os");
-  const confirmationValue = t("confirmation value");
-  const [inputValue, setInputValue] = useState9("");
-  return /* @__PURE__ */ React38.createElement(React38.Fragment, null, /* @__PURE__ */ React38.createElement("div", {
-    role: "none",
-    className: "grow flex flex-col justify-center"
-  }, /* @__PURE__ */ React38.createElement(Input, {
-    validationMessage,
-    label: /* @__PURE__ */ React38.createElement(StepHeading, null, t("reset identity input label", {
-      confirmationValue
-    })),
-    disabled,
-    "data-testid": "reset-identity-input",
-    placeholder: confirmationValue,
-    onChange: ({ target: { value } }) => setInputValue(value)
-  })), /* @__PURE__ */ React38.createElement(Actions, null, /* @__PURE__ */ React38.createElement(Action, {
-    // TODO(wittjosiah): Probably make this red?
-    variant: "primary",
-    disabled: disabled || pending || inputValue !== confirmationValue,
-    onClick: () => onConfirm?.(),
-    "data-testid": "reset-identity-input-confirm"
-  }, pending ? t("reset in progress label") : t("confirm label"))));
-};
-
 // packages/sdk/shell/src/styles/panelStyles.ts
 var stepStyles = "pbs-1 pbe-3 pli-3";
 
@@ -2907,48 +2932,49 @@ var resolvedTextColor = (status) => status === Invitation7.State.ERROR ? errorTe
 // packages/sdk/shell/src/panels/JoinPanel/JoinPanel.tsx
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/JoinPanel.tsx";
 var JoinPanelImpl = (props) => {
-  const { titleId, send, activeView, failed, mode, unredeemedCodes, invitationStates, succeededKeys, failReasons, onExit, onHaloDone, onSpaceDone, exitActionParent, doneActionParent, onHaloInvitationCancel, onSpaceInvitationCancel, onHaloInvitationAuthenticate, onSpaceInvitationAuthenticate, IdentityInput: IdentityInputComponent = IdentityInput, ResetIdentity: ResetIdentityComponent = ResetIdentity } = props;
-  return /* @__PURE__ */ React39.createElement(DensityProvider3, {
+  const { titleId, send, activeView, failed, mode, unredeemedCodes, invitationStates, succeededKeys, failReasons, onExit, onHaloDone, onSpaceDone, exitActionParent, doneActionParent, onHaloInvitationCancel, onSpaceInvitationCancel, onHaloInvitationAuthenticate, onSpaceInvitationAuthenticate, onCancelResetStorage, onConfirmResetStorage, IdentityInput: IdentityInputComponent = IdentityInput, ConfirmReset: ConfirmResetComponent = ConfirmReset } = props;
+  return /* @__PURE__ */ React38.createElement(DensityProvider3, {
     density: "fine"
-  }, mode !== "halo-only" && /* @__PURE__ */ React39.createElement(JoinHeading, {
+  }, mode !== "halo-only" && /* @__PURE__ */ React38.createElement(JoinHeading, {
     titleId,
     mode,
     onExit,
     exitActionParent
-  }), /* @__PURE__ */ React39.createElement(Viewport.Root, {
+  }), /* @__PURE__ */ React38.createElement(Viewport.Root, {
     focusManaged: true,
     activeView
-  }, /* @__PURE__ */ React39.createElement(Viewport.Views, null, /* @__PURE__ */ React39.createElement(Viewport.View, {
+  }, /* @__PURE__ */ React38.createElement(Viewport.Views, null, /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "addition method chooser"
-  }, /* @__PURE__ */ React39.createElement(AdditionMethodChooser, {
+  }, /* @__PURE__ */ React38.createElement(AdditionMethodChooser, {
     send,
     active: activeView === "addition method chooser"
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
-    id: "reset identity confirmation"
-  }, /* @__PURE__ */ React39.createElement(ResetIdentityComponent, {
+    id: "reset storage confirmation"
+  }, /* @__PURE__ */ React38.createElement(ConfirmResetComponent, {
     send,
-    method: "reset identity",
-    active: activeView === "reset identity confirmation"
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+    active: activeView === "reset identity confirmation",
+    onCancel: onCancelResetStorage,
+    onConfirm: onConfirmResetStorage
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "create identity input"
-  }, /* @__PURE__ */ React39.createElement(IdentityInputComponent, {
+  }, /* @__PURE__ */ React38.createElement(IdentityInputComponent, {
     send,
     method: "create identity",
     active: activeView === "create identity input"
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "recover identity input"
-  }, /* @__PURE__ */ React39.createElement(IdentityInputComponent, {
+  }, /* @__PURE__ */ React38.createElement(IdentityInputComponent, {
     send,
     method: "recover identity",
     active: activeView === "recover identity input"
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "halo invitation input"
-  }, /* @__PURE__ */ React39.createElement(InvitationInput, {
+  }, /* @__PURE__ */ React38.createElement(InvitationInput, {
     send,
     Kind: "Halo",
     active: activeView === "halo invitation input",
@@ -2958,20 +2984,20 @@ var JoinPanelImpl = (props) => {
     ...succeededKeys?.Halo && {
       succeededKeys: succeededKeys.Halo
     }
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "halo invitation rescuer"
-  }, /* @__PURE__ */ React39.createElement(InvitationRescuer, {
+  }, /* @__PURE__ */ React38.createElement(InvitationRescuer, {
     send,
     Kind: "Halo",
     active: activeView === "halo invitation rescuer",
     invitationState: invitationStates?.Halo,
     onInvitationCancel: onHaloInvitationCancel,
     failReason: failReasons?.Halo
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "halo invitation authenticator"
-  }, /* @__PURE__ */ React39.createElement(InvitationAuthenticator, {
+  }, /* @__PURE__ */ React38.createElement(InvitationAuthenticator, {
     send,
     Kind: "Halo",
     active: activeView === "halo invitation authenticator",
@@ -2980,28 +3006,28 @@ var JoinPanelImpl = (props) => {
     ...failed.has("Halo") && {
       failed: true
     }
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "halo invitation accepted"
-  }, /* @__PURE__ */ React39.createElement(InvitationAccepted, {
+  }, /* @__PURE__ */ React38.createElement(InvitationAccepted, {
     send,
     Kind: "Halo",
     active: activeView === "halo invitation accepted",
     doneActionParent,
     onDone: onHaloDone
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "identity added"
-  }, /* @__PURE__ */ React39.createElement(IdentityAdded, {
+  }, /* @__PURE__ */ React38.createElement(IdentityAdded, {
     send,
     mode,
     active: activeView === "identity added",
     doneActionParent,
     onDone: onHaloDone
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "space invitation input"
-  }, /* @__PURE__ */ React39.createElement(InvitationInput, {
+  }, /* @__PURE__ */ React38.createElement(InvitationInput, {
     send,
     Kind: "Space",
     active: activeView === "space invitation input",
@@ -3013,20 +3039,20 @@ var JoinPanelImpl = (props) => {
     },
     onExit,
     exitActionParent
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "space invitation rescuer"
-  }, /* @__PURE__ */ React39.createElement(InvitationRescuer, {
+  }, /* @__PURE__ */ React38.createElement(InvitationRescuer, {
     send,
     Kind: "Space",
     active: activeView === "space invitation rescuer",
     invitationState: invitationStates?.Space,
     onInvitationCancel: onSpaceInvitationCancel,
     failReason: failReasons?.Space
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "space invitation authenticator"
-  }, /* @__PURE__ */ React39.createElement(InvitationAuthenticator, {
+  }, /* @__PURE__ */ React38.createElement(InvitationAuthenticator, {
     send,
     Kind: "Space",
     active: activeView === "space invitation authenticator",
@@ -3035,10 +3061,10 @@ var JoinPanelImpl = (props) => {
     ...failed.has("Space") && {
       failed: true
     }
-  })), /* @__PURE__ */ React39.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React38.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "space invitation accepted"
-  }, /* @__PURE__ */ React39.createElement(InvitationAccepted, {
+  }, /* @__PURE__ */ React38.createElement(InvitationAccepted, {
     send,
     Kind: "Space",
     active: activeView === "space invitation accepted",
@@ -3046,14 +3072,15 @@ var JoinPanelImpl = (props) => {
     onDone: onSpaceDone
   })))));
 };
-var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCode, exitActionParent, onExit, doneActionParent, onDone: propsOnDone }) => {
-  const client = useClient6();
+var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialDisposition = "default", initialInvitationCode, exitActionParent, onExit, doneActionParent, onDone: propsOnDone, onCancelResetStorage }) => {
+  const client = useClient5();
   const identity = useIdentity2();
   const { hasIosKeyboard } = useThemeContext4();
   const titleId = useId7("joinPanel__heading", propsTitleId);
   const [joinState, joinSend, joinService] = useJoinMachine(client, {
     context: {
       mode,
+      initialDisposition,
       identity,
       ...initialInvitationCode && {
         [mode === "halo-only" ? "halo" : "space"]: {
@@ -3066,7 +3093,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
     const subscription = joinService.subscribe((state) => {
       log10("[state]", state, {
         F: __dxlog_file10,
-        L: 198,
+        L: 204,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -3278,7 +3305,15 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
     joinState,
     propsOnDone
   ]);
-  return /* @__PURE__ */ React39.createElement(JoinPanelImpl, {
+  const onConfirmResetStorage = useCallback7(() => client.reset().then(() => {
+    joinSend({
+      type: "resetIdentity"
+    });
+  }), [
+    client,
+    joinSend
+  ]);
+  return /* @__PURE__ */ React38.createElement(JoinPanelImpl, {
     titleId,
     mode,
     send: joinSend,
@@ -3311,16 +3346,18 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
         type: "authenticateSpaceVerificationCode"
       });
       return joinState.context.space.invitationObservable?.authenticate(authCode);
-    }
+    },
+    onConfirmResetStorage,
+    onCancelResetStorage
   });
 };
 
 // packages/sdk/shell/src/panels/SpacePanel/SpacePanel.tsx
 import { Planet } from "@phosphor-icons/react";
-import React41, { useEffect as useEffect6, useMemo as useMemo5 } from "react";
+import React40, { useEffect as useEffect6, useMemo as useMemo5 } from "react";
 import { log as log13 } from "@dxos/log";
 import { useInvitationStatus as useInvitationStatus3 } from "@dxos/react-client/invitations";
-import { DensityProvider as DensityProvider4, useId as useId8, useTranslation as useTranslation26 } from "@dxos/react-ui";
+import { DensityProvider as DensityProvider4, useId as useId8, useTranslation as useTranslation25 } from "@dxos/react-ui";
 
 // packages/sdk/shell/src/panels/SpacePanel/spaceMachine.ts
 import { useMachine as useMachine3 } from "@xstate/react";
@@ -3386,18 +3423,18 @@ var useSpaceMachine = (options) => {
 
 // packages/sdk/shell/src/panels/SpacePanel/steps/SpaceManager.tsx
 import { Placeholder as Placeholder2, UserPlus, UsersThree } from "@phosphor-icons/react";
-import React40, { useCallback as useCallback8, useState as useState10 } from "react";
+import React39, { useCallback as useCallback8, useState as useState10 } from "react";
 import { log as log12 } from "@dxos/log";
 import { useConfig } from "@dxos/react-client";
 import { useSpaceInvitations as useSpaceInvitations2 } from "@dxos/react-client/echo";
 import { Invitation as Invitation8, InvitationEncoder as InvitationEncoder4 } from "@dxos/react-client/invitations";
-import { ScrollArea, useTranslation as useTranslation25 } from "@dxos/react-ui";
+import { ScrollArea, useTranslation as useTranslation24 } from "@dxos/react-ui";
 import { descriptionText as descriptionText10, mx as mx22 } from "@dxos/react-ui-theme";
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/SpacePanel/steps/SpaceManager.tsx";
 var activeActionKey = "dxos:react-shell/space-manager/active-action";
 var SpaceManager = (props) => {
   const { space, target } = props;
-  const { t } = useTranslation25("os");
+  const { t } = useTranslation24("os");
   const config = useConfig();
   const invitations = useSpaceInvitations2(space?.key);
   const onInvitationEvent = useCallback8((invitation) => {
@@ -3450,7 +3487,7 @@ var SpaceManager = (props) => {
       ])
     }
   };
-  return /* @__PURE__ */ React40.createElement(SpaceManagerImpl, {
+  return /* @__PURE__ */ React39.createElement(SpaceManagerImpl, {
     ...props,
     invitations,
     inviteActions
@@ -3459,7 +3496,7 @@ var SpaceManager = (props) => {
 var headingFragment = "pis-3 pie-1 plb-1 mbe-1 font-medium";
 var SpaceManagerImpl = (props) => {
   const { active, space, createInvitationUrl, send, inviteActions: propsInviteActions, invitations, showInactiveInvitations, SpaceMemberList: SpaceMemberListComponent = SpaceMemberList, InvitationList: InvitationListComponent = InvitationList } = props;
-  const { t } = useTranslation25("os");
+  const { t } = useTranslation24("os");
   const inviteActions = propsInviteActions ?? {
     noopInvite: {
       label: t("create space invitation label"),
@@ -3477,26 +3514,26 @@ var SpaceManagerImpl = (props) => {
   const visibleInvitations = showInactiveInvitations ? invitations : invitations?.filter((invitation) => ![
     Invitation8.State.CANCELLED
   ].includes(invitation.get().state));
-  return /* @__PURE__ */ React40.createElement(React40.Fragment, null, /* @__PURE__ */ React40.createElement(ScrollArea.Root, {
+  return /* @__PURE__ */ React39.createElement(React39.Fragment, null, /* @__PURE__ */ React39.createElement(ScrollArea.Root, {
     classNames: "grow shrink basis-28 -mli-2"
-  }, /* @__PURE__ */ React40.createElement(ScrollArea.Viewport, {
+  }, /* @__PURE__ */ React39.createElement(ScrollArea.Viewport, {
     classNames: "is-full pie-2"
-  }, !!visibleInvitations?.length && /* @__PURE__ */ React40.createElement(React40.Fragment, null, /* @__PURE__ */ React40.createElement("h3", {
+  }, !!visibleInvitations?.length && /* @__PURE__ */ React39.createElement(React39.Fragment, null, /* @__PURE__ */ React39.createElement("h3", {
     className: mx22(headingFragment, descriptionText10)
-  }, t("invitation list heading")), /* @__PURE__ */ React40.createElement(InvitationListComponent, {
+  }, t("invitation list heading")), /* @__PURE__ */ React39.createElement(InvitationListComponent, {
     className: "mb-2",
     send,
     invitations: visibleInvitations ?? [],
     onClickRemove: (invitation) => invitation.cancel(),
     createInvitationUrl
-  }), /* @__PURE__ */ React40.createElement("h3", {
+  }), /* @__PURE__ */ React39.createElement("h3", {
     className: mx22(headingFragment, descriptionText10, "mbs-2")
-  }, t("space member list heading"))), /* @__PURE__ */ React40.createElement(SpaceMemberListComponent, {
+  }, t("space member list heading"))), /* @__PURE__ */ React39.createElement(SpaceMemberListComponent, {
     spaceKey: space.key,
     includeSelf: true
-  })), /* @__PURE__ */ React40.createElement(ScrollArea.Scrollbar, {
+  })), /* @__PURE__ */ React39.createElement(ScrollArea.Scrollbar, {
     orientation: "vertical"
-  }, /* @__PURE__ */ React40.createElement(ScrollArea.Thumb, null))), /* @__PURE__ */ React40.createElement(Actions, null, /* @__PURE__ */ React40.createElement(BifurcatedAction, {
+  }, /* @__PURE__ */ React39.createElement(ScrollArea.Thumb, null))), /* @__PURE__ */ React39.createElement(Actions, null, /* @__PURE__ */ React39.createElement(BifurcatedAction, {
     disabled: !active,
     actions: inviteActions,
     activeAction,
@@ -3508,47 +3545,47 @@ var SpaceManagerImpl = (props) => {
 // packages/sdk/shell/src/panels/SpacePanel/SpacePanel.tsx
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/SpacePanel/SpacePanel.tsx";
 var SpacePanelHeading = ({ titleId, space, onDone }) => {
-  const { t } = useTranslation26("os");
+  const { t } = useTranslation25("os");
   const name = space.properties.name;
-  return /* @__PURE__ */ React41.createElement(Heading, {
+  return /* @__PURE__ */ React40.createElement(Heading, {
     titleId,
     title: t("space panel heading"),
-    corner: /* @__PURE__ */ React41.createElement(CloseButton, {
+    corner: /* @__PURE__ */ React40.createElement(CloseButton, {
       "data-testid": "identity-panel-done",
       onDone
     })
-  }, /* @__PURE__ */ React41.createElement("div", {
+  }, /* @__PURE__ */ React40.createElement("div", {
     role: "none",
     className: "flex gap-4 items-center justify-center mlb-4"
-  }, /* @__PURE__ */ React41.createElement(Planet, {
+  }, /* @__PURE__ */ React40.createElement(Planet, {
     size: 32,
     weight: "light"
-  }), /* @__PURE__ */ React41.createElement("div", {
+  }), /* @__PURE__ */ React40.createElement("div", {
     className: "block text-start font-light text-xl"
   }, name ?? space.key.truncate())));
 };
 var SpacePanelImpl = (props) => {
   const { titleId, activeView, space, target, SpaceManager: SpaceManagerComponent = SpaceManager, InvitationManager: InvitationManagerComponent = InvitationManager, ...rest } = props;
-  return /* @__PURE__ */ React41.createElement(DensityProvider4, {
+  return /* @__PURE__ */ React40.createElement(DensityProvider4, {
     density: "fine"
-  }, /* @__PURE__ */ React41.createElement(SpacePanelHeading, {
+  }, /* @__PURE__ */ React40.createElement(SpacePanelHeading, {
     ...rest,
     titleId,
     space
-  }), /* @__PURE__ */ React41.createElement(Viewport.Root, {
+  }), /* @__PURE__ */ React40.createElement(Viewport.Root, {
     activeView
-  }, /* @__PURE__ */ React41.createElement(Viewport.Views, null, /* @__PURE__ */ React41.createElement(Viewport.View, {
+  }, /* @__PURE__ */ React40.createElement(Viewport.Views, null, /* @__PURE__ */ React40.createElement(Viewport.View, {
     id: "space manager",
     classNames: stepStyles
-  }, /* @__PURE__ */ React41.createElement(SpaceManagerComponent, {
+  }, /* @__PURE__ */ React40.createElement(SpaceManagerComponent, {
     active: activeView === "space manager",
     space,
     target,
     ...rest
-  })), /* @__PURE__ */ React41.createElement(Viewport.View, {
+  })), /* @__PURE__ */ React40.createElement(Viewport.View, {
     id: "space invitation manager",
     classNames: stepStyles
-  }, /* @__PURE__ */ React41.createElement(InvitationManagerComponent, {
+  }, /* @__PURE__ */ React40.createElement(InvitationManagerComponent, {
     active: activeView === "space invitation manager",
     ...rest,
     invitationUrl: props.invitationUrl
@@ -3556,7 +3593,7 @@ var SpacePanelImpl = (props) => {
 };
 var SpacePanelWithInvitationImpl = ({ invitation, ...props }) => {
   const invitationStatus = useInvitationStatus3(invitation);
-  return /* @__PURE__ */ React41.createElement(SpacePanelImpl, {
+  return /* @__PURE__ */ React40.createElement(SpacePanelImpl, {
     ...props,
     ...invitationStatus,
     invitationUrl: props.createInvitationUrl(invitationStatus.invitationCode)
@@ -3603,16 +3640,31 @@ var SpacePanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => code,
   };
   return spaceState.context.invitation ? (
     // TODO(wittjosiah): Unused? Remove?
-    /* @__PURE__ */ React41.createElement(SpacePanelWithInvitationImpl, {
+    /* @__PURE__ */ React40.createElement(SpacePanelWithInvitationImpl, {
       ...implProps,
       invitation: spaceState.context.invitation
     })
-  ) : /* @__PURE__ */ React41.createElement(SpacePanelImpl, implProps);
+  ) : /* @__PURE__ */ React40.createElement(SpacePanelImpl, implProps);
+};
+
+// packages/sdk/shell/src/panels/StatusPanel/StatusPanel.tsx
+import React41 from "react";
+import { Status, useTranslation as useTranslation26 } from "@dxos/react-ui";
+var StatusPanel = ({ titleId }) => {
+  const { t } = useTranslation26("os");
+  return /* @__PURE__ */ React41.createElement("div", {
+    className: "grid place-items-center p-2 gap-2"
+  }, /* @__PURE__ */ React41.createElement("p", {
+    id: titleId,
+    className: "font-medium text-center"
+  }, t("resetting message")), /* @__PURE__ */ React41.createElement(Status, {
+    indeterminate: true
+  }, t("resetting message")));
 };
 
 // packages/sdk/shell/src/composites/IdentityDialog/IdentityDialog.tsx
 var IdentityDialog = (props) => {
-  const titleId = useId9("spaceDialog__title");
+  const titleId = useId9("identityDialog__title", props.title);
   return /* @__PURE__ */ React42.createElement(Dialog.Root, {
     defaultOpen: true,
     onOpenChange: (open) => open || props.onDone?.()
@@ -3659,7 +3711,7 @@ var JoinDialog = (joinPanelProps) => {
 };
 
 // packages/sdk/shell/src/composites/Shell/run-shell.tsx
-import React46, { StrictMode } from "react";
+import React47, { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { DEFAULT_CLIENT_CHANNEL, DEFAULT_SHELL_CHANNEL } from "@dxos/client-protocol";
 import { ShellRuntimeImpl } from "@dxos/client-services";
@@ -3669,9 +3721,9 @@ import { defaultTx } from "@dxos/react-ui-theme";
 import { createIFramePort } from "@dxos/rpc-tunnel";
 
 // packages/sdk/shell/src/composites/Shell/Shell.tsx
-import React45, { useEffect as useEffect7, useState as useState11 } from "react";
+import React46, { useEffect as useEffect7, useState as useState11 } from "react";
 import { log as log14 } from "@dxos/log";
-import { ShellDisplay, ShellLayout, useClient as useClient7 } from "@dxos/react-client";
+import { ShellDisplay, ShellLayout, useClient as useClient6 } from "@dxos/react-client";
 import { useSpace as useSpace2 } from "@dxos/react-client/echo";
 
 // packages/sdk/shell/src/composites/SpaceDialog/SpaceDialog.tsx
@@ -3693,6 +3745,20 @@ var SpaceDialog = (spacePanelProps) => {
   }))))));
 };
 
+// packages/sdk/shell/src/composites/StatusDialog/StatusDialog.tsx
+import React45 from "react";
+import { AlertDialog as AlertDialog2, useId as useId12 } from "@dxos/react-ui";
+var StatusDialog = () => {
+  const titleId = useId12("statusDialog__title");
+  return /* @__PURE__ */ React45.createElement(AlertDialog2.Root, {
+    open: true
+  }, /* @__PURE__ */ React45.createElement(AlertDialog2.Portal, null, /* @__PURE__ */ React45.createElement(AlertDialog2.Overlay, null, /* @__PURE__ */ React45.createElement(AlertDialog2.Content, {
+    "aria-labelledby": titleId
+  }, /* @__PURE__ */ React45.createElement(StatusPanel, {
+    titleId
+  })))));
+};
+
 // packages/sdk/shell/src/composites/Shell/Shell.tsx
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/composites/Shell/Shell.tsx";
 var Shell = ({ runtime, origin }) => {
@@ -3702,7 +3768,7 @@ var Shell = ({ runtime, origin }) => {
     spaceKey: runtime.spaceKey,
     target: runtime.target
   });
-  const client = useClient7();
+  const client = useClient6();
   const space = useSpace2(spaceKey);
   useEffect7(() => {
     return runtime.layoutUpdate.on((request) => setLayout(request));
@@ -3713,7 +3779,7 @@ var Shell = ({ runtime, origin }) => {
     if (layout === ShellLayout.SPACE && !space) {
       log14.warn("No space found for shell space invitations.", void 0, {
         F: __dxlog_file14,
-        L: 32,
+        L: 33,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -3733,10 +3799,17 @@ var Shell = ({ runtime, origin }) => {
     space
   ]);
   switch (layout) {
+    case ShellLayout.STATUS:
+      return /* @__PURE__ */ React46.createElement(StatusDialog, null);
     case ShellLayout.INITIALIZE_IDENTITY:
-      return /* @__PURE__ */ React45.createElement(JoinDialog, {
+    case ShellLayout.INITIALIZE_IDENTITY_FROM_INVITATION:
+      return /* @__PURE__ */ React46.createElement(JoinDialog, {
         mode: "halo-only",
+        initialDisposition: layout === ShellLayout.INITIALIZE_IDENTITY_FROM_INVITATION ? "accept-halo-invitation" : "default",
         initialInvitationCode: invitationCode,
+        onCancelResetStorage: () => runtime.setLayout({
+          layout: ShellLayout.IDENTITY
+        }),
         onDone: () => {
           void runtime.setAppContext({
             display: ShellDisplay.NONE
@@ -3749,18 +3822,27 @@ var Shell = ({ runtime, origin }) => {
     case ShellLayout.IDENTITY:
     case ShellLayout.SHARE_IDENTITY:
     case ShellLayout.EDIT_PROFILE:
-      return /* @__PURE__ */ React45.createElement(IdentityDialog, {
+      return /* @__PURE__ */ React46.createElement(IdentityDialog, {
         createInvitationUrl: (invitationCode2) => `${origin}?deviceInvitationCode=${invitationCode2}`,
-        onResetDevice: async () => {
+        onResetStorage: async () => {
+          runtime.setLayout({
+            layout: ShellLayout.STATUS
+          });
           await client.reset();
-          await runtime.setAppContext({
+          return runtime.setAppContext({
             display: ShellDisplay.NONE,
             reload: true
           });
         },
-        onJoinNewIdentity: () => runtime.setLayout({
-          layout: ShellLayout.INITIALIZE_IDENTITY
-        }),
+        onJoinNewIdentity: async () => {
+          runtime.setLayout({
+            layout: ShellLayout.STATUS
+          });
+          await client.reset();
+          return runtime.setLayout({
+            layout: ShellLayout.INITIALIZE_IDENTITY_FROM_INVITATION
+          });
+        },
         onDone: async () => {
           await runtime.setAppContext({
             display: ShellDisplay.NONE
@@ -3768,10 +3850,11 @@ var Shell = ({ runtime, origin }) => {
           runtime.setLayout({
             layout: ShellLayout.DEFAULT
           });
-        }
+        },
+        initialDisposition: layout === ShellLayout.SHARE_IDENTITY ? "manage-device-invitation" : layout === ShellLayout.EDIT_PROFILE ? "manage-profile" : "default"
       });
     case ShellLayout.SPACE:
-      return space ? /* @__PURE__ */ React45.createElement(SpaceDialog, {
+      return space ? /* @__PURE__ */ React46.createElement(SpaceDialog, {
         space,
         target,
         createInvitationUrl: (invitationCode2) => `${origin}?spaceInvitationCode=${invitationCode2}`,
@@ -3785,7 +3868,7 @@ var Shell = ({ runtime, origin }) => {
         }
       }) : null;
     case ShellLayout.JOIN_SPACE:
-      return /* @__PURE__ */ React45.createElement(JoinDialog, {
+      return /* @__PURE__ */ React46.createElement(JoinDialog, {
         initialInvitationCode: invitationCode,
         onDone: async (result) => {
           const target2 = result?.target ?? void 0;
@@ -3888,7 +3971,8 @@ var os = {
   "choose add device label": "Add device",
   "choose devices label": "Manage devices",
   "choose profile label": "Edit profile",
-  "choose sign out label": "Sign out",
+  "choose sign out label": "Reset storage",
+  "choose join new identity label": "Join existing device",
   "empty space members message": "There is nobody in this space yet.",
   "back to all invitations label": "Back to all invitations",
   "invitation heading": "Invitation",
@@ -3912,18 +3996,20 @@ var os = {
   "invite options label": "Change the active invite option.",
   "reset in progress label": "Resetting...",
   "confirm label": "Confirm",
-  "reset identity input label": "This will clear this device and all associated data. Type {{confirmationValue}} and confirm to continue.",
+  "reset storage input label": "This will clear this device and all associated data. Type {{confirmationValue}} and confirm to continue.",
+  "join new identity input label": "In order to join an existing device, storage on this device must be cleared first. Type {{confirmationValue}} to continue.",
   "failed to reset identity message": "Failed to reset identity.",
   "confirmation value": "CONFIRM",
-  "sign out chooser title": "DANGER ZONE",
-  "sign out chooser message": "Proceeding with either action below will erase all data on this device.",
+  "sign out chooser title": "Danger zone",
+  "sign out chooser message": "Proceeding with the action below will erase all data on this device.",
   "join new identity label": "Join a new identity",
-  "reset device label": "Reset device",
+  "reset device label": "Reset storage",
   "reset device confirm message": "Are you sure you want to reset your device? All data will be lost.",
   "emoji and color label": "Emoji and color",
   "clear label": "Use default",
   "select emoji label": "Choose an emoji to use in your avatar",
   "select hue label": "Choose a hue to use in your avatar",
+  "resetting message": "One moment while things are reset\u2026",
   "red label": "Red",
   "orange label": "Orange",
   "amber label": "Amber",
@@ -3964,25 +4050,25 @@ var runShell = async (config = new Config()) => {
     runtime.open(),
     client.initialize()
   ]);
-  createRoot(document.getElementById("root")).render(/* @__PURE__ */ React46.createElement(StrictMode, null, /* @__PURE__ */ React46.createElement(ThemeProvider, {
+  createRoot(document.getElementById("root")).render(/* @__PURE__ */ React47.createElement(StrictMode, null, /* @__PURE__ */ React47.createElement(ThemeProvider, {
     tx: defaultTx,
     resourceExtensions: [
       osTranslations
     ]
-  }, /* @__PURE__ */ React46.createElement(ClientContext.Provider, {
+  }, /* @__PURE__ */ React47.createElement(ClientContext.Provider, {
     value: {
       client,
       status: SystemStatus.ACTIVE
     }
-  }, /* @__PURE__ */ React46.createElement(ClipboardProvider, null, /* @__PURE__ */ React46.createElement(Tooltip5.Provider, null, /* @__PURE__ */ React46.createElement(Shell, {
+  }, /* @__PURE__ */ React47.createElement(ClipboardProvider, null, /* @__PURE__ */ React47.createElement(Tooltip5.Provider, null, /* @__PURE__ */ React47.createElement(Shell, {
     runtime,
     origin: location.origin
   })))))));
 };
 
 // packages/sdk/shell/src/composites/Shell/ShellContext.tsx
-import React47, { createContext as createContext2, useCallback as useCallback9, useContext as useContext2, useEffect as useEffect8, useMemo as useMemo6, useState as useState12 } from "react";
-import { ShellDisplay as ShellDisplay2, ShellLayout as ShellLayout3, useClient as useClient8 } from "@dxos/react-client";
+import React48, { createContext as createContext2, useCallback as useCallback9, useContext as useContext2, useEffect as useEffect8, useMemo as useMemo6, useState as useState12 } from "react";
+import { ShellDisplay as ShellDisplay2, ShellLayout as ShellLayout3, useClient as useClient7 } from "@dxos/react-client";
 import { useIdentity as useIdentity3 } from "@dxos/react-client/halo";
 import { mx as mx23 } from "@dxos/react-ui-theme";
 
@@ -4020,7 +4106,7 @@ var MemoryShellRuntime = class {
 // packages/sdk/shell/src/composites/Shell/ShellContext.tsx
 var ShellContext = /* @__PURE__ */ createContext2({});
 var useShell = () => {
-  const client = useClient8();
+  const client = useClient7();
   const { runtime, setDisplay } = useContext2(ShellContext);
   const setLayout = async (layout, options) => {
     if (runtime) {
@@ -4041,7 +4127,7 @@ var useShell = () => {
   };
 };
 var ShellProvider = ({ space, deviceInvitationCode, spaceInvitationCode, onJoinedSpace, children }) => {
-  const client = useClient8();
+  const client = useClient7();
   const identity = useIdentity3();
   const [display, setDisplay] = useState12(!identity || spaceInvitationCode || deviceInvitationCode ? ShellDisplay2.FULLSCREEN : ShellDisplay2.NONE);
   const shellRuntime = useMemo6(() => {
@@ -4113,12 +4199,12 @@ var ShellProvider = ({ space, deviceInvitationCode, spaceInvitationCode, onJoine
   }, [
     shellRuntime
   ]);
-  return /* @__PURE__ */ React47.createElement(React47.Fragment, null, shellRuntime && /* @__PURE__ */ React47.createElement("div", {
+  return /* @__PURE__ */ React48.createElement(React48.Fragment, null, shellRuntime && /* @__PURE__ */ React48.createElement("div", {
     className: mx23(display === ShellDisplay2.NONE ? "hidden" : "")
-  }, /* @__PURE__ */ React47.createElement(Shell, {
+  }, /* @__PURE__ */ React48.createElement(Shell, {
     runtime: shellRuntime,
     origin: window.location.origin
-  })), /* @__PURE__ */ React47.createElement(ShellContext.Provider, {
+  })), /* @__PURE__ */ React48.createElement(ShellContext.Provider, {
     value: {
       runtime: shellRuntime,
       setDisplay
@@ -4135,6 +4221,8 @@ export {
   ClipboardProvider,
   CloseButton,
   CompoundButton,
+  ConfirmReset,
+  ConfirmResetImpl,
   CopyButton,
   CopyButtonIconOnly,
   DeviceList,
@@ -4165,6 +4253,7 @@ export {
   SpaceMemberListImpl,
   SpacePanel,
   SpacePanelImpl,
+  StatusPanel,
   StepHeading,
   Viewport,
   activeBgColor,