@dxos/plugin-navtree 0.7.5-labs.5f04cf6 → 0.7.5-labs.e27f9b9

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,GAAG,EACH,OAAO,CACL,cAAc,GAAG;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,mBAAmB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC/E,MAAM,EAAE,CAAC,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACjF,eAAe,EAAE,CAAC,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1F,aAAa,EAAE,CAAC,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAClH,CACF,CACF,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IAGvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,GAAG,EACH,OAAO,CACL,cAAc,GAAG;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,mBAAmB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC/E,MAAM,EAAE,CAAC,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACjF,eAAe,EAAE,CAAC,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1F,aAAa,EAAE,CAAC,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAClH,CACF,CACF,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IAGvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC"}

package/dist/types/src/util.d.ts

@@ -9,4 +9,13 @@ export declare const getActions: (graph: Graph, node: Node) => FlattenedActions;
 export declare const expandChildrenAndActions: (graph: Graph, node: Node) => Promise<[void, [void, void]]>;
 export declare const expandChildren: (graph: Graph, node: Node) => Promise<void>;
 export declare const expandActions: (graph: Graph, node: Node) => Promise<[void, void]>;
+export declare const l0ItemType: (item: Node<any>) => "collection" | "action" | "link" | "tab";
+/**
+ * Returns the first two renderable characters from a string that are separated by non-word characters.
+ * Handles Unicode characters correctly.
+ *
+ * @param {string} label - The input string to process
+ * @returns {[string, string]} Array containing the two characters, or empty strings if not found
+ */
+export declare const getFirstTwoRenderableChars: (label: string) => string[];
 //# sourceMappingURL=util.d.ts.map

package/dist/types/src/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,UAAU,EACf,KAAK,KAAK,EAIX,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE3E,eAAO,MAAM,SAAS,UACb,KAAK,QACN,oBAAoB,QACpB,MAAM,EAAE,KACb,oBAAoB,GAAG,SAGzB,CAAC;AAEF,eAAO,MAAM,oBAAoB,UACxB,KAAK,QACN,oBAAoB,QACpB,MAAM,EAAE,oBACI,MAAM,KACvB,oBAAoB,GAAG,IAOzB,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAC7B,KAAK,cACA,oBAAoB,mBACf,MAAM,EAAE,2BACA,oBAAoB,KAC5C,UAAU,GAAG,MAAM,GAAG,QAsBxB,CAAC;AAGF,eAAO,MAAM,WAAW,YAAa,MAAM,EAAE,KAAG,MAAM,EAWlD,CAAC;AAEL,eAAO,MAAM,WAAW,UACf,KAAK,QACN,oBAAoB,WACjB,UAAU,SACb,SAAS,MAAM,EAAE,KACtB,oBAAoB,EAStB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,KAAK,QAAQ,IAAI,KAAG,gBAgBrD,CAAC;AAEF,eAAO,MAAM,wBAAwB,UAAW,KAAK,QAAQ,IAAI,kCAEhE,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,KAAK,QAAQ,IAAI,kBAEtD,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,KAAK,QAAQ,IAAI,0BAErD,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,UAAU,EACf,KAAK,KAAK,EAKX,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE3E,eAAO,MAAM,SAAS,UACb,KAAK,QACN,oBAAoB,QACpB,MAAM,EAAE,KACb,oBAAoB,GAAG,SAGzB,CAAC;AAEF,eAAO,MAAM,oBAAoB,UACxB,KAAK,QACN,oBAAoB,QACpB,MAAM,EAAE,oBACI,MAAM,KACvB,oBAAoB,GAAG,IAOzB,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAC7B,KAAK,cACA,oBAAoB,mBACf,MAAM,EAAE,2BACA,oBAAoB,KAC5C,UAAU,GAAG,MAAM,GAAG,QAsBxB,CAAC;AAGF,eAAO,MAAM,WAAW,YAAa,MAAM,EAAE,KAAG,MAAM,EAWlD,CAAC;AAEL,eAAO,MAAM,WAAW,UACf,KAAK,QACN,oBAAoB,WACjB,UAAU,SACb,SAAS,MAAM,EAAE,KACtB,oBAAoB,EAStB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,KAAK,QAAQ,IAAI,KAAG,gBAgBrD,CAAC;AAEF,eAAO,MAAM,wBAAwB,UAAW,KAAK,QAAQ,IAAI,kCAEhE,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,KAAK,QAAQ,IAAI,kBAEtD,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,KAAK,QAAQ,IAAI,0BAErD,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,IAAI,CAAC,GAAG,CAAC,6CAUzC,CAAC;AAOF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,UAAW,MAAM,aA2BvD,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.2"}
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-navtree",
-  "version": "0.7.5-labs.5f04cf6",
+  "version": "0.7.5-labs.e27f9b9",
   "description": "DXOS Surface plugin for a tree view visualization of the graph.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,30 +25,32 @@
     "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@preact/signals-core": "^1.6.0",
