@dxos/plugin-navtree 0.8.3-main.672df60 → 0.8.3-main.7f5a14c

package/dist/lib/browser/{state-R2UMYAHN.mjs → state-D7KDRDBV.mjs}

@@ -8,7 +8,7 @@ import {
 // packages/plugins/plugin-navtree/src/capabilities/state.ts
 import { effect } from "@preact/signals-core";
 import { Capabilities, contributes } from "@dxos/app-framework";
-import { live } from "@dxos/live-object";
+import { Obj } from "@dxos/echo";
 import { Path } from "@dxos/react-ui-list";
 var KEY = `${NAVTREE_PLUGIN}/state/v1`;
 var getInitialState = () => {
@@ -20,7 +20,7 @@ var getInitialState = () => {
     const cached = JSON.parse(stringified);
     return cached.map(([key, value]) => [
       key,
-      live({
+      Obj.make({
         open: value.open,
         current: false
       })
@@ -34,21 +34,21 @@ var state_default = (context) => {
     // TODO(thure): Initialize these dynamically.
     [
       "root",
-      live({
+      Obj.make({
         open: true,
         current: false
       })
     ],
     [
       "root~dxos.org/plugin/space-spaces",
-      live({
+      Obj.make({
         open: true,
         current: false
       })
     ],
     [
       "root~dxos.org/plugin/files",
-      live({
+      Obj.make({
         open: true,
         current: false
       })
@@ -56,7 +56,7 @@ var state_default = (context) => {
   ]);
   const getItem = (_path) => {
     const path = Path.create(..._path);
-    const value = state.get(path) ?? live({
+    const value = state.get(path) ?? Obj.make({
       open: false,
       current: false,
       alternateTree: false
@@ -111,4 +111,4 @@ var state_default = (context) => {
 export {
   state_default as default
 };
-//# sourceMappingURL=state-R2UMYAHN.mjs.map
+//# sourceMappingURL=state-D7KDRDBV.mjs.map

package/dist/lib/browser/state-D7KDRDBV.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/state.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { effect } from '@preact/signals-core';\n\nimport { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';\nimport { type Live, Obj } from '@dxos/echo';\nimport { Path } from '@dxos/react-ui-list';\n\nimport { NavTreeCapabilities } from './capabilities';\nimport { NAVTREE_PLUGIN } from '../meta';\n\nconst KEY = `${NAVTREE_PLUGIN}/state/v1`;\n\nconst getInitialState = () => {\n  const stringified = localStorage.getItem(KEY);\n  if (!stringified) {\n    return;\n  }\n\n  try {\n    const cached: [string, { open: boolean; current: boolean }][] = JSON.parse(stringified);\n    return cached.map(([key, value]): [string, Live<{ open: boolean; current: boolean }>] => [\n      key,\n      Obj.make({ open: value.open, current: false }),\n    ]);\n  } catch {}\n};\n\nexport default (context: PluginContext) => {\n  const layout = context.getCapability(Capabilities.Layout);\n\n  // TODO(wittjosiah): This currently needs to be not a Live at the root.\n  //   If it is a Live then React errors when initializing new paths because of state change during render.\n  //   Ideally this could be a Live but be able to access and update the root level without breaking render.\n  //   Wrapping accesses and updates in `untracked` didn't seem to work in all cases.\n  const state = new Map<string, Live<{ open: boolean; current: boolean; alternateTree?: boolean }>>(\n    getInitialState() ?? [\n      // TODO(thure): Initialize these dynamically.\n      ['root', Obj.make({ open: true, current: false })],\n      ['root~dxos.org/plugin/space-spaces', Obj.make({ open: true, current: false })],\n      ['root~dxos.org/plugin/files', Obj.make({ open: true, current: false })],\n    ],\n  );\n\n  const getItem = (_path: string[]) => {\n    const path = Path.create(..._path);\n    const value = state.get(path) ?? Obj.make({ open: false, current: false, alternateTree: false });\n    if (!state.has(path)) {\n      state.set(path, value);\n    }\n\n    return value;\n  };\n\n  const setItem = (path: string[], key: 'open' | 'current' | 'alternateTree', next: boolean) => {\n    const value = getItem(path);\n    value[key] = next;\n\n    localStorage.setItem(KEY, JSON.stringify(Array.from(state.entries())));\n  };\n\n  const isOpen = (path: string[]) => getItem(path).open;\n  const isCurrent = (path: string[]) => getItem(path).current;\n  const isAlternateTree = (path: string[]) => {\n    const item = getItem(path);\n    return item.alternateTree ?? false;\n  };\n\n  let previous: string[] = [];\n  const unsubscribe = effect(() => {\n    const removed = previous.filter((id) => !layout.active.includes(id));\n    previous = layout.active;\n\n    // TODO(wittjosiah): This is setTimeout because there's a race between the keys be initialized.\n    //   This could be avoided if the location was a path as well and not just an id.\n    setTimeout(() => {\n      removed.forEach((id) => {\n        const keys = Array.from(state.keys()).filter((key) => Path.last(key) === id);\n        keys.forEach((key) => {\n          setItem(Path.parts(key), 'current', false);\n        });\n      });\n\n      layout.active.forEach((id) => {\n        const keys = Array.from(new Set([...state.keys(), id])).filter((key) => Path.last(key) === id);\n        keys.forEach((key) => {\n          setItem(Path.parts(key), 'current', true);\n        });\n      });\n    });\n  });\n\n  return contributes(NavTreeCapabilities.State, { state, getItem, setItem, isOpen, isCurrent, isAlternateTree }, () =>\n    unsubscribe(),\n  );\n};\n"],
+  "mappings": "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",
+  "names": ["effect", "Capabilities", "contributes", "Obj", "Path", "KEY", "NAVTREE_PLUGIN", "getInitialState", "stringified", "localStorage", "getItem", "cached", "JSON", "parse", "map", "key", "value", "Obj", "make", "open", "current", "context", "layout", "getCapability", "Capabilities", "Layout", "state", "Map", "_path", "path", "Path", "create", "get", "alternateTree", "has", "set", "setItem", "next", "stringify", "Array", "from", "entries", "isOpen", "isCurrent", "isAlternateTree", "item", "previous", "unsubscribe", "effect", "removed", "filter", "id", "active", "includes", "setTimeout", "forEach", "keys", "last", "parts", "Set", "contributes", "NavTreeCapabilities", "State"]
+}

package/dist/types/src/capabilities/state.d.ts

@@ -1,5 +1,5 @@
 import { type PluginContext } from '@dxos/app-framework';
-import { type Live } from '@dxos/live-object';
+import { type Live } from '@dxos/echo';
 declare const _default: (context: PluginContext) => import("@dxos/app-framework").Capability<{
     state: Map<string, Live<{
         open: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../src/capabilities/state.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,KAAK,IAAI,EAAQ,MAAM,mBAAmB,CAAC;yBA4BpC,SAAS,aAAa;;;;qBAtBR,CAAC;;;;;qBAIvB,CAAC;;;;;;;AAkBT,wBAmEE"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../src/capabilities/state.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,KAAK,IAAI,EAAO,MAAM,YAAY,CAAC;yBAuB5B,SAAS,aAAa;;;;qBAjBA,CAAC;;;;;qBAIvB,CAAC;;;;;;;AAajB,wBAmEE"}

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

@@ -1 +1 @@
-{"version":3,"file":"NavTreeContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/NavTreeContainer.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAgD,MAAM,OAAO,CAAC;AAsBrE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAOnD,eAAO,MAAM,SAAS,wBAAwB,CAAC;AAgC/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;AAErC,eAAO,MAAM,gBAAgB,+DAA2C,qBAAqB,uBA2P3F,CAAC"}
+{"version":3,"file":"NavTreeContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/NavTreeContainer.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAgD,MAAM,OAAO,CAAC;AAuBrE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAOnD,eAAO,MAAM,SAAS,wBAAwB,CAAC;AAgC/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;AAErC,eAAO,MAAM,gBAAgB,+DAA2C,qBAAqB,uBA2P3F,CAAC"}

package/dist/types/src/testing/generator.d.ts

@@ -1,5 +1,5 @@
 import { Schema } from 'effect';
-import { type Live } from '@dxos/live-object';
+import { type Live } from '@dxos/echo';
 export type TestItem = {
     id: string;
     type: string;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/testing/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAQ,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAQpD,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE1E,KAAK,mBAAmB,GAAG;IACzB,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAChD,UAAU,EAAE,MAAM,GAAG,CAAC;CACvB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,IAAI;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAW/D,eAAO,MAAM,MAAM,UAAgC,CAAC;AACpD,eAAO,MAAM,QAAQ,UAAkB,CAAC;AAExC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAgCpE,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,SAAgB,SAAS,EAAE,gBAAgB,CAAC;gBAEhC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,gBAAgB,CAAA;KAAO;IASzF,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAEzC;IAED,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO;IAMjD,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAGtE;AAeD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+EtB,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/testing/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,KAAK,IAAI,EAAO,MAAM,YAAY,CAAC;AAS5C,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE1E,KAAK,mBAAmB,GAAG;IACzB,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAChD,UAAU,EAAE,MAAM,GAAG,CAAC;CACvB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,IAAI;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAW/D,eAAO,MAAM,MAAM,UAAgC,CAAC;AACpD,eAAO,MAAM,QAAQ,UAAkB,CAAC;AAExC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAmCpE,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,SAAgB,SAAS,EAAE,gBAAgB,CAAC;gBAEhC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,gBAAgB,CAAA;KAAO;IASzF,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAEzC;IAED,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO;IAMjD,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAGtE;AAeD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+EtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-navtree",
-  "version": "0.8.3-main.672df60",
+  "version": "0.8.3-main.7f5a14c",
   "description": "DXOS Surface plugin for a tree view visualization of the graph.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,29 +31,29 @@
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "date-fns": "^3.3.1",
     "effect": "^3.13.3",
-    "@dxos/app-framework": "0.8.3-main.672df60",
-    "@dxos/async": "0.8.3-main.672df60",
-    "@dxos/debug": "0.8.3-main.672df60",
-    "@dxos/app-graph": "0.8.3-main.672df60",
-    "@dxos/echo": "0.8.3-main.672df60",
-    "@dxos/echo-schema": "0.8.3-main.672df60",
-    "@dxos/invariant": "0.8.3-main.672df60",
-    "@dxos/keyboard": "0.8.3-main.672df60",
-    "@dxos/live-object": "0.8.3-main.672df60",
-    "@dxos/local-storage": "0.8.3-main.672df60",
-    "@dxos/log": "0.8.3-main.672df60",
-    "@dxos/plugin-graph": "0.8.3-main.672df60",
-    "@dxos/plugin-deck": "0.8.3-main.672df60",
-    "@dxos/plugin-observability": "0.8.3-main.672df60",
-    "@dxos/protocols": "0.8.3-main.672df60",
-    "@dxos/react-client": "0.8.3-main.672df60",
-    "@dxos/react-ui-list": "0.8.3-main.672df60",
-    "@dxos/react-ui-attention": "0.8.3-main.672df60",
-    "@dxos/react-ui-menu": "0.8.3-main.672df60",
-    "@dxos/react-ui-searchlist": "0.8.3-main.672df60",
-    "@dxos/react-ui-stack": "0.8.3-main.672df60",
-    "@dxos/react-ui-tabs": "0.8.3-main.672df60",
-    "@dxos/util": "0.8.3-main.672df60"
+    "@dxos/app-graph": "0.8.3-main.7f5a14c",
+    "@dxos/async": "0.8.3-main.7f5a14c",
+    "@dxos/app-framework": "0.8.3-main.7f5a14c",
+    "@dxos/debug": "0.8.3-main.7f5a14c",
+    "@dxos/echo": "0.8.3-main.7f5a14c",
+    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
+    "@dxos/invariant": "0.8.3-main.7f5a14c",
+    "@dxos/keyboard": "0.8.3-main.7f5a14c",
+    "@dxos/local-storage": "0.8.3-main.7f5a14c",
+    "@dxos/live-object": "0.8.3-main.7f5a14c",
+    "@dxos/log": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-deck": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-graph": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-observability": "0.8.3-main.7f5a14c",
+    "@dxos/protocols": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-attention": "0.8.3-main.7f5a14c",
+    "@dxos/react-client": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-menu": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-list": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-searchlist": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-stack": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-tabs": "0.8.3-main.7f5a14c",
+    "@dxos/util": "0.8.3-main.7f5a14c"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -64,14 +64,14 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-signals": "0.8.3-main.672df60",
-    "@dxos/plugin-storybook-layout": "0.8.3-main.672df60",
-    "@dxos/plugin-theme": "0.8.3-main.672df60",
-    "@dxos/plugin-attention": "0.8.3-main.672df60",
-    "@dxos/storybook-utils": "0.8.3-main.672df60",
-    "@dxos/react-ui-theme": "0.8.3-main.672df60",
-    "@dxos/react-ui": "0.8.3-main.672df60",
-    "@dxos/random": "0.8.3-main.672df60"
+    "@dxos/echo-signals": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-storybook-layout": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-theme": "0.8.3-main.7f5a14c",
+    "@dxos/random": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-attention": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c",
+    "@dxos/storybook-utils": "0.8.3-main.7f5a14c"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -80,8 +80,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3-main.672df60",
-    "@dxos/react-ui-theme": "0.8.3-main.672df60"
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/state.ts

@@ -5,7 +5,7 @@
 import { effect } from '@preact/signals-core';
 
 import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
-import { type Live, live } from '@dxos/live-object';
+import { type Live, Obj } from '@dxos/echo';
 import { Path } from '@dxos/react-ui-list';
 
 import { NavTreeCapabilities } from './capabilities';
@@ -21,15 +21,10 @@ const getInitialState = () => {
 
   try {
     const cached: [string, { open: boolean; current: boolean }][] = JSON.parse(stringified);
-    return cached.map(
-      ([key, value]): [
-        string,
-        Live<{
-          open: boolean;
-          current: boolean;
-        }>,
-      ] => [key, live({ open: value.open, current: false })],
-    );
+    return cached.map(([key, value]): [string, Live<{ open: boolean; current: boolean }>] => [
+      key,
+      Obj.make({ open: value.open, current: false }),
+    ]);
   } catch {}
 };
 
@@ -43,15 +38,15 @@ export default (context: PluginContext) => {
   const state = new Map<string, Live<{ open: boolean; current: boolean; alternateTree?: boolean }>>(
     getInitialState() ?? [
       // TODO(thure): Initialize these dynamically.
-      ['root', live({ open: true, current: false })],
-      ['root~dxos.org/plugin/space-spaces', live({ open: true, current: false })],
-      ['root~dxos.org/plugin/files', live({ open: true, current: false })],
+      ['root', Obj.make({ open: true, current: false })],
+      ['root~dxos.org/plugin/space-spaces', Obj.make({ open: true, current: false })],
+      ['root~dxos.org/plugin/files', Obj.make({ open: true, current: false })],
     ],
   );
 
   const getItem = (_path: string[]) => {
     const path = Path.create(..._path);
-    const value = state.get(path) ?? live({ open: false, current: false, alternateTree: false });
+    const value = state.get(path) ?? Obj.make({ open: false, current: false, alternateTree: false });
     if (!state.has(path)) {
       state.set(path, value);
     }

package/src/components/NavTree/NavTree.stories.tsx

@@ -19,7 +19,7 @@ import {
   useCapability,
 } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { live } from '@dxos/live-object';
+import { Obj } from '@dxos/echo';
 import { AttentionPlugin } from '@dxos/plugin-attention';
 import { GraphPlugin } from '@dxos/plugin-graph';
 import { StorybookLayoutPlugin } from '@dxos/plugin-storybook-layout';
@@ -76,7 +76,7 @@ const StoryPlank = ({ attendableId }: { attendableId: string }) => {
     >
       <StoryPlankHeading attendableId={attendableId} />
       <StackItem.Content toolbar>
-        <Toolbar.Root classNames='border-b border-separator'>
+        <Toolbar.Root classNames='border-b border-subduedSeparator'>
           <Toolbar.Button>Test</Toolbar.Button>
         </Toolbar.Root>
 
@@ -130,7 +130,7 @@ const meta: Meta<typeof NavTreeContainer> = {
         NavTreePlugin(),
       ],
       capabilities: (context) => [
-        contributes(StoryState, live({ tab: 'space-0' })),
+        contributes(StoryState, Obj.make({ tab: 'space-0' })),
         contributes(Capabilities.AppGraphBuilder, storybookGraphBuilders),
         contributes(Capabilities.IntentResolver, [
           createResolver({

package/src/components/NavTreeContainer.tsx

@@ -16,12 +16,13 @@ import {
   useIntentDispatcher,
   useLayout,
 } from '@dxos/app-framework';
-import { isAction, isActionLike, type ReadableGraph, ROOT_ID, type Node } from '@dxos/app-graph';
+import { isAction, isActionLike, ROOT_ID, type Node, type ReadableGraph } from '@dxos/app-graph';
+import { Obj } from '@dxos/echo';
 import { PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { useConnections } from '@dxos/plugin-graph';
-import { isEchoObject, isSpace } from '@dxos/react-client/echo';
+import { isSpace } from '@dxos/react-client/echo';
 import { useMediaQuery, useSidebars } from '@dxos/react-ui';
-import { isTreeData, type TreeData, type PropsFromTreeItem } from '@dxos/react-ui-list';
+import { isTreeData, type PropsFromTreeItem, type TreeData } from '@dxos/react-ui-list';
 import { mx } from '@dxos/react-ui-theme';
 import { arrayMove, byPosition } from '@dxos/util';
 
@@ -31,7 +32,7 @@ import { type NavTreeContextValue } from './types';
 import { NavTreeCapabilities } from '../capabilities';
 import { NAVTREE_PLUGIN } from '../meta';
 import { type NavTreeItemGraphNode } from '../types';
-import { getActions as naturalGetActions, getChildren, getParent, resolveMigrationOperation } from '../util';
+import { getChildren, getParent, getActions as naturalGetActions, resolveMigrationOperation } from '../util';
 
 // TODO(thure): Is NavTree truly authoritative in this regard?
 export const NODE_TYPE = 'dxos/app-graph/node';
@@ -157,9 +158,9 @@ export const NavTreeContainer = memo(({ tab, popoverAnchorId, topbar }: NavTreeC
     // TODO(wittjosiah): This shouldn't depend directly on client, there should be a graph-level abstraction.
     if (isSpace(targetNode.data)) {
       // TODO(wittjosiah): Find a way to only allow space as source for rearranging.
-      return isEchoObject(sourceNode.data) || isSpace(sourceNode.data);
-    } else if (isEchoObject(targetNode.data)) {
-      return isEchoObject(sourceNode.data);
+      return Obj.isObject(sourceNode.data) || isSpace(sourceNode.data);
+    } else if (Obj.isObject(targetNode.data)) {
+      return Obj.isObject(sourceNode.data);
     } else {
       return false;
     }

package/src/testing/generator.ts

@@ -5,8 +5,8 @@
 import { Schema } from 'effect';
 
 import { type NodeArg } from '@dxos/app-graph';
+import { type Live, Obj } from '@dxos/echo';
 import { TypedObject } from '@dxos/echo-schema';
-import { live, type Live } from '@dxos/live-object';
 import { faker } from '@dxos/random';
 import { range } from '@dxos/util';
 
@@ -32,7 +32,7 @@ const createFactory = ({ createSchema, createData }: ObjectDataGenerator) => {
   const schema = createSchema?.();
   return {
     schema,
-    createObject: () => (schema ? live(schema, createData()) : live(createData())),
+    createObject: () => (schema ? Obj.make(schema, createData()) : Obj.make(createData())),
   };
 };
 
@@ -58,7 +58,10 @@ export const defaultGenerators: { [type: string]: ObjectDataGenerator } = {
 
   project: {
     createSchema: () =>
-      class ProjectType extends TypedObject({ typename: 'example.com/type/Project', version: '0.1.0' })({
+      class ProjectType extends TypedObject({
+        typename: 'example.com/type/Project',
+        version: '0.1.0',
+      })({
         title: Schema.String,
         repo: Schema.String,
         status: Schema.String,