@dxos/plugin-stack 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-stack",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "DXOS Surface plugin for Stack entities",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,63 +8,90 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": "./src/StackPlugin.ts",
+      "types": "./dist/types/src/StackPlugin.d.ts",
+      "default": "./dist/lib/neutral/StackPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
-    "src"
+    "src",
+    "PLUGIN.mdl"
   ],
   "dependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-collapsible": "1.1.3",
-    "effect": "3.19.16",
-    "node-fetch": "^2.6.0",
-    "react-is": "~19.2.0",
-    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/async": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-atom": "0.8.4-main.c85a9c8dae",
-    "@dxos/client": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo": "0.8.4-main.c85a9c8dae",
-    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/operation": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-deck": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-graph": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-space": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-form": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-attention": "0.8.4-main.c85a9c8dae",
-    "@dxos/types": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-searchlist": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-stack": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae",
-    "@dxos/schema": "0.8.4-main.c85a9c8dae"
+    "effect": "3.21.2",
+    "@dxos/app-framework": "0.8.4-main.d9fc60f731",
+    "@dxos/echo-atom": "0.8.4-main.d9fc60f731",
+    "@dxos/app-toolkit": "0.8.4-main.d9fc60f731",
+    "@dxos/invariant": "0.8.4-main.d9fc60f731",
+    "@dxos/echo": "0.8.4-main.d9fc60f731",
+    "@dxos/keys": "0.8.4-main.d9fc60f731",
+    "@dxos/operation": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-client": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-deck": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-form": "0.8.4-main.d9fc60f731",
+    "@dxos/util": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-stack": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-space": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-attention": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-graph": "0.8.4-main.d9fc60f731"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
@@ -72,18 +99,19 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "vite": "^8.0.14",
+    "@dxos/plugin-testing": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731",
+    "@dxos/storybook-utils": "0.8.4-main.d9fc60f731"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "effect": "3.19.16",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731"
   },
   "publishConfig": {
     "access": "public"

package/src/StackPlugin.ts

@@ -4,33 +4,23 @@
 
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { type Obj } from '@dxos/echo';
 
-import { ReactSurface } from './capabilities';
-import { SECTION_IDENTIFIER, meta } from './meta';
-import { translations } from './translations';
-import { StackViewType } from './types';
+import { ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { StackViewType } from '#types';
+
+// eslint-disable-next-line import/no-relative-packages
+import pluginSpec from '../PLUGIN.mdl?raw';
 
 export const StackPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: SECTION_IDENTIFIER,
-      metadata: {
-        parse: (section: { object: Obj.Unknown }, type: string) => {
-          switch (type) {
-            case 'node':
-              return { id: section.object.id, label: (section.object as any).title, data: section.object };
-            case 'object':
-              return section.object;
-            case 'view-object':
-              return section;
-          }
-        },
-      },
-    },
-  }),
   AppPlugin.addSchemaModule({ schema: [StackViewType] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
+  AppPlugin.addPluginAssetModule({
+    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+  }),
   Plugin.make,
 );
+
+export default StackPlugin;

package/src/capabilities/index.ts

@@ -2,4 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,28 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Collection } from '@dxos/echo';
+
+import { StackArticle } from '#containers';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(
+      Capabilities.ReactSurface,
+      Surface.create({
+        id: 'article',
+        filter: AppSurface.object(AppSurface.Article, Collection.Collection),
+        component: ({ role, data }) => {
+          return <StackArticle attendableId={data.attendableId} role={role} subject={data.subject} />;
+        },
+      }),
+    ),
+  ),
+);

package/src/components/{StackContext.tsx → StackContext/StackContext.tsx}

@@ -4,9 +4,10 @@
 
 import { createContext, useContext } from 'react';
 