-    "@radix-ui/react-use-controllable-state": "^1.0.0",
+    "@radix-ui/react-dismissable-layer": "1.1.5",
+    "@radix-ui/react-use-controllable-state": "1.1.0",
     "date-fns": "^3.3.1",
-    "@dxos/app-framework": "0.7.5-labs.5f04cf6",
-    "@dxos/app-graph": "0.7.5-labs.5f04cf6",
-    "@dxos/async": "0.7.5-labs.5f04cf6",
-    "@dxos/echo-schema": "0.7.5-labs.5f04cf6",
-    "@dxos/debug": "0.7.5-labs.5f04cf6",
-    "@dxos/keyboard": "0.7.5-labs.5f04cf6",
-    "@dxos/invariant": "0.7.5-labs.5f04cf6",
-    "@dxos/live-object": "0.7.5-labs.5f04cf6",
-    "@dxos/local-storage": "0.7.5-labs.5f04cf6",
-    "@dxos/log": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-client": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-graph": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-observability": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-theme": "0.7.5-labs.5f04cf6",
-    "@dxos/react-client": "0.7.5-labs.5f04cf6",
-    "@dxos/protocols": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-menu": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-mosaic": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-list": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-searchlist": "0.7.5-labs.5f04cf6",
-    "@dxos/util": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-stack": "0.7.5-labs.5f04cf6"
+    "@dxos/app-framework": "0.7.5-labs.e27f9b9",
+    "@dxos/async": "0.7.5-labs.e27f9b9",
+    "@dxos/app-graph": "0.7.5-labs.e27f9b9",
+    "@dxos/debug": "0.7.5-labs.e27f9b9",
+    "@dxos/echo-schema": "0.7.5-labs.e27f9b9",
+    "@dxos/invariant": "0.7.5-labs.e27f9b9",
+    "@dxos/keyboard": "0.7.5-labs.e27f9b9",
+    "@dxos/local-storage": "0.7.5-labs.e27f9b9",
+    "@dxos/live-object": "0.7.5-labs.e27f9b9",
+    "@dxos/log": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-graph": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-observability": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-client": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-theme": "0.7.5-labs.e27f9b9",
+    "@dxos/protocols": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-list": "0.7.5-labs.e27f9b9",
+    "@dxos/react-client": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-menu": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-mosaic": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-searchlist": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-stack": "0.7.5-labs.e27f9b9",
+    "@dxos/util": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-tabs": "0.7.5-labs.e27f9b9"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -57,18 +59,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-signals": "0.7.5-labs.5f04cf6",
-    "@dxos/random": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6",
-    "@dxos/storybook-utils": "0.7.5-labs.5f04cf6"
+    "@dxos/echo-signals": "0.7.5-labs.e27f9b9",
+    "@dxos/random": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-theme": "0.7.5-labs.e27f9b9",
+    "@dxos/storybook-utils": "0.7.5-labs.e27f9b9"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui": "0.7.5-labs.5f04cf6"
+    "@dxos/react-ui": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-theme": "0.7.5-labs.e27f9b9"
   },
   "publishConfig": {
     "access": "public"

package/src/NavTreePlugin.tsx

@@ -9,9 +9,8 @@ import {
   contributes,
   Capabilities,
   allOf,
-  oneOf,
-  NavigationAction,
   createIntent,
+  LayoutAction,
 } from '@dxos/app-framework';
 import { type TreeData } from '@dxos/react-ui-list';
 
@@ -25,7 +24,7 @@ export const NavTreePlugin = () =>
   definePlugin(meta, [
     defineModule({
       id: `${meta.id}/module/state`,
-      activatesOn: allOf(Events.LayoutReady, Events.LocationReady),
+      activatesOn: Events.LayoutReady,
       activatesAfter: [NavTreeEvents.StateReady],
       activate: State,
     }),
@@ -36,7 +35,7 @@ export const NavTreePlugin = () =>
     }),
     defineModule({
       id: `${meta.id}/module/metadata`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
+      activatesOn: Events.SetupMetadata,
       activate: () =>
         contributes(Capabilities.Metadata, {
           id: NODE_TYPE,
@@ -56,14 +55,13 @@ export const NavTreePlugin = () =>
     }),
     defineModule({
       id: `${meta.id}/module/expose`,
-      activatesOn: allOf(Events.DispatcherReady, Events.LayoutReady, Events.LocationReady, NavTreeEvents.StateReady),
+      activatesOn: allOf(Events.DispatcherReady, Events.LayoutReady, NavTreeEvents.StateReady),
       activate: async (context) => {
-        const location = context.requestCapability(Capabilities.Location);
+        const layout = context.requestCapability(Capabilities.Layout);
         const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
 
-        const soloPart = location.active.solo?.[0];
-        if (dispatch && soloPart) {
-          await dispatch(createIntent(NavigationAction.Expose, { id: soloPart.id }));
+        if (dispatch && layout.active.length === 1) {
+          await dispatch(createIntent(LayoutAction.Expose, { part: 'navigation', subject: layout.active[0] }));
         }
 
         return [];
@@ -76,7 +74,7 @@ export const NavTreePlugin = () =>
     }),
     defineModule({
       id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.Startup,
+      activatesOn: Events.SetupSurfaces,
       activate: ReactSurface,
     }),
     defineModule({

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

@@ -19,10 +19,12 @@ export default (context: PluginsContext) =>
           data: async () => {
             const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
             await dispatch(
-              createIntent(LayoutAction.SetLayout, {
-                element: 'dialog',
-                component: COMMANDS_DIALOG,
-                dialogBlockAlign: 'start',
+              createIntent(LayoutAction.UpdateDialog, {
+                part: 'dialog',
+                subject: COMMANDS_DIALOG,
+                options: {
+                  blockAlign: 'start',
+                },
               }),
             );
           },

package/src/capabilities/capabilities.ts

@@ -6,13 +6,14 @@ import { defineCapability } from '@dxos/app-framework';
 import { type ReactiveObject } from '@dxos/live-object';
 
 import { NAVTREE_PLUGIN } from '../meta';
+import { type NavTreeItemGraphNode } from '../types';
 
 export namespace NavTreeCapabilities {
   export const State = defineCapability<{
     state: Map<string, ReactiveObject<{ open: boolean; current: boolean }>>;
     getItem: (path: string[]) => ReactiveObject<{ open: boolean; current: boolean }>;
     setItem: (path: string[], key: 'open' | 'current', next: boolean) => void;
-    isOpen: (path: string[]) => boolean;
-    isCurrent: (path: string[]) => boolean;
+    isOpen: (path: string[], item: NavTreeItemGraphNode) => boolean;
+    isCurrent: (path: string[], item: NavTreeItemGraphNode) => boolean;
   }>(`${NAVTREE_PLUGIN}/capability/state`);
 }

package/src/capabilities/intent-resolver.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginsContext, Capabilities, NavigationAction, createResolver } from '@dxos/app-framework';
+import { contributes, type PluginsContext, Capabilities, createResolver, LayoutAction } from '@dxos/app-framework';
+import { S } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 
 import { NavTreeCapabilities } from './capabilities';
@@ -10,21 +11,26 @@ import { NavTreeCapabilities } from './capabilities';
 export default (context: PluginsContext) =>
   contributes(
     Capabilities.IntentResolver,
-    createResolver(NavigationAction.Expose, async ({ id }) => {
-      const { graph } = context.requestCapability(Capabilities.AppGraph);
-      const { getItem, setItem } = context.requestCapability(NavTreeCapabilities.State);
+    createResolver({
+      intent: LayoutAction.UpdateLayout,
+      filter: (data): data is S.Schema.Type<typeof LayoutAction.Expose.fields.input> =>
+        S.is(LayoutAction.Expose.fields.input)(data),
+      resolve: async ({ subject }) => {
+        const { graph } = context.requestCapability(Capabilities.AppGraph);
+        const { getItem, setItem } = context.requestCapability(NavTreeCapabilities.State);
 
-      try {
-        const path = await graph.waitForPath({ target: id }, { timeout: 1_000 });
-        [...Array(path.length)].forEach((_, index) => {
-          const subpath = path.slice(0, index);
-          const value = getItem(subpath);
-          if (!value.open) {
-            setItem(subpath, 'open', true);
-          }
-        });
-      } catch {
-        log.warn('Path to node not found', { id });
-      }
+        try {
+          const path = await graph.waitForPath({ target: subject }, { timeout: 1_000 });
+          [...Array(path.length)].forEach((_, index) => {
+            const subpath = path.slice(0, index);
+            const value = getItem(subpath);
+            if (!value.open) {
+              setItem(subpath, 'open', true);
+            }
+          });
+        } catch {
+          log('Path to node not found', { subject });
+        }
+      },
     }),
   );

package/src/capabilities/react-surface.tsx

@@ -2,12 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import React from 'react';
 
-import { createSurface, Capabilities, contributes, useCapability } from '@dxos/app-framework';
-import { isGraphNode, type Node } from '@dxos/plugin-graph';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { isGraphNode } from '@dxos/plugin-graph';
 
-import { NavTreeCapabilities } from './capabilities';
 import {
   CommandsDialogContent,
   CommandsTrigger,
@@ -15,48 +14,28 @@ import {
   NotchStart,
   NavTreeContainer,
 } from '../components';
-import { NavTreeFooter } from '../components/NavTreeFooter';
 import { COMMANDS_DIALOG, NAVTREE_PLUGIN } from '../meta';
-import { type NavTreeItemGraphNode } from '../types';
-import { expandChildrenAndActions } from '../util';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
       id: COMMANDS_DIALOG,
       role: 'dialog',
-      filter: (data): data is { subject?: string } => data.component === COMMANDS_DIALOG,
-      component: ({ data }) => <CommandsDialogContent selected={data.subject} />,
+      filter: (data): data is { props: { selected?: string } } => data.component === COMMANDS_DIALOG,
+      component: ({ data }) => <CommandsDialogContent {...data.props} />,
     }),
     createSurface({
       id: `${NAVTREE_PLUGIN}/navigation`,
       role: 'navigation',
-      component: ({ data }) => {
-        const { graph } = useCapability(Capabilities.AppGraph);
-        const { isOpen, isCurrent, setItem } = useCapability(NavTreeCapabilities.State);
-
-        const handleOpenChange = useCallback(
-          ({ item: { id }, path, open }: { item: Node; path: string[]; open: boolean }) => {
-            // TODO(thure): This might become a localstorage leak; openItemIds that no longer exist should be removed from this map.
-            setItem(path, 'open', open);
-
-            if (graph) {
-              const node = graph.findNode(id);
-              return node && expandChildrenAndActions(graph, node as NavTreeItemGraphNode);
-            }
-          },
-          [graph],
-        );
-
-        return (
-          <NavTreeContainer
-            isOpen={isOpen}
-            isCurrent={isCurrent}
-            onOpenChange={handleOpenChange}
-            popoverAnchorId={data.popoverAnchorId as string | undefined}
-          />
-        );
-      },
+      filter: (data): data is { popoverAnchorId?: string; topbar: boolean; current: string } =>
+        typeof data.current === 'string',
+      component: ({ data }) => (
+        <NavTreeContainer
+          tab={data.current}
+          popoverAnchorId={data.popoverAnchorId as string | undefined}
+          topbar={data.topbar as boolean}
+        />
+      ),
     }),
     createSurface({
       id: `${NAVTREE_PLUGIN}/document-title`,
@@ -68,15 +47,10 @@ export default () =>
       role: 'notch-start',
       component: () => <NotchStart />,
     }),
-    createSurface({
-      id: `${NAVTREE_PLUGIN}/header-end`,
-      role: 'header-end',
-      component: () => <NavTreeFooter />,
-    }),
     createSurface({
       id: `${NAVTREE_PLUGIN}/search-input`,
       role: 'search-input',
-      disposition: 'fallback',
+      position: 'fallback',
       component: () => <CommandsTrigger />,
     }),
   ]);

package/src/capabilities/state.ts

@@ -34,6 +34,8 @@ const getInitialState = () => {
 };
 
 export default (context: PluginsContext) => {
+  const layout = context.requestCapability(Capabilities.Layout);
+
   // TODO(wittjosiah): This currently needs to be not a ReactiveObject at the root.
   //   If it is a ReactiveObject then React errors when initializing new paths because of state change during render.
   //   Ideally this could be a ReactiveObject but be able to access and update the root level without breaking render.
@@ -67,15 +69,10 @@ export default (context: PluginsContext) => {
   const isOpen = (path: string[]) => getItem(path).open;
   const isCurrent = (path: string[]) => getItem(path).current;
 
-  const location = context.requestCapability(Capabilities.Location);
-  const layout = context.requestCapability(Capabilities.Layout);
-
   let previous: string[] = [];
   const unsubscribe = effect(() => {
-    const part = layout.layoutMode === 'solo' ? 'solo' : 'main';
-    const current = location.active[part]?.map(({ id }) => id) ?? [];
-    const removed = previous.filter((id) => !current.includes(id));
-    previous = current;
+    const removed = previous.filter((id) => !layout.active.includes(id));
+    previous = layout.active;
 
     // TODO(wittjosiah): This is setTimeout because there's a race between the keys be initialized.
     //   This could be avoided if the location was a path as well and not just an id.
@@ -87,7 +84,7 @@ export default (context: PluginsContext) => {
         });
       });
 
-      current.forEach((id) => {
+      layout.active.forEach((id) => {
         const keys = Array.from(new Set([...state.keys(), id])).filter((key) => Path.last(key) === id);
         keys.forEach((key) => {
           setItem(Path.parts(key), 'current', true);

package/src/components/CommandsDialog.tsx

@@ -4,10 +4,9 @@
 
 import React, { useMemo, useState } from 'react';
 
-import { useIntentDispatcher, LayoutAction, createIntent } from '@dxos/app-framework';
+import { createIntent, LayoutAction, useAppGraph, useIntentDispatcher } from '@dxos/app-framework';
 import { type ActionLike, isActionGroup, isAction } from '@dxos/app-graph';
 import { Keyboard, keySymbols } from '@dxos/keyboard';
-import { useGraph } from '@dxos/plugin-graph';
 import { Button, Dialog, Icon, useTranslation, toLocalizedString } from '@dxos/react-ui';
 import { SearchList } from '@dxos/react-ui-searchlist';
 import { descriptionText, mx } from '@dxos/react-ui-theme';
@@ -20,7 +19,7 @@ export const CommandsDialogContent = ({ selected: initial }: { selected?: string
   const { t } = useTranslation(NAVTREE_PLUGIN);
   const [selected, setSelected] = useState<string | undefined>(initial);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const { graph } = useGraph();
+  const { graph } = useAppGraph();
 
   // Traverse graph.
   // TODO(burdon): Factor out commonality with shortcut dialog.
@@ -83,7 +82,7 @@ export const CommandsDialogContent = ({ selected: initial }: { selected?: string
                     return;
                   }
 
-                  void dispatch(createIntent(LayoutAction.SetLayout, { element: 'dialog', state: false }));
+                  void dispatch(createIntent(LayoutAction.UpdateDialog, { part: 'dialog', options: { state: false } }));
                   setTimeout(() => {
                     const node = graph.nodes(group ?? action, { relation: 'inbound' })[0];
                     void (node && isAction(action) && action.data({ node, caller: KEY_BINDING }));

package/src/components/CommandsTrigger.tsx

@@ -17,13 +17,15 @@ export const CommandsTrigger = () => {
   const { t } = useTranslation(NAVTREE_PLUGIN);
   return (
     <Button
-      classNames='m-1 !pli-1 lg:!pli-2'
+      classNames='m-1 pli-1 lg:pli-2'
       onClick={() =>
         dispatch(
-          createIntent(LayoutAction.SetLayout, {
-            element: 'dialog',
-            component: COMMANDS_DIALOG,
-            dialogBlockAlign: 'start',
+          createIntent(LayoutAction.UpdateDialog, {
+            part: 'dialog',
+            subject: COMMANDS_DIALOG,
+            options: {
+              blockAlign: 'start',
+            },
           }),
         )
       }