@dxos/plugin-simple-layout 0.8.4-main.c85a9c8dae → 0.8.4-main.d05673bc65

package/dist/lib/browser/{url-handler-HTIUY6WL.mjs → url-handler-RBRONH7S.mjs}

@@ -1,13 +1,12 @@
 import {
   SimpleLayoutState
-} from "./chunk-7VLT3S46.mjs";
+} from "./chunk-MRR7PXSM.mjs";
 
 // src/capabilities/url-handler/url-handler.ts
 import * as Effect from "effect/Effect";
 import { Capabilities, Capability } from "@dxos/app-framework";
-import { LayoutOperation } from "@dxos/app-toolkit";
+import { LayoutOperation, fromUrlPath, getWorkspaceFromPath, toUrlPath } from "@dxos/app-toolkit";
 import { log } from "@dxos/log";
-import { Node } from "@dxos/plugin-graph";
 import { isTauri } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-simple-layout/src/capabilities/url-handler/url-handler.ts";
 var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
@@ -17,19 +16,20 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
       pathname
     }, {
       F: __dxlog_file,
-      L: 31,
+      L: 30,
       S: this,
       C: (f, a) => f(...a)
     });
-    const [_, nextWorkspace, nextActive] = pathname.split("/");
-    const targetWorkspace = !nextWorkspace || nextWorkspace === "root" ? Node.RootId : nextWorkspace;
+    const qualifiedId = fromUrlPath(pathname);
+    const workspace = getWorkspaceFromPath(qualifiedId);
     invokeSync(LayoutOperation.SwitchWorkspace, {
-      subject: targetWorkspace
+      subject: workspace
     });
-    if (nextActive) {
+    const activeId = qualifiedId !== workspace ? qualifiedId : void 0;
+    if (activeId) {
       invokeSync(LayoutOperation.Open, {
         subject: [
-          nextActive
+          activeId
         ]
       });
     }
@@ -48,7 +48,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
             urls: launchUrls
           }, {
             F: __dxlog_file,
-            L: 62,
+            L: 56,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -61,7 +61,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
             urls
           }, {
             F: __dxlog_file,
-            L: 70,
+            L: 63,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -71,7 +71,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
         });
         log.info("[UrlHandler] Deep link listener initialized", void 0, {
           F: __dxlog_file,
-          L: 76,
+          L: 69,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -81,7 +81,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
           error
         }, {
           F: __dxlog_file,
-          L: 79,
+          L: 72,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -96,7 +96,7 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
     if (workspace !== lastWorkspace || active !== lastActive) {
       lastWorkspace = workspace;
       lastActive = active;
-      const path = pathFromState(workspace, active);
+      const path = active ? toUrlPath(active) : toUrlPath(workspace);
       if (window.location.pathname !== path) {
         history.pushState(null, "", `${path}${window.location.search}`);
       }
@@ -109,14 +109,13 @@ var url_handler_default = Capability.makeModule(Effect.fnUntraced(function* () {
   }));
 }));
 var isRedirectPath = (pathname) => pathname.startsWith("/redirect/");