-import { type AddSectionPosition } from '../types';
+import { type AddSectionPosition } from '#types';
 
 export type StackContextValue = {
+  attendableId: string;
   onCollapse: (id: string, collapsed: boolean) => void;
   onNavigate: (id: string) => Promise<void>;
   onDelete: (id: string) => Promise<void>;
@@ -14,6 +15,7 @@ export type StackContextValue = {
 };
 
 export const StackContext = createContext<StackContextValue>({
+  attendableId: '',
   onCollapse: () => {},
   onNavigate: async () => {},
   onDelete: async () => {},

package/src/components/StackContext/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './StackContext';

package/src/components/{StackSection.tsx → StackSection/StackSection.tsx}

@@ -6,16 +6,17 @@ import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
 import React, { useMemo, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { DropdownMenu, Icon, IconButton, useTranslation } from '@dxos/react-ui';
 import { useAttentionAttributes } from '@dxos/react-ui-attention';
 import { StackItem } from '@dxos/react-ui-stack';
-import { getSize, mx, textBlockWidth } from '@dxos/ui-theme';
+import { getSize, mx } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
-import { type StackSectionItem } from '../types';
+import { meta } from '#meta';
+import { type StackSectionItem } from '#types';
 
+import { useStack } from '../StackContext';
 import { CaretDownUp } from './CaretDownUp';
-import { useStack } from './StackContext';
 
 const sectionActionDimensions = 'p-1 my-1 shrink-0 min-h-0 w-(--dx-rail-action) h-min';
 
@@ -25,13 +26,15 @@ export const StackSection = ({
   id,
   view,
   object,
-  metadata: { icon = 'ph--placeholder--regular' },
+  metadata: { icon = 'ph--circle-dashed--regular' },
 }: StackSectionProps) => {
   const { t } = useTranslation(meta.id);
-  const { onNavigate, onAdd, onCollapse, onDelete } = useStack();
+  const { attendableId: parentAttendableId, onNavigate, onAdd, onCollapse, onDelete } = useStack();
   const [optionsMenuOpen, setOptionsMenuOpen] = useState(false);
-  const attentionAttrs = useAttentionAttributes(id);
+  const attendableId = `${parentAttendableId}/${object.id}`;
+  const attentionAttrs = useAttentionAttributes(attendableId);
   const stackItem = useMemo(() => ({ id }), [id]);
+  const data = useMemo(() => ({ attendableId, subject: object }), [object, attendableId]);
 
   return (
     <CollapsiblePrimitive.Root asChild open={!view.collapsed} onOpenChange={(nextOpen) => onCollapse?.(id, !nextOpen)}>
@@ -47,7 +50,7 @@ export const StackSection = ({
             >
               <DropdownMenu.Trigger asChild>
                 <StackItem.SigilButton>
-                  <Icon icon={icon} size={5} classNames='transition-opacity' />
+                  <Icon icon={icon} classNames='transition-opacity' />
                 </StackItem.SigilButton>
               </DropdownMenu.Trigger>
               <DropdownMenu.Portal>
@@ -55,28 +58,28 @@ export const StackSection = ({
                   <DropdownMenu.Viewport>
                     {view.collapsed ? (
                       <DropdownMenu.Item onClick={() => onNavigate(id)} data-testid='section.navigate-to'>
-                        <Icon icon='ph--arrow-right--regular' size={5} />
-                        <span className='ms-2 grow'>{t('navigate to section label')}</span>
+                        <Icon icon='ph--arrow-right--regular' />
+                        <span className='ms-2 grow'>{t('navigate-to-section.label')}</span>
                       </DropdownMenu.Item>
                     ) : (
                       <CollapsiblePrimitive.Trigger asChild>
                         <DropdownMenu.Item>
                           <CaretDownUp className={getSize(5)} />
-                          <span className='ms-2 grow'>{t('collapse label')}</span>
+                          <span className='ms-2 grow'>{t('collapse.label')}</span>
                         </DropdownMenu.Item>
                       </CollapsiblePrimitive.Trigger>
                     )}
                     <DropdownMenu.Item onClick={() => onAdd(id, 'before')} data-testid='section.add-before'>
-                      <Icon icon='ph--arrow-line-up--regular' size={5} />
-                      <span className='ms-2 grow'>{t('add section before label')}</span>
+                      <Icon icon='ph--arrow-line-up--regular' />
+                      <span className='ms-2 grow'>{t('add-section-before.label')}</span>
                     </DropdownMenu.Item>
                     <DropdownMenu.Item onClick={() => onAdd(id, 'after')} data-testid='section.add-after'>
-                      <Icon icon='ph--arrow-line-down--regular' size={5} />
-                      <span className='ms-2 grow'>{t('add section after label')}</span>
+                      <Icon icon='ph--arrow-line-down--regular' />
+                      <span className='ms-2 grow'>{t('add-section-after.label')}</span>
                     </DropdownMenu.Item>
                     <DropdownMenu.Item onClick={() => onDelete(id)} data-testid='section.remove'>
-                      <Icon icon='ph--trash--regular' size={5} />
-                      <span className='ms-2 grow'>{t('remove section label')}</span>
+                      <Icon icon='ph--trash--regular' />
+                      <span className='ms-2 grow'>{t('remove-section.label')}</span>
                     </DropdownMenu.Item>
                   </DropdownMenu.Viewport>
                   <DropdownMenu.Arrow />
@@ -88,7 +91,7 @@ export const StackSection = ({
                 <IconButton
                   iconOnly
                   variant='ghost'
-                  label={t('expand label')}
+                  label={t('expand.label')}
                   icon='ph--caret-up-down--regular'
                   classNames={sectionActionDimensions}
                 />
@@ -98,7 +101,7 @@ export const StackSection = ({
                 iconOnly
                 variant='ghost'
                 onClick={() => onNavigate(id)}
-                label={t('navigate to section label')}
+                label={t('navigate-to-section.label')}
                 icon='ph--arrow-right--regular'
                 data-testid='section.navigate-to'
                 classNames={sectionActionDimensions}
@@ -107,11 +110,11 @@ export const StackSection = ({
           </StackItem.HeadingStickyContent>
         </StackItem.Heading>
         <CollapsiblePrimitive.Content>
-          <Surface.Surface role='section' data={{ subject: object }} limit={1} placeholder={<></>} />
+          <Surface.Surface type={AppSurface.Section} data={data} limit={1} placeholder={<></>} />
         </CollapsiblePrimitive.Content>
         {view.collapsed && (
           <StackItem.Content classNames='dx-attention-surface'>
-            <h2 className={mx('flex items-center p-4 font-medium', textBlockWidth)}>{view.title}</h2>
+            <h2 className={mx('flex items-center p-4 font-medium')}>{view.title}</h2>
           </StackItem.Content>
         )}
       </StackItem.Root>

package/src/components/StackSection/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './StackSection';

package/src/components/StackSettings/StackSettings.tsx

@@ -0,0 +1,28 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React from 'react';
+
+import { Input, useTranslation } from '@dxos/react-ui';
+import { Settings as SettingsForm } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { type StackSettingsProps } from '#types';
+
+export const StackSettings = ({ settings }: { settings: StackSettingsProps }) => {
+  const { t } = useTranslation(meta.id);
+
+  return (
+    <SettingsForm.Viewport>
+      <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
+        <SettingsForm.Item title={t('settings.separation.label')} description={t('settings.separation.description')}>
+          <Input.Switch
+            checked={settings.separation}
+            onCheckedChange={(checked) => (settings.separation = !!checked)}
+          />
+        </SettingsForm.Item>
+      </SettingsForm.Section>
+    </SettingsForm.Viewport>
+  );
+};

package/src/components/StackSettings/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export * from './StackSettings';

package/src/containers/{StackContainer/StackContainer.tsx → StackArticle/StackArticle.tsx}

@@ -6,29 +6,26 @@ import { Atom, useAtomValue } from '@effect-atom/atom-react';
 import * as Option from 'effect/Option';
 import React, { useCallback, useState } from 'react';
 
-import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
-import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
-import { useAppGraph } from '@dxos/app-toolkit/ui';
-import { Obj, type Ref } from '@dxos/echo';
-import { type Collection } from '@dxos/echo';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { useAppGraph, type AppSurface } from '@dxos/app-toolkit/ui';
+import { type Collection, Obj, type Ref } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 import { Graph } from '@dxos/plugin-graph';
-import { SpaceOperation } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space';
 import { Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { AttentionProvider } from '@dxos/react-ui-attention';
 import { Stack, StackItem } from '@dxos/react-ui-stack';
 import { isNonNullable } from '@dxos/util';
 
-import { StackContext, StackSection } from '../../components';
-import { meta } from '../../meta';
+import { StackContext, StackSection } from '#components';
+import { meta } from '#meta';
 import {
   type AddSectionPosition,
   type CollapsedSections,
   type StackSectionItem,
   type StackSectionMetadata,
   type StackSectionView,
-} from '../../types';
+} from '#types';
 
 const collectionObjectsFamily = Atom.family((collection: Collection.Collection) =>
   Atom.make((get) => {
@@ -42,15 +39,12 @@ const collectionObjectsFamily = Atom.family((collection: Collection.Collection)
   }),
 );
 
-type StackContainerProps = SurfaceComponentProps<Collection.Collection> & {
-  id: string;
-};
+type StackArticleProps = AppSurface.ObjectArticleProps<Collection.Collection>;
 
-export const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
+export const StackArticle = ({ attendableId, subject: collection }: StackArticleProps) => {
   const { invokePromise } = useOperationInvoker();
   const { graph } = useAppGraph();
   const { t } = useTranslation(meta.id);
-  const allMetadata = useCapabilities(AppCapabilities.Metadata);
   const [collapsedSections, setCollapsedSections] = useState<CollapsedSections>({});
 
   // TODO(wittjosiah): Re-implement stack views with relations.
@@ -64,20 +58,17 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
 
   const collectionObjects = useAtomValue(collectionObjectsFamily(collection));
   const items = collectionObjects.map((object: Obj.Unknown) => {
-    const metadata = allMetadata.find((m) => m.id === (Obj.getTypename(object) ?? 'never'))
-      ?.metadata as StackSectionMetadata;
+    const iconAnnotation = Obj.getIcon(object);
+    const metadata: StackSectionMetadata = { icon: iconAnnotation?.icon };
     const view = {
       // ...stack.sections[object.id],
-      collapsed: collapsedSections[Obj.getDXN(object).toString()],
+      collapsed: collapsedSections[Obj.getURI(object)],
       title:
         (object as any)?.title ??
         // TODO(wittjosiah): `getNode` is not reactive.
-        toLocalizedString(
-          Graph.getNode(graph, Obj.getDXN(object).toString()).pipe(Option.getOrNull)?.properties.label,
-          t,
-        ),
+        toLocalizedString(Graph.getNode(graph, Obj.getURI(object)).pipe(Option.getOrNull)?.properties.label, t),
     } as StackSectionView;
-    return { id: Obj.getDXN(object).toString(), object, metadata, view } satisfies StackSectionItem;
+    return { id: Obj.getURI(object), object, metadata, view } satisfies StackSectionItem;
   });
 
   const handleDelete = useCallback(
@@ -85,7 +76,7 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
       const index = collection.objects
         .map((object) => object.target)
         .filter(isNonNullable)
-        .findIndex((section) => Obj.getDXN(section).toString() === id);
+        .findIndex((section) => Obj.getURI(section) === id);
       const object = collection.objects[index].target;
       if (Obj.isObject(object)) {
         await invokePromise(SpaceOperation.RemoveObjects, {
@@ -104,7 +95,7 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
     async (id: string, position: AddSectionPosition) => {
       // TODO(wittjosiah): Use object creation dialog.
       await invokePromise(LayoutOperation.UpdateDialog, {
-        subject: `${meta.id}/AddSectionDialog`,
+        subject: `${meta.id}.AddSectionDialog`,
         blockAlign: 'start',
         props: {
           path: id,
@@ -138,7 +129,7 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
   );
 
   return (
-    <StackItem.Content toolbar classNames='dx-article overflow-hidden border-l border-r border-subdued-separator'>
+    <StackItem.Content toolbar classNames='dx-document'>
       <Toolbar.Root>
         <Toolbar.IconButton
           icon='ph--plus--regular'
@@ -148,22 +139,27 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
           onClick={handleAddSection}
         />
       </Toolbar.Root>
-      <AttentionProvider id={id}>
-        <StackContext.Provider
-          value={{
-            onCollapse: handleCollapse,
-            onNavigate: handleNavigate,
-            onDelete: handleDelete,
-            onAdd: handleAdd,
-          }}
+      <StackContext.Provider
+        value={{
+          attendableId,
+          onCollapse: handleCollapse,
+          onNavigate: handleNavigate,
+          onDelete: handleDelete,
+          onAdd: handleAdd,
+        }}
+      >
+        <Stack
+          orientation='vertical'
+          size='intrinsic'
+          id={Obj.getURI(collection)}
+          data-testid='main.stack'
+          classNames='overflow-y-auto'
         >
-          <Stack orientation='vertical' size='intrinsic' id={id} data-testid='main.stack' classNames='overflow-y-auto'>
-            {items.map((item) => (
-              <StackSection key={item.id} {...item} />
-            ))}
-          </Stack>
-        </StackContext.Provider>
-      </AttentionProvider>
+          {items.map((item) => (
+            <StackSection key={item.id} {...item} />
+          ))}
+        </Stack>
+      </StackContext.Provider>
     </StackItem.Content>
   );
 };

package/src/containers/StackArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export { StackArticle as default } from './StackArticle';

package/src/containers/index.ts

@@ -4,4 +4,4 @@
 
 import { type ComponentType, lazy } from 'react';
 
-export const StackContainer: ComponentType<any> = lazy(() => import('./StackContainer'));
+export const StackArticle: ComponentType<any> = lazy(() => import('./StackArticle'));

package/src/index.ts

@@ -3,4 +3,4 @@
 //
 
 export * from './meta';
-export * from './StackPlugin';
+export * from './types';