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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-simple-layout",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "Simple layout plugin for minimal UI contexts like popover windows.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,14 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -31,45 +39,47 @@
     "@radix-ui/react-context": "1.1.1",
     "@tauri-apps/plugin-deep-link": "^2.2.0",
     "@tauri-apps/plugin-haptics": "^2.3.2",
-    "@dxos/async": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
-    "@dxos/log": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-graph": "0.8.4-main.c85a9c8dae",
-    "@dxos/operation": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-attention": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-menu": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-searchlist": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-mosaic": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-stack": "0.8.4-main.c85a9c8dae",
-    "@dxos/schema": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae"
+    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/async": "0.8.4-main.fcfe5033a5",
+    "@dxos/context": "0.8.4-main.fcfe5033a5",
+    "@dxos/effect": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/log": "0.8.4-main.fcfe5033a5",
+    "@dxos/operation": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-menu": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-search": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
+    "@dxos/schema": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-stack": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "^7.1.11",
-    "@dxos/plugin-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-search": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-graph": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-space": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-testing": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-preview": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
-    "@dxos/schema": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "@dxos/app-graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-preview": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-search": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-space": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-testing": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5",
+    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
+    "@dxos/schema": "0.8.4-main.fcfe5033a5"
   },
   "peerDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae"
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/SimpleLayoutPlugin.ts

@@ -5,23 +5,33 @@
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 
-import { OperationResolver, ReactRoot, ReactSurface, SpotlightDismiss, State, UrlHandler } from './capabilities';
-import { meta } from './meta';
+import {
+  AppGraphBuilder,
+  OperationHandler,
+  ReactRoot,
+  ReactSurface,
+  SpotlightDismiss,
+  State,
+  UrlHandler,
+} from '#capabilities';
+import { meta } from '#meta';
+import { SimpleLayoutEvents } from '#types';
+
 import { translations } from './translations';
-import { SimpleLayoutEvents } from './types';
 
 export type SimpleLayoutPluginOptions = {
-  /** Whether running in popover window context (hides mobile-specific UI). */
+  /** Determines if running in popover window context (hides mobile-specific UI). */
   isPopover?: boolean;
 };
 
 export const SimpleLayoutPlugin = Plugin.define<SimpleLayoutPluginOptions>(meta).pipe(
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule(({ isPopover = false }) => ({
     id: Capability.getModuleTag(State),
     activatesOn: ActivationEvents.Startup,
-    activatesAfter: [SimpleLayoutEvents.StateReady, AppActivationEvents.LayoutReady],
+    firesAfterActivation: [SimpleLayoutEvents.StateReady, AppActivationEvents.LayoutReady],
     activate: () => State({ initialState: { isPopover } }),
   })),
   Plugin.addModule(({ isPopover = false }) => ({

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

@@ -0,0 +1,21 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* GraphBuilder.createExtension({
+      id: 'org.dxos.plugin.simple-layout.not-found',
+      match: NodeMatcher.whenRoot,
+      connector: () => Effect.succeed([AppNode.makeNotFound()]),
+    });
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/index.ts

@@ -2,9 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './operation-resolver';
-export * from './react-root';
-export * from './react-surface';
-export * from './spotlight-dismiss';
-export * from './state';
-export * from './url-handler';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactRoot = Capability.lazy('ReactRoot', () => import('./react-root'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const SpotlightDismiss = Capability.lazy('SpotlightDismiss', () => import('./spotlight-dismiss'));
+export const State = Capability.lazy('State', () => import('./state'));
+export const UrlHandler = Capability.lazy('UrlHandler', () => import('./url-handler'));

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,14 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { SimpleLayoutOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, SimpleLayoutOperationHandlerSet);
+  }),
+);

package/src/capabilities/{react-root/react-root.tsx → react-root.tsx}

@@ -7,8 +7,8 @@ import React from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 
-import { SimpleLayout } from '../../components';
-import { meta } from '../../meta';
+import { SimpleLayout } from '#components';
+import { meta } from '#meta';
 
 export default Capability.makeModule(() =>
   Effect.succeed(

package/src/capabilities/{react-surface/react-surface.tsx → react-surface.tsx}

@@ -7,10 +7,11 @@ import React from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface } from '@dxos/app-framework/ui';
+import { NOT_FOUND_PATH } from '@dxos/app-toolkit';
+import { NotFoundArticle } from '@dxos/app-toolkit/ui';
 import { Node } from '@dxos/plugin-graph';
 
-import { Home, Workspace } from '../../components';
-import { meta } from '../../meta';
+import { Home, NavBranch } from '#components';
 
 type SurfaceData = {
   attendableId: string;
@@ -23,18 +24,26 @@ export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: `${meta.id}/home`,
+        id: 'home',
         role: 'article',
         filter: (data): data is SurfaceData => data.attendableId === Node.RootId,
         component: () => <Home />,
       }),
       Surface.create({
-        id: `${meta.id}/workspace-article`,
+        id: 'not-found',
+        role: 'article',
+        filter: (data): data is SurfaceData => data.attendableId === NOT_FOUND_PATH,
+        component: () => <NotFoundArticle />,
+      }),
+      Surface.create({
+        id: 'nav-branch',
         role: 'article',
         position: 'fallback',
-        filter: (data): data is SurfaceData =>
-          ALLOWED_DISPOSITIONS.includes((data.properties as Record<string, any>)?.disposition),
-        component: ({ data }) => <Workspace id={data.attendableId} />,
+        filter: (data): data is SurfaceData => {
+          const props = data.properties as Record<string, any>;
+          return ALLOWED_DISPOSITIONS.includes(props?.disposition) || props?.role === 'branch';
+        },
+        component: ({ data }) => <NavBranch id={data.attendableId} />,
       }),
     ]),
   ),