-var pathFromState = (workspace, active) => workspace === Node.RootId ? active ? `/${Node.RootId}/${active}` : "/" : active ? `/${workspace}/${active}` : `/${workspace}`;
 var handleNavigation = (navigate) => () => navigate(window.location.pathname);
 var handleDeepLink = (urlString, navigate) => {
   log.info("[UrlHandler] Deep link received", {
     url: urlString
   }, {
     F: __dxlog_file,
-    L: 146,
+    L: 122,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -127,7 +126,7 @@ var handleDeepLink = (urlString, navigate) => {
         pathname: url.pathname
       }, {
         F: __dxlog_file,
-        L: 150,
+        L: 126,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -140,7 +139,7 @@ var handleDeepLink = (urlString, navigate) => {
       error
     }, {
       F: __dxlog_file,
-      L: 155,
+      L: 131,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -149,4 +148,4 @@ var handleDeepLink = (urlString, navigate) => {
 export {
   url_handler_default as default
 };
-//# sourceMappingURL=url-handler-HTIUY6WL.mjs.map
+//# sourceMappingURL=url-handler-RBRONH7S.mjs.map

package/dist/lib/browser/url-handler-RBRONH7S.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/url-handler/url-handler.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { LayoutOperation, fromUrlPath, getWorkspaceFromPath, toUrlPath } from '@dxos/app-toolkit';\nimport { log } from '@dxos/log';\nimport { isTauri } from '@dxos/util';\n\nimport { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '../../types';\n\n/**\n * URL handler for simple layout that syncs browser URL with layout state.\n * URL paths map directly to qualified graph IDs with the leading `root` segment stripped.\n * Root is represented as `/`.\n *\n * On mobile Tauri, also listens for deep links via the deep-link plugin.\n */\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const { invokeSync } = yield* Capability.get(Capabilities.OperationInvoker);\n\n    /**\n     * Handle navigation from a pathname.\n     * Restores the qualified graph ID and dispatches layout operations.\n     */\n    const handlePathNavigation = (pathname: string) => {\n      log.info('[UrlHandler] Navigating to path', { pathname });\n\n      const qualifiedId = fromUrlPath(pathname);\n      const workspace = getWorkspaceFromPath(qualifiedId);\n\n      invokeSync(LayoutOperation.SwitchWorkspace, { subject: workspace });\n\n      const activeId = qualifiedId !== workspace ? qualifiedId : undefined;\n      if (activeId) {\n        invokeSync(LayoutOperation.Open, { subject: [activeId] });\n      }\n    };\n\n    const onNavigation = handleNavigation(handlePathNavigation);\n\n    yield* Effect.sync(() => onNavigation());\n    window.addEventListener('popstate', onNavigation);\n\n    let unlistenDeepLink: (() => void) | undefined;\n    if (isTauri()) {\n      yield* Effect.tryPromise({\n        try: async () => {\n          const { getCurrent, onOpenUrl } = await import('@tauri-apps/plugin-deep-link');\n\n          const launchUrls = await getCurrent();\n          if (launchUrls && launchUrls.length > 0) {\n            log.info('[UrlHandler] App launched with deep links', { urls: launchUrls });\n            for (const url of launchUrls) {\n              handleDeepLink(url, handlePathNavigation);\n            }\n          }\n\n          unlistenDeepLink = await onOpenUrl((urls) => {\n            log.info('[UrlHandler] Deep links received', { urls });\n            for (const url of urls) {\n              handleDeepLink(url, handlePathNavigation);\n            }\n          });\n\n          log.info('[UrlHandler] Deep link listener initialized');\n        },\n        catch: (error) => {\n          log.warn('[UrlHandler] Failed to initialize deep link listener', { error });\n          return error;\n        },\n      }).pipe(Effect.catchAll(() => Effect.void));\n    }\n\n    let lastWorkspace: string | undefined;\n    let lastActive: string | undefined;\n    const unsubscribe = yield* Capabilities.subscribeAtom(SimpleLayoutStateCapability, (state: SimpleLayoutState) => {\n      const { workspace, active } = state;\n\n      if (workspace !== lastWorkspace || active !== lastActive) {\n        lastWorkspace = workspace;\n        lastActive = active;\n\n        const path = active ? toUrlPath(active) : toUrlPath(workspace);\n        if (window.location.pathname !== path) {\n          history.pushState(null, '', `${path}${window.location.search}`);\n        }\n      }\n    });\n\n    return Capability.contributes(Capabilities.Null, null, () =>\n      Effect.sync(() => {\n        window.removeEventListener('popstate', onNavigation);\n        unsubscribe();\n        unlistenDeepLink?.();\n      }),\n    );\n  }),\n);\n\n/**\n * Check if a path is a special redirect path that shouldn't be navigated to.\n * These paths are handled by other systems (e.g., OAuth).\n */\nconst isRedirectPath = (pathname: string): boolean => pathname.startsWith('/redirect/');\n\n/**\n * Returns a handler for navigation events (initial load and popstate) that navigates to current pathname.\n */\nconst handleNavigation =\n  (navigate: (pathname: string) => void): (() => void) =>\n  () =>\n    navigate(window.location.pathname);\n\n/**\n * Handle deep link URL from Tauri. Parses the URL and calls navigate unless it's a redirect path.\n */\nconst handleDeepLink = (urlString: string, navigate: (pathname: string) => void): void => {\n  log.info('[UrlHandler] Deep link received', { url: urlString });\n  try {\n    const url = new URL(urlString);\n    if (isRedirectPath(url.pathname)) {\n      log.info('[UrlHandler] Skipping redirect path (handled elsewhere)', { pathname: url.pathname });\n      return;\n    }\n    navigate(url.pathname);\n  } catch (error) {\n    log.warn('[UrlHandler] Failed to parse deep link URL', { urlString, error });\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["Effect", "Capabilities", "Capability", "LayoutOperation", "fromUrlPath", "getWorkspaceFromPath", "toUrlPath", "log", "isTauri", "Capability", "makeModule", "fnUntraced", "invokeSync", "get", "Capabilities", "OperationInvoker", "handlePathNavigation", "pathname", "log", "info", "qualifiedId", "fromUrlPath", "workspace", "getWorkspaceFromPath", "LayoutOperation", "SwitchWorkspace", "subject", "activeId", "undefined", "Open", "onNavigation", "handleNavigation", "sync", "window", "addEventListener", "unlistenDeepLink", "isTauri", "tryPromise", "try", "getCurrent", "onOpenUrl", "launchUrls", "length", "urls", "url", "handleDeepLink", "catch", "error", "warn", "pipe", "catchAll", "void", "lastWorkspace", "lastActive", "unsubscribe", "subscribeAtom", "SimpleLayoutStateCapability", "state", "active", "path", "toUrlPath", "location", "history", "pushState", "search", "contributes", "Null", "removeEventListener", "isRedirectPath", "startsWith", "navigate", "urlString", "URL"]
+}

package/dist/lib/node-esm/{chunk-FLOYBAHE.mjs → chunk-DCKASLMP.mjs}

@@ -2,7 +2,7 @@ import { createRequire } from 'node:module';const require = createRequire(import
 import {
   SimpleLayoutState,
   meta
-} from "./chunk-VIDE5UMB.mjs";
+} from "./chunk-WMNTJ2MK.mjs";
 
 // src/components/Home/Home.tsx
 import React, { useCallback, useEffect as useEffect2, useMemo, useRef } from "react";
@@ -19,16 +19,16 @@ import { byPosition } from "@dxos/util";
 
 // src/components/hooks.ts
 import { useEffect } from "react";
+import { expandAttendableId } from "@dxos/react-ui-attention";
 import { useAppGraph } from "@dxos/app-toolkit/ui";
 import { Graph } from "@dxos/plugin-graph";
-var useLoadDescendents = (nodeId) => {
+var useExpandPath = (nodeId) => {
   const { graph } = useAppGraph();
   useEffect(() => {
     if (nodeId) {
-      Graph.expand(graph, nodeId, "child");
-      Graph.getConnections(graph, nodeId, "child").forEach((child) => {
-        Graph.expand(graph, child.id, "child");
-      });
+      for (const prefix of expandAttendableId(nodeId)) {
+        Graph.expand(graph, prefix, "child");
+      }
     }
   }, [
     nodeId,
@@ -42,7 +42,7 @@ var Home = (_) => {
   const userAccountItem = useItemsByDisposition("user-account")[0];
   const pinnedItems = useItemsByDisposition("pin-end", true);
   const workspaceItems = useItemsByDisposition("workspace");
-  useLoadDescendents(Node.RootId);
+  useExpandPath(Node.RootId);
   const items = useMemo(() => [
     ...userAccountItem ? [
       userAccountItem
@@ -87,7 +87,7 @@ var WorkspaceTile = (props) => {
   const name = toLocalizedString(data.properties.label, t);
   const isSelected = selectedValue === data.id;
   const cardRef = useRef(null);
-  useLoadDescendents(data.id);
+  useExpandPath(data.id);
   const handleSelect = useCallback(() => invokePromise(LayoutOperation.SwitchWorkspace, {
     subject: data.id
   }), [
@@ -243,7 +243,7 @@ var useAppBarProps = () => {
     state.active,
     state.history.length
   ]);
-  const popoverAnchorId = node && state.popoverAnchorId === `dxos.org/ui/${meta.id}/${node.id}` ? state.popoverAnchorId : void 0;
+  const popoverAnchorId = node && state.popoverAnchorId === `${meta.id}:${node.id}` ? state.popoverAnchorId : void 0;
   return {
     title,
     actions: actionsAtom,
@@ -262,13 +262,12 @@ import { byPosition as byPosition3 } from "@dxos/util";
 
 // src/hooks/actions.ts
 import * as Effect2 from "effect/Effect";
-import { LayoutOperation as LayoutOperation3 } from "@dxos/app-toolkit";
+import { getCompanionVariant } from "@dxos/app-toolkit";
 import { Node as Node3 } from "@dxos/plugin-graph";
-import { ATTENDABLE_PATH_SEPARATOR } from "@dxos/react-ui-attention";
 import { byPosition as byPosition2 } from "@dxos/util";
-var PLANK_COMPANION_TYPE = "dxos.org/plugin/deck/plank-companion";
+var PLANK_COMPANION_TYPE = "org.dxos.plugin.deck.plank-companion";
 var createCompanionActions = (graph, stateAtom, get, config) => {
-  const { idPrefix, selectedVariant, invokeSync } = config;
+  const { idPrefix, selectedVariant, updateState } = config;
   const state = get(stateAtom);
   const activeId = state.active ?? state.workspace;
   const activeConnections = activeId ? get(graph.connections(activeId, "child")) : [];
@@ -276,7 +275,7 @@ var createCompanionActions = (graph, stateAtom, get, config) => {
   const nodes = [];
   const edges = [];
   companions.forEach((companion) => {
-    const [, companionVariant] = companion.id.split(ATTENDABLE_PATH_SEPARATOR);
+    const companionVariant = getCompanionVariant(companion.id);
     const companionAction = {
       id: `${idPrefix}-companion-${companion.id}`,
       type: Node3.ActionType,
@@ -284,15 +283,17 @@ var createCompanionActions = (graph, stateAtom, get, config) => {
         icon: companion.properties.icon ?? "ph--placeholder--regular",
         label: companion.properties.label,
         iconOnly: true,
-        // Conditionally add variant highlighting.
         ...selectedVariant !== void 0 && {
           variant: selectedVariant === companionVariant ? "primary" : "ghost"
         }
       },
-      data: () => Effect2.sync(() => invokeSync(LayoutOperation3.Open, {
-        subject: [
-          companion.id
-        ]
+      data: () => Effect2.sync(() => updateState((current) => {
+        const closing = current.companionVariant === companionVariant && current.drawerState !== "closed";
+        return {
+          ...current,
+          companionVariant: closing ? void 0 : companionVariant,
+          drawerState: closing ? "closed" : "open"
+        };
       }))
     };
     nodes.push(companionAction);
@@ -321,14 +322,14 @@ var useCompanions = (nodeId) => {
 // src/hooks/useDrawerActions.ts
 import { Atom as Atom2 } from "@effect-atom/atom-react";
 import * as Effect3 from "effect/Effect";
-import { useMemo as useMemo6 } from "react";
-import { useCapability as useCapability3, useOperationInvoker as useOperationInvoker4 } from "@dxos/app-framework/ui";
+import { useMemo as useMemo7 } from "react";
+import { useCapability as useCapability3 } from "@dxos/app-framework/ui";
 import { useAppGraph as useAppGraph7 } from "@dxos/app-toolkit/ui";
 import { Node as Node4, useActionRunner as useActionRunner2 } from "@dxos/plugin-graph";
 import { useTranslation as useTranslation6 } from "@dxos/react-ui";
 import { createGapSeparator } from "@dxos/react-ui-menu";
 
-// src/components/ContentLoading.tsx
+// src/components/ContentLoading/ContentLoading.tsx
 import React2 from "react";
 var ContentLoading = () => {
   return /* @__PURE__ */ React2.createElement("div", {
@@ -722,7 +723,7 @@ var Main = () => {
     node?.properties,
     state.popoverAnchorId
   ]);
-  useLoadDescendents(id);
+  useExpandPath(id);
   const showNavBar = !keyboardOpen && !state.isPopover && state.drawerState === "closed";
   return /* @__PURE__ */ React7.createElement("div", {
     role: "none",
@@ -745,10 +746,10 @@ var Main = () => {
 };
 Main.displayName = MAIN_NAME;
 
-// src/components/Workspace/Workspace.tsx
-import React8, { useCallback as useCallback4, useEffect as useEffect5, useRef as useRef3 } from "react";
+// src/components/NavBranch/NavBranch.tsx
+import React8, { useCallback as useCallback4, useEffect as useEffect5, useMemo as useMemo6, useRef as useRef3 } from "react";
 import { useOperationInvoker as useOperationInvoker3 } from "@dxos/app-framework/ui";
-import { LayoutOperation as LayoutOperation4 } from "@dxos/app-toolkit";
+import { LayoutOperation as LayoutOperation3 } from "@dxos/app-toolkit";
 import { useAppGraph as useAppGraph6 } from "@dxos/app-toolkit/ui";
 import { useConnections as useConnections3 } from "@dxos/plugin-graph";
 import { Avatar as Avatar2, Icon as Icon2, Panel as Panel2, ScrollArea as ScrollArea2, Toolbar as Toolbar3, toLocalizedString as toLocalizedString4, useTranslation as useTranslation5 } from "@dxos/react-ui";
@@ -756,13 +757,16 @@ import { Card as Card3 } from "@dxos/react-ui";
 import { Mosaic as Mosaic2 } from "@dxos/react-ui-mosaic";
 import { SearchList as SearchList2, useSearchListItem as useSearchListItem2, useSearchListResults as useSearchListResults2 } from "@dxos/react-ui-searchlist";
 import { mx as mx6 } from "@dxos/ui-theme";
-var Workspace = ({ id }) => {
+var NavBranch = ({ id }) => {
   const { t } = useTranslation5(meta.id);
   const { graph } = useAppGraph6();
-  useLoadDescendents(id);
+  useExpandPath(id);
   const children = useConnections3(graph, id, "child");
+  const visibleChildren = useMemo6(() => children.filter((node) => node.properties.disposition !== "alternate-tree"), [
+    children
+  ]);
   const { results, handleSearch } = useSearchListResults2({
-    items: children,
+    items: visibleChildren,
     extract: (child) => toLocalizedString4(child.properties.label, t)
   });
   return /* @__PURE__ */ React8.createElement(SearchList2.Root, {
@@ -783,10 +787,10 @@ var Workspace = ({ id }) => {
   }, /* @__PURE__ */ React8.createElement(Mosaic2.Stack, {
     items: results,
     getId: (child) => child.id,
-    Tile: WorkspaceChildTile
+    Tile: NavBranchTile
   }))))))));
 };
-var WorkspaceChildTile = (props) => {
+var NavBranchTile = (props) => {
   const data = props.data;
   const { t } = useTranslation5(meta.id);
   const { invokeSync } = useOperationInvoker3();
@@ -794,7 +798,7 @@ var WorkspaceChildTile = (props) => {
   const { selectedValue, registerItem, unregisterItem } = useSearchListItem2();
   const isSelected = selectedValue === data.id;
   const name = toLocalizedString4(data.properties.label, t);
-  const handleSelect = useCallback4(() => invokeSync(LayoutOperation4.Open, {
+  const handleSelect = useCallback4(() => invokeSync(LayoutOperation3.Open, {
     subject: [
       data.id
     ]
@@ -871,15 +875,14 @@ var useDrawerActions = (consumerName) => {
   const stateAtom = useCapability3(SimpleLayoutState);
   const { graph } = useAppGraph7();
   const runAction = useActionRunner2();
-  const { invokeSync } = useOperationInvoker4();
   const { updateState } = useSimpleLayoutState();
   const { keyboardOpen } = useMobileLayout(consumerName);
-  const actionsAtom = useMemo6(() => Atom2.make((get) => {
+  const actionsAtom = useMemo7(() => Atom2.make((get) => {
     const state = get(stateAtom);
     const { nodes, edges } = createCompanionActions(graph, stateAtom, get, {
       idPrefix: "drawer",
       selectedVariant: state.companionVariant,
-      invokeSync
+      updateState
     });
     const gapSeparator = createGapSeparator("drawer-gap");
     nodes.push(...gapSeparator.nodes);
@@ -916,7 +919,8 @@ var useDrawerActions = (consumerName) => {
       },
       data: () => Effect3.sync(() => updateState((state2) => ({
         ...state2,
-        drawerState: "closed"
+        drawerState: "closed",
+        companionVariant: void 0
       })))
     };
     nodes.push(closeAction);
@@ -932,7 +936,6 @@ var useDrawerActions = (consumerName) => {
   }), [
     graph,
     stateAtom,
-    invokeSync,
     updateState,
     keyboardOpen,
     t
@@ -945,8 +948,8 @@ var useDrawerActions = (consumerName) => {
 
 // src/hooks/useNavbarActions.ts
 import { Atom as Atom3 } from "@effect-atom/atom-react";
-import { useMemo as useMemo7 } from "react";
-import { useCapability as useCapability4, useOperationInvoker as useOperationInvoker5 } from "@dxos/app-framework/ui";
+import { useMemo as useMemo8 } from "react";
+import { useCapability as useCapability4 } from "@dxos/app-framework/ui";
 import { useAppGraph as useAppGraph8 } from "@dxos/app-toolkit/ui";
 import { Node as Node5, useActionRunner as useActionRunner3 } from "@dxos/plugin-graph";
 import { useTranslation as useTranslation7 } from "@dxos/react-ui";
@@ -956,12 +959,12 @@ var useNavbarActions = () => {
   const { t } = useTranslation7(meta.id);
   const { graph } = useAppGraph8();
   const runAction = useActionRunner3();
-  const { invokeSync } = useOperationInvoker5();
   const stateAtom = useCapability4(SimpleLayoutState);
-  const actionsAtom = useMemo7(() => Atom3.make((get) => {
+  const { updateState } = useSimpleLayoutState();
+  const actionsAtom = useMemo8(() => Atom3.make((get) => {
     const { nodes, edges } = createCompanionActions(graph, stateAtom, get, {
       idPrefix: "navbar",
-      invokeSync
+      updateState
     });
     const gapSeparator = createGapSeparator2("navbar-gap");
     nodes.push(...gapSeparator.nodes);
@@ -996,7 +999,7 @@ var useNavbarActions = () => {
   }), [
     graph,
     stateAtom,
-    invokeSync,
+    updateState,
     t
   ]);
   return {
@@ -1039,24 +1042,24 @@ var Dialog = () => {
 };
 
 // src/components/SimpleLayout/Drawer.tsx
-import React10, { useMemo as useMemo8 } from "react";
+import React10, { useMemo as useMemo9 } from "react";
 import { Surface as Surface4 } from "@dxos/app-framework/ui";
+import { getCompanionVariant as getCompanionVariant2 } from "@dxos/app-toolkit";
 import { useAppGraph as useAppGraph9 } from "@dxos/app-toolkit/ui";
 import { useNode as useNode3 } from "@dxos/plugin-graph";
 import { ErrorFallback as ErrorFallback3, Panel as Panel3 } from "@dxos/react-ui";
-import { ATTENDABLE_PATH_SEPARATOR as ATTENDABLE_PATH_SEPARATOR2 } from "@dxos/react-ui-attention";
 import { Menu as Menu3, useMenuActions as useMenuActions3 } from "@dxos/react-ui-menu";
 var DRAWER_NAME = "SimpleLayout.Drawer";
 var Drawer = () => {
   const { graph } = useAppGraph9();
   const { state: layoutState } = useSimpleLayoutState();
-  const placeholder = useMemo8(() => /* @__PURE__ */ React10.createElement(ContentLoading, null), []);
+  const placeholder = useMemo9(() => /* @__PURE__ */ React10.createElement(ContentLoading, null), []);
   const activeId = layoutState.active ?? layoutState.workspace;
   const companions = useCompanions(activeId);
   const { companionId, variant } = useSelectedCompanion(companions, layoutState.companionVariant);
   const node = useNode3(graph, companionId);
   const parentNode = useNode3(graph, activeId);
-  const data = useMemo8(() => {
+  const data = useMemo9(() => {
     return node && {
       attendableId: companionId,
       subject: node.data,
@@ -1089,23 +1092,13 @@ var Drawer = () => {
   })));
 };
 Drawer.displayName = DRAWER_NAME;
-var parseEntryId = (entryId) => {
-  const [id, variant] = entryId.split(ATTENDABLE_PATH_SEPARATOR2);
-  return {
-    id,
-    variant
-  };
-};
 var useSelectedCompanion = (companions, preferredVariant) => {
-  const selectedCompanion = useMemo8(() => {
+  const selectedCompanion = useMemo9(() => {
     if (companions.length === 0) {
       return void 0;
     }
     if (preferredVariant) {
-      const preferred = companions.find((c) => {
-        const { variant: variant2 } = parseEntryId(c.id);
-        return variant2 === preferredVariant;
-      });
+      const preferred = companions.find((c) => getCompanionVariant2(c.id) === preferredVariant);
       if (preferred) {
         return preferred;
       }
@@ -1116,7 +1109,7 @@ var useSelectedCompanion = (companions, preferredVariant) => {
     preferredVariant
   ]);
   const companionId = selectedCompanion?.id;
-  const { variant } = parseEntryId(companionId ?? "");
+  const variant = companionId ? getCompanionVariant2(companionId) : void 0;
   return {
     selectedCompanion,
     companionId,
@@ -1166,6 +1159,6 @@ var SimpleLayout = () => {
 export {
   Home,
   SimpleLayout,
-  Workspace
+  NavBranch
 };
-//# sourceMappingURL=chunk-FLOYBAHE.mjs.map
+//# sourceMappingURL=chunk-DCKASLMP.mjs.map