package/src/capabilities/{state/state.tsx → state.tsx}

@@ -9,8 +9,8 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Node } from '@dxos/plugin-graph';
 
-import { type SimpleLayoutState } from '../../types';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '../../types';
+import { type SimpleLayoutState } from '#types';
+import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
 
 const defaultState: SimpleLayoutState = {
   dialogOpen: false,

package/src/capabilities/url-handler.ts

@@ -0,0 +1,161 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation, fromUrlPath, getWorkspaceFromPath, toUrlPath } from '@dxos/app-toolkit';
+import { runAndForwardErrors } from '@dxos/effect';
+import { log } from '@dxos/log';
+import { isTauri } from '@dxos/util';
+
+import { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+
+/**
+ * URL handler for simple layout that syncs browser URL with layout state.
+ * URL paths map directly to qualified graph IDs with the leading `root` segment stripped.
+ * Root is represented as `/`.
+ *
+ * On Tauri, also listens for deep links via the deep-link plugin.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const { invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
+    const capabilities = yield* Capability.Service;
+
+    /** Dispatch all NavigationHandler contributions with a given URL. */
+    const dispatchNavigationHandlers = (url: URL) =>
+      Effect.gen(function* () {
+        const handlers = yield* Capability.getAll(AppCapabilities.NavigationHandler);
+        yield* Effect.all(
+          handlers.map((handler) => handler(url)),
+          { concurrency: 'unbounded' },
+        );
+      }).pipe(Effect.provideService(Capability.Service, capabilities), runAndForwardErrors);
+
+    /**
+     * Handle navigation from a URL.
+     * Dispatches to NavigationHandler contributions, then handles pathname routing.
+     */
+    const handlePathNavigation = (url?: URL) => {
+      const resolvedUrl = url ?? new URL(window.location.href);
+      void dispatchNavigationHandlers(resolvedUrl);
+
+      let pathname = resolvedUrl.pathname;
+      if (isFilePath(pathname)) {
+        log.info('[UrlHandler] Skipping file path (not a graph node)', { pathname });
+        pathname = '/';
+      }
+
+      const qualifiedId = fromUrlPath(pathname);
+      const workspace = getWorkspaceFromPath(qualifiedId);
+
+      void invokePromise(LayoutOperation.SwitchWorkspace, { subject: workspace });
+
+      const activeId = qualifiedId !== workspace ? qualifiedId : undefined;
+      if (activeId) {
+        void invokePromise(LayoutOperation.Open, { subject: [activeId] });
+      }
+    };
+
+    const onPopState = () => {
+      handlePathNavigation();
+    };
+
+    // Initial navigation.
+    yield* Effect.sync(() => handlePathNavigation());
+    window.addEventListener('popstate', onPopState);
+
+    // Tauri deep link support.
+    let unlistenDeepLink: (() => void) | undefined;
+    if (isTauri()) {
+      yield* Effect.tryPromise({
+        try: async () => {
+          const { getCurrent, onOpenUrl } = await import('@tauri-apps/plugin-deep-link');
+
+          const launchUrls = await getCurrent();
+          if (launchUrls && launchUrls.length > 0) {
+            log.info('[UrlHandler] App launched with deep links', { urls: launchUrls });
+            for (const urlString of launchUrls) {
+              handleDeepLink(urlString, handlePathNavigation);
+            }
+          }
+
+          unlistenDeepLink = await onOpenUrl((urls) => {
+            log.info('[UrlHandler] Deep links received', { urls });
+            for (const urlString of urls) {
+              handleDeepLink(urlString, handlePathNavigation);
+            }
+          });
+        },
+        catch: (error) => {
+          log.warn('[UrlHandler] Failed to initialize deep link listener', { error });
+          return error;
+        },
+      }).pipe(Effect.catchAll(() => Effect.void));
+    }
+
+    // Sync URL with layout state changes.
+    let lastWorkspace: string | undefined;
+    let lastActive: string | undefined;
+    const unsubscribe = yield* Capabilities.subscribeAtom(SimpleLayoutStateCapability, (state: SimpleLayoutState) => {
+      const { workspace, active } = state;
+
+      if (workspace !== lastWorkspace || active !== lastActive) {
+        lastWorkspace = workspace;
+        lastActive = active;
+
+        const path = active ? toUrlPath(active) : toUrlPath(workspace);
+        if (window.location.pathname !== path) {
+          history.pushState(null, '', `${path}${window.location.search}`);
+        }
+      }
+    });
+
+    return Capability.contributes(Capabilities.Null, null, () =>
+      Effect.sync(() => {
+        window.removeEventListener('popstate', onPopState);
+        unsubscribe();
+        unlistenDeepLink?.();
+      }),
+    );
+  }),
+);
+
+/** Check if a path is a redirect path handled elsewhere (e.g., OAuth). */
+const isRedirectPath = (pathname: string): boolean => pathname.startsWith('/redirect/');
+
+/** Paths with file extensions are not graph node paths. */
+const isFilePath = (pathname: string): boolean => /\.[a-z]+$/i.test(pathname);
+
+/** Handle a deep link URL string. Merges query params into window.location and navigates. */
+const handleDeepLink = (urlString: string, navigate: (url?: URL) => void): void => {
+  log.info('[UrlHandler] Deep link received', { url: urlString });
+  try {
+    const deepLinkUrl = new URL(urlString);
+
+    // For custom schemes (e.g., composer://a/b/c), new URL() treats the first segment as the
+    // hostname. Reconstruct the full path from hostname + pathname.
+    const fullPath =
+      deepLinkUrl.protocol !== 'https:' && deepLinkUrl.protocol !== 'http:' && deepLinkUrl.hostname
+        ? '/' + deepLinkUrl.hostname + deepLinkUrl.pathname
+        : deepLinkUrl.pathname;
+
+    if (isRedirectPath(fullPath)) {
+      return;
+    }
+
+    // Merge deep link query params into the current window URL so handlers can read them.
+    const current = new URL(window.location.href);
+    if (deepLinkUrl.search) {
+      deepLinkUrl.searchParams.forEach((value, key) => current.searchParams.set(key, value));
+    }
+    current.pathname = fullPath;
+    history.replaceState(null, '', current.pathname + current.search);
+
+    navigate(current);
+  } catch (error) {
+    log.warn('[UrlHandler] Failed to parse deep link URL', { urlString, error });
+  }
+};

package/src/components/DebugOverlay/DebugOverlay.tsx

@@ -0,0 +1,96 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { createContext } from '@radix-ui/react-context';
+import React, { type PropsWithChildren, useCallback, useRef } from 'react';
+
+const DEBUG_OVERLAY_NAME = 'DebugOverlay';
+
+//
+// Context
+//
+
+type DebugOverlayContextValue = {
+  /** Log a timestamped message to the on-screen debug overlay. */
+  dbg: (msg: string) => void;
+};
+
+// Default to a no-op so hooks can call useDebugLog() safely outside of a provider.
+const [DebugOverlayProvider, useDebugLog] = createContext<DebugOverlayContextValue>(DEBUG_OVERLAY_NAME, {
+  dbg: () => {},
+});
+
+//
+// Root
+//
+
+type DebugOverlayRootProps = PropsWithChildren<{
+  /**
+   * When true (default), renders the on-screen log panel.
+   * Set to false to suppress the overlay while keeping the context available.
+   */
+  enabled?: boolean;
+  maxLines?: number;
+}>;
+
+/**
+ * Establishes a debug overlay context.
+ *
+ * When enabled, renders an on-screen monospaced log panel anchored just above
+ * the keyboard (via --kb-height CSS variable). Descendants can call
+ * useDebugLog() to obtain the dbg() function for logging.
+ *
+ * Intended for transient mobile debugging in the iOS Simulator where DevTools
+ * console output may not be accessible.
+ */
+const DebugOverlayRoot = ({ children, enabled = true, maxLines = 10 }: DebugOverlayRootProps) => {
+  const overlayRef = useRef<HTMLDivElement>(null);
+
+  const dbg = useCallback((msg: string) => {
+    if (!overlayRef.current) {
+      return;
+    }
+    const line = document.createElement('pre');
+    line.textContent = `${(performance.now() / 1000).toFixed(2).padStart(8, ' ')} ${msg}`;
+    overlayRef.current.prepend(line);
+    while (overlayRef.current.children.length > maxLines) {
+      overlayRef.current.lastChild?.remove();
+    }
+  }, []);
+
+  return (
+    <DebugOverlayProvider dbg={dbg}>
+      {children}
+      {enabled && (
+        <div
+          ref={overlayRef}
+          style={{
+            position: 'fixed',
+            bottom: 'calc(var(--kb-height, 0px) + 8px)',
+            left: 8,
+            right: 8,
+            background: 'rgba(0,0,0,0.8)',
+            color: '#0f0',
+            fontSize: 10,
+            fontFamily: 'monospace',
+            padding: 6,
+            borderRadius: 4,
+            zIndex: 9999,
+            pointerEvents: 'none',
+          }}
+        />
+      )}
+    </DebugOverlayProvider>
+  );
+};
+
+//
+// Exports
+//
+
+export const DebugOverlay = {
+  Root: DebugOverlayRoot,
+};
+
+export { useDebugLog };

package/src/components/DebugOverlay/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { DebugOverlay, useDebugLog } from './DebugOverlay';

package/src/components/Dialog/Dialog.tsx

@@ -5,10 +5,11 @@
 import React from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { AlertDialog, Dialog as NaturalDialog } from '@dxos/react-ui';
 import { ErrorFallback } from '@dxos/react-ui';
 
-import { useSimpleLayoutState } from '../../hooks';
+import { useSimpleLayoutState } from '#hooks';
 
 export const Dialog = () => {
   const { state, updateState } = useSimpleLayoutState();
@@ -23,14 +24,24 @@ export const Dialog = () => {
       onOpenChange={(nextOpen) => updateState((state) => ({ ...state, dialogOpen: nextOpen }))}
     >
       {state.dialogBlockAlign === 'end' ? (
-        <Surface.Surface role='dialog' data={state.dialogContent} limit={1} fallback={ErrorFallback} />
+        <Surface.Surface
+          type={AppSurface.Dialog}
+          data={state.dialogContent ?? undefined}
+          limit={1}
+          fallback={ErrorFallback}
+        />
       ) : (
         <DialogOverlay
           blockAlign={state.dialogBlockAlign}
           classNames={state.dialogOverlayClasses}
           style={state.dialogOverlayStyle}
         >
-          <Surface.Surface role='dialog' data={state.dialogContent} limit={1} fallback={ErrorFallback} />
+          <Surface.Surface
+            type={AppSurface.Dialog}
+            data={state.dialogContent ?? undefined}
+            limit={1}
+            fallback={ErrorFallback}
+          />
         </DialogOverlay>
       )}
     </DialogRoot>