From 5d967d2e9d0a6af21bb6765706c891b2d9c3d11f Mon Sep 17 00:00:00 2001
From: liuxiaocs7 <liuxiao2103@qq.com>
Date: Wed, 26 Aug 2026 15:39:17 +0800
Subject: [PATCH] fix(build): derive Astryx surface inventory from
 @astryxdesign/core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The file-level Astryx surface inventory could not see most of the design
system. Its known-component set was a hand-maintained 47-name list while
@astryxdesign/core ships ~190 components, so Timestamp, ChatMessage,
Thumbnail and others were invisible — removing such a component from a file
left its inventory row byte-identical and the coverage gate saw nothing.
Severity also recognized only raw button/input/select, so a hand-rolled
replacement for a shipped component scored aligned.

Derive the component set by parsing the installed @astryxdesign/core
declarations (hard error if the package is absent, so the artifact never
silently regenerates with a partial set), add a reimplementation severity
tier for a local component that shadows a shipped twin it does not import,
and regenerate the committed inventory.

The declaration parse walks the whole `export *` barrel graph recursively
(cycle-safe, fail-closed on any unresolved relative target) rather than a
single layer, so a future nested barrel cannot silently drop components; a
multi-level fixture makes that boundary executable.

Generated-by: Claude Opus 4.8 via Claude Code
---
 .github/workflows/ci.yml                      |   6 +-
 docs/astryx-alignment-inventory.md            |   5 +-
 docs/astryx-surface-file-inventory.md         | 180 +++----
 package.json                                  |   1 +
 scripts/ci-test-plan.test.mjs                 |  14 +
 scripts/generate-astryx-surface-inventory.mjs | 463 ++++++++++++++----
 ...generate-astryx-surface-inventory.test.mjs | 228 +++++++++
 7 files changed, 700 insertions(+), 197 deletions(-)
 create mode 100644 scripts/generate-astryx-surface-inventory.test.mjs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7d6b45dab..53b88315a6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
           fi
 
       - name: Install dependencies
-        if: steps.plan.outputs.code == 'true' || steps.plan.outputs.asf_source == 'true' || steps.plan.outputs.cli_package == 'true' || steps.plan.outputs.release_contract == 'true'
+        if: steps.plan.outputs.code == 'true' || steps.plan.outputs.astryx_surface == 'true' || steps.plan.outputs.asf_source == 'true' || steps.plan.outputs.cli_package == 'true' || steps.plan.outputs.release_contract == 'true'
         run: npm ci
 
       # The header audit above remains install-free. The complete source gate
@@ -181,7 +181,9 @@ jobs:
       # directly instead of being hidden behind an earlier compilation failure.
       - name: Astryx surface inventory
         if: steps.plan.outputs.code == 'true' || steps.plan.outputs.astryx_surface == 'true'
-        run: npm run astryx:surface-inventory
+        run: |
+          npm run astryx:surface-inventory
+          npm run astryx:surface-inventory:test
 
       - name: Build
         if: steps.plan.outputs.code == 'true' || steps.plan.outputs.cli_package == 'true' || steps.plan.outputs.release_contract == 'true'
diff --git a/docs/astryx-alignment-inventory.md b/docs/astryx-alignment-inventory.md
index 6b291758ab..264191655b 100644
--- a/docs/astryx-alignment-inventory.md
+++ b/docs/astryx-alignment-inventory.md
@@ -23,7 +23,9 @@
 
 Maps [Astryx wiki](https://github.com/facebook/astryx/wiki) conventions onto
 Maka product surfaces. Severity: **blocker** (raw control when an Astryx twin
-exists / broken hierarchy) · **polish** (off-scale px, density).
+exists / broken hierarchy) · **reimplementation** (a public `@maka/ui` export
+shadows a shipped Astryx component — a review signal, not proof) · **polish**
+(off-scale px, density).
 
 ## Wiki smell checklist (searchable)
 
@@ -34,6 +36,7 @@ exists / broken hierarchy) · **polish** (off-scale px, density).
 | Design · radius | Nested radii not `outer − gap` | Role radii |
 | Design · elevation | Raw `box-shadow` / magic z-index | Elevation tokens |
 | API · Use the System | Raw `<button>` / `<input>` / `<select>` with Astryx twin | `Button`, `TextInput`, `Selector`, `List`/`Item`, `EmptyState`, `Dialog`, `ToggleButton`, `Collapsible`, `SegmentedControl` |
+| API · Use the System | Public `@maka/ui` export whose name shadows a shipped Astryx component (defined locally, not a re-export) | Re-export the Astryx component, or confirm the local one is intentional |
 | Theming | One-off hex for ladder roles | Bridge + product tokens |
 | Container padding | Product padding fighting `--container-padding-*` | Let Card/Section/Layout own inset |
 
diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index bf8719dbd9..ed9b810a0d 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -2,10 +2,11 @@
 
 Generated by `scripts/generate-astryx-surface-inventory.mjs`.
 Each row is one on-disk product surface file. Regenerated inventory must stay in sync with disk (coverage gate).
+Generated against `@astryxdesign/core@0.5.0` (194 component exports).
 
 Wiki bar: Design Conventions · API Use-the-System · Theming · Container Padding.
 
-**Totals:** 229 files — blocker 0, polish 1, aligned 228.
+**Totals:** 229 files — blocker 0, reimplementation 0, polish 1, aligned 228.
 
 ## Exclusions (explicit)
 
@@ -27,109 +28,109 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | Path | Role | Astryx used | Gap / note | Severity |
 |------|------|-------------|------------|----------|
 | `apps/desktop/src/renderer/agent-graph-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, IconButton, Selector, Spinner | aligned — uses Astryx (Banner, Button, EmptyState, IconButton, Selector, Spinner) | aligned |
-| `apps/desktop/src/renderer/app-shell-chrome-actions.tsx` | shell-chrome-or-panel | IconButton, Tooltip | aligned — uses Astryx (IconButton, Tooltip) | aligned |
+| `apps/desktop/src/renderer/app-shell-chrome-actions.tsx` | shell-chrome-or-panel | Icon, IconButton, Tooltip | aligned — uses Astryx (Icon, IconButton, Tooltip) | aligned |
 | `apps/desktop/src/renderer/app-shell-detail-panel.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/app-shell-overlays.tsx` | shell-chrome-or-panel | Spinner | aligned — uses Astryx (Spinner) | aligned |
 | `apps/desktop/src/renderer/app-shell.tsx` | shell-chrome-or-panel | AppShell, Button | aligned — uses Astryx (AppShell, Button) | aligned |
-| `apps/desktop/src/renderer/app.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `apps/desktop/src/renderer/app.tsx` | other | Theme | aligned — uses Astryx (Theme) | aligned |
 | `apps/desktop/src/renderer/cascade-layers.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/chat-composer-region.tsx` | shell-chrome-or-panel | Banner, Button | aligned — uses Astryx (Banner, Button) | aligned |
-| `apps/desktop/src/renderer/chat-message-surface.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `apps/desktop/src/renderer/chat-message-surface.tsx` | shell-chrome-or-panel | Skeleton | aligned — uses Astryx (Skeleton) | aligned |
 | `apps/desktop/src/renderer/chat-recovery-notice.tsx` | shell-chrome-or-panel | Banner, Button | aligned — uses Astryx (Banner, Button) | aligned |
-| `apps/desktop/src/renderer/command-palette.tsx` | dialog-overlay | EmptyState | aligned — uses Astryx (EmptyState) | aligned |
+| `apps/desktop/src/renderer/command-palette.tsx` | dialog-overlay | CommandPalette, CommandPaletteFooter, CommandPaletteInput, EmptyState, Kbd | aligned — uses Astryx (CommandPalette, CommandPaletteFooter, CommandPaletteInput, EmptyState, Kbd) | aligned |
 | `apps/desktop/src/renderer/composer-mentions.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/composition/desktop-feature-services.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/custom-pet-companion.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/error-boundary.tsx` | other | Button, Card | aligned — uses Astryx (Button, Card) | aligned |
 | `apps/desktop/src/renderer/features/goals/services-context.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/features/goals/ui/goal-dialog.tsx` | dialog-overlay | Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, Text, TextInput, VStack | aligned — uses Astryx (Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, Text, TextInput) | aligned |
+| `apps/desktop/src/renderer/features/goals/ui/goal-dialog.tsx` | dialog-overlay | Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter, Text, TextArea, TextInput, VStack | aligned — uses Astryx (Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter, Text) | aligned |
 | `apps/desktop/src/renderer/features/goals/ui/goal-host.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/module-hub/services-context.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/module-hub/ui/module-hub-host.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/runtime-host-management/services-context.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/runtime-host-management/ui/peer-mesh-peer-id-button.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
-| `apps/desktop/src/renderer/features/runtime-host-management/ui/runtime-host-peer-mesh-dialog.tsx` | dialog-overlay | Badge, Banner, Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, SegmentedControl, SegmentedControlItem, Tooltip | aligned — uses Astryx (Badge, Banner, Button, Dialog, DialogHeader, HStack, Layout, LayoutContent) | aligned |
-| `apps/desktop/src/renderer/features/runtime-host-management/ui/runtime-host-profile-pairing-actions.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
+| `apps/desktop/src/renderer/features/runtime-host-management/ui/runtime-host-peer-mesh-dialog.tsx` | dialog-overlay | Badge, Banner, Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter, MoreMenu, SegmentedControl, SegmentedControlItem, Switch, Text, TextArea, TextInput, Tooltip | aligned — uses Astryx (Badge, Banner, Button, Dialog, DialogHeader, HStack, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/features/runtime-host-management/ui/runtime-host-profile-pairing-actions.tsx` | other | Button, MoreMenu | aligned — uses Astryx (Button, MoreMenu) | aligned |
 | `apps/desktop/src/renderer/features/session-navigation/services-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/session-navigation/ui/session-navigation-provider.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/task-entry/services-context.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/task-entry/ui/task-entry-host.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/workbar/services-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-pane.tsx` | shell-chrome-or-panel | Badge, Banner, Button, EmptyState | aligned — uses Astryx (Badge, Banner, Button, EmptyState) | aligned |
+| `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-pane.tsx` | shell-chrome-or-panel | Badge, Banner, Button, EmptyState, MoreMenu | aligned — uses Astryx (Badge, Banner, Button, EmptyState, MoreMenu) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-preview-registry-shell.tsx` | shell-chrome-or-panel | Banner, Button, Spinner | aligned — uses Astryx (Banner, Button, Spinner) | aligned |
-| `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-preview.tsx` | shell-chrome-or-panel | Banner, Button, Spinner | aligned — uses Astryx (Banner, Button, Spinner) | aligned |
-| `apps/desktop/src/renderer/features/workbar/tools/browser/browser-panel.tsx` | shell-chrome-or-panel | EmptyState, IconButton, Toolbar, Tooltip | aligned — uses Astryx (EmptyState, IconButton, Toolbar, Tooltip) | aligned |
+| `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-preview.tsx` | shell-chrome-or-panel | Banner, Button, CodeBlock, Spinner | aligned — uses Astryx (Banner, Button, CodeBlock, Spinner) | aligned |
+| `apps/desktop/src/renderer/features/workbar/tools/browser/browser-panel.tsx` | shell-chrome-or-panel | EmptyState, IconButton, TextInput, Toolbar, Tooltip | aligned — uses Astryx (EmptyState, IconButton, TextInput, Toolbar, Tooltip) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, Heading, Section, Text, VStack | aligned — uses Astryx (Banner, Button, EmptyState, Heading, Section, Text, VStack) | aligned |
-| `apps/desktop/src/renderer/features/workbar/tools/review/session-review-panel.tsx` | shell-chrome-or-panel | Banner, Button, Collapsible, EmptyState, HStack, Section, Text, VStack | aligned — uses Astryx (Banner, Button, Collapsible, EmptyState, HStack, Section, Text, VStack) | aligned |
+| `apps/desktop/src/renderer/features/workbar/tools/review/session-review-panel.tsx` | shell-chrome-or-panel | Banner, Button, Collapsible, CollapsibleGroup, EmptyState, HStack, Section, Skeleton, Text, VStack | aligned — uses Astryx (Banner, Button, Collapsible, CollapsibleGroup, EmptyState, HStack, Section, Skeleton) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx` | shell-chrome-or-panel | Banner, Spinner | aligned — uses Astryx (Banner, Spinner) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/terminal/session-terminal-panel.tsx` | shell-chrome-or-panel | Banner, EmptyState | aligned — uses Astryx (Banner, EmptyState) | aligned |
-| `apps/desktop/src/renderer/features/workbar/ui/side-chat-close-confirmation.tsx` | shell-chrome-or-panel | Button, CheckboxInput, Dialog, DialogHeader, HStack, Layout, LayoutContent, Text, VStack | aligned — uses Astryx (Button, CheckboxInput, Dialog, DialogHeader, HStack, Layout, LayoutContent, Text) | aligned |
+| `apps/desktop/src/renderer/features/workbar/ui/side-chat-close-confirmation.tsx` | shell-chrome-or-panel | Button, CheckboxInput, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter, Text, VStack | aligned — uses Astryx (Button, CheckboxInput, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter) | aligned |
 | `apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx` | shell-chrome-or-panel | Card, ResizeHandle, Spinner | aligned — uses Astryx (Card, ResizeHandle, Spinner) | aligned |
-| `apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx` | shell-chrome-or-panel | Badge, Button, Card, ContextMenu, Heading, IconButton, List, ListItem, Section, Spinner, Tooltip | aligned — uses Astryx (Badge, Button, Card, ContextMenu, Heading, IconButton, List, ListItem) | aligned |
-| `apps/desktop/src/renderer/features/workbar/ui/workbar-toggle.tsx` | shell-chrome-or-panel | IconButton, Tooltip | aligned — uses Astryx (IconButton, Tooltip) | aligned |
-| `apps/desktop/src/renderer/keyboard-help.tsx` | dialog-overlay | Dialog, DialogHeader, Heading, Layout, LayoutContent | aligned — uses Astryx (Dialog, DialogHeader, Heading, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/features/workbar/ui/workbar-surface.tsx` | shell-chrome-or-panel | Badge, Button, Card, ContextMenu, Heading, Icon, IconButton, Kbd, List, ListItem, Section, Spinner, Tooltip | aligned — uses Astryx (Badge, Button, Card, ContextMenu, Heading, Icon, IconButton, Kbd) | aligned |
+| `apps/desktop/src/renderer/features/workbar/ui/workbar-toggle.tsx` | shell-chrome-or-panel | Icon, IconButton, Tooltip | aligned — uses Astryx (Icon, IconButton, Tooltip) | aligned |
+| `apps/desktop/src/renderer/keyboard-help.tsx` | dialog-overlay | Dialog, DialogHeader, Heading, Kbd, Layout, LayoutContent | aligned — uses Astryx (Dialog, DialogHeader, Heading, Kbd, Layout, LayoutContent) | aligned |
 | `apps/desktop/src/renderer/live-turn-reconciler.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/maka-tokens.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/mcp-brand-marks.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/mcp-page.tsx` | module-hub | Banner, Button, Collapsible, Dialog, DialogHeader, Divider, EmptyState, HStack, Heading, IconButton, Layout, LayoutContent, List, ListItem, MetadataList, MetadataListItem, SegmentedControl, SegmentedControlItem, Selector, Switch, Text, TextInput, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Collapsible, Dialog, DialogHeader, Divider, EmptyState, HStack) | aligned |
-| `apps/desktop/src/renderer/onboarding-hero.tsx` | dialog-overlay | Banner, Button, Card, HStack, Heading, List, ListItem, Text, VStack | aligned — uses Astryx (Banner, Button, Card, HStack, Heading, List, ListItem, Text) | aligned |
+| `apps/desktop/src/renderer/mcp-page.tsx` | module-hub | Banner, Button, Collapsible, Dialog, DialogHeader, Divider, EmptyState, HStack, Heading, IconButton, Layout, LayoutContent, List, ListItem, MetadataList, MetadataListItem, RadioList, RadioListItem, SegmentedControl, SegmentedControlItem, Selector, Skeleton, StackItem, StatusDot, Switch, Text, TextArea, TextInput, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Collapsible, Dialog, DialogHeader, Divider, EmptyState, HStack) | aligned |
+| `apps/desktop/src/renderer/onboarding-hero.tsx` | dialog-overlay | Banner, Button, Card, Center, Code, HStack, Heading, List, ListItem, Text, VStack | aligned — uses Astryx (Banner, Button, Card, Center, Code, HStack, Heading, List) | aligned |
 | `apps/desktop/src/renderer/plan-mode-panel.tsx` | shell-chrome-or-panel | Badge, Banner, Button, Collapsible | aligned — uses Astryx (Badge, Banner, Button, Collapsible) | aligned |
 | `apps/desktop/src/renderer/reference-shell.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
-| `apps/desktop/src/renderer/remote-project-directory-dialog.tsx` | dialog-overlay | Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, Text | aligned — uses Astryx (Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, Text) | aligned |
-| `apps/desktop/src/renderer/session-collaboration-dialog.tsx` | dialog-overlay | Banner, Button, Dialog, DialogHeader, Layout, LayoutContent, SegmentedControl, SegmentedControlItem | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, Layout, LayoutContent, SegmentedControl, SegmentedControlItem) | aligned |
-| `apps/desktop/src/renderer/session-turn-request-composer.tsx` | shell-chrome-or-panel | Button | aligned — uses Astryx (Button) | aligned |
-| `apps/desktop/src/renderer/settings/about-settings-page.tsx` | settings-page | Badge, Banner, Button, List, ListItem | aligned — uses Astryx (Badge, Banner, Button, List, ListItem) | aligned |
-| `apps/desktop/src/renderer/settings/appearance-settings-page.tsx` | settings-page | Button, HStack, Text, VStack | aligned — uses Astryx (Button, HStack, Text, VStack) | aligned |
-| `apps/desktop/src/renderer/settings/bot-chat-detail.tsx` | settings-module | Banner, Button, Card, MetadataList, MetadataListItem, SegmentedControl, SegmentedControlItem, Selector, Text, VStack | aligned — uses Astryx (Banner, Button, Card, MetadataList, MetadataListItem, SegmentedControl, SegmentedControlItem, Selector) | aligned |
-| `apps/desktop/src/renderer/settings/bot-chat-overview.tsx` | settings-module | Banner, Button, EmptyState, Item | aligned — uses Astryx (Banner, Button, EmptyState, Item) | aligned |
+| `apps/desktop/src/renderer/remote-project-directory-dialog.tsx` | dialog-overlay | Button, Dialog, DialogHeader, DropdownMenu, DropdownMenuItem, HStack, Layout, LayoutContent, LayoutFooter, Text | aligned — uses Astryx (Button, Dialog, DialogHeader, DropdownMenu, DropdownMenuItem, HStack, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/session-collaboration-dialog.tsx` | dialog-overlay | Banner, Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter, SegmentedControl, SegmentedControlItem, Text, TextArea | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter) | aligned |
+| `apps/desktop/src/renderer/session-turn-request-composer.tsx` | shell-chrome-or-panel | Button, Text, TextArea | aligned — uses Astryx (Button, Text, TextArea) | aligned |
+| `apps/desktop/src/renderer/settings/about-settings-page.tsx` | settings-page | Badge, Banner, Button, Kbd, Link, List, ListItem | aligned — uses Astryx (Badge, Banner, Button, Kbd, Link, List, ListItem) | aligned |
+| `apps/desktop/src/renderer/settings/appearance-settings-page.tsx` | settings-page | Button, Grid, HStack, NumberInput, SelectableCard, Switch, Text, VStack | aligned — uses Astryx (Button, Grid, HStack, NumberInput, SelectableCard, Switch, Text, VStack) | aligned |
+| `apps/desktop/src/renderer/settings/bot-chat-detail.tsx` | settings-module | Banner, Button, Card, FormLayout, MetadataList, MetadataListItem, SegmentedControl, SegmentedControlItem, Selector, StatusDot, Switch, Text, TextArea, TextInput, VStack | aligned — uses Astryx (Banner, Button, Card, FormLayout, MetadataList, MetadataListItem, SegmentedControl, SegmentedControlItem) | aligned |
+| `apps/desktop/src/renderer/settings/bot-chat-overview.tsx` | settings-module | Banner, Button, EmptyState, Item, StatusDot | aligned — uses Astryx (Banner, Button, EmptyState, Item, StatusDot) | aligned |
 | `apps/desktop/src/renderer/settings/bot-chat-settings-page.tsx` | settings-page | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/settings/bot-chat-shared.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/settings/bot-onboarding-modal.tsx` | settings-page | Button, Dialog, DialogHeader, Layout, LayoutContent, Spinner | aligned — uses Astryx (Button, Dialog, DialogHeader, Layout, LayoutContent, Spinner) | aligned |
-| `apps/desktop/src/renderer/settings/bot-wechat-login.tsx` | settings-module | Banner, Button, Collapsible, Dialog, DialogHeader, EmptyState, Layout, LayoutContent, Spinner | aligned — uses Astryx (Banner, Button, Collapsible, Dialog, DialogHeader, EmptyState, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/settings/bot-wechat-login.tsx` | settings-module | Banner, Button, Collapsible, Dialog, DialogHeader, EmptyState, FormLayout, Layout, LayoutContent, Spinner, TextInput | aligned — uses Astryx (Banner, Button, Collapsible, Dialog, DialogHeader, EmptyState, FormLayout, Layout) | aligned |
 | `apps/desktop/src/renderer/settings/custom-pet-settings-section.tsx` | settings-module | Badge, Button, EmptyState | aligned — uses Astryx (Badge, Button, EmptyState) | aligned |
-| `apps/desktop/src/renderer/settings/daily-review-settings-page.tsx` | settings-page | Banner, Selector | aligned — uses Astryx (Banner, Selector) | aligned |
-| `apps/desktop/src/renderer/settings/data-settings-page.tsx` | settings-page | Banner, Button, Selector | aligned — uses Astryx (Banner, Button, Selector) | aligned |
-| `apps/desktop/src/renderer/settings/general-settings-page.tsx` | settings-page | Banner, Button, Selector | aligned — uses Astryx (Banner, Button, Selector) | aligned |
-| `apps/desktop/src/renderer/settings/health-center-page.tsx` | settings-page | Banner, Button, Text, VStack | aligned — uses Astryx (Banner, Button, Text, VStack) | aligned |
+| `apps/desktop/src/renderer/settings/daily-review-settings-page.tsx` | settings-page | Banner, Selector, Switch, TextInput | aligned — uses Astryx (Banner, Selector, Switch, TextInput) | aligned |
+| `apps/desktop/src/renderer/settings/data-settings-page.tsx` | settings-page | Banner, Button, Selector, Switch | aligned — uses Astryx (Banner, Button, Selector, Switch) | aligned |
+| `apps/desktop/src/renderer/settings/general-settings-page.tsx` | settings-page | Banner, Button, FormLayout, NumberInput, Selector, Switch, TextInput | aligned — uses Astryx (Banner, Button, FormLayout, NumberInput, Selector, Switch, TextInput) | aligned |
+| `apps/desktop/src/renderer/settings/health-center-page.tsx` | settings-page | Banner, Button, StatusDot, Text, VStack | aligned — uses Astryx (Banner, Button, StatusDot, Text, VStack) | aligned |
 | `apps/desktop/src/renderer/settings/import-tasks-settings-page.tsx` | settings-page | Banner, Button, CheckboxInput, EmptyState, HStack, List, ListItem, SegmentedControl, SegmentedControlItem, Spinner, TextInput, VStack | aligned — uses Astryx (Banner, Button, CheckboxInput, EmptyState, HStack, List, ListItem, SegmentedControl) | aligned |
-| `apps/desktop/src/renderer/settings/memory-entry-list.tsx` | settings-module | Button, EmptyState | aligned — uses Astryx (Button, EmptyState) | aligned |
-| `apps/desktop/src/renderer/settings/memory-settings-page.tsx` | settings-page | Banner, Button, EmptyState | aligned — uses Astryx (Banner, Button, EmptyState) | aligned |
+| `apps/desktop/src/renderer/settings/memory-entry-list.tsx` | settings-module | Button, EmptyState, MoreMenu | aligned — uses Astryx (Button, EmptyState, MoreMenu) | aligned |
+| `apps/desktop/src/renderer/settings/memory-settings-page.tsx` | settings-page | Banner, Button, EmptyState, FormLayout, MoreMenu, StatusDot, Switch, TextArea, TextInput | aligned — uses Astryx (Banner, Button, EmptyState, FormLayout, MoreMenu, StatusDot, Switch, TextArea) | aligned |
 | `apps/desktop/src/renderer/settings/memory-settings-sections.tsx` | settings-module | Button | aligned — uses Astryx (Button) | aligned |
-| `apps/desktop/src/renderer/settings/password-input.tsx` | settings-module | IconButton | aligned — uses Astryx (IconButton) | aligned |
-| `apps/desktop/src/renderer/settings/permission-center-page.tsx` | settings-page | Banner, Button, Collapsible, HStack, List, ListItem, MetadataList, MetadataListItem, Text, VStack | aligned — uses Astryx (Banner, Button, Collapsible, HStack, List, ListItem, MetadataList, MetadataListItem) | aligned |
-| `apps/desktop/src/renderer/settings/personalization-settings-section.tsx` | settings-module | SegmentedControl, SegmentedControlItem | aligned — uses Astryx (SegmentedControl, SegmentedControlItem) | aligned |
-| `apps/desktop/src/renderer/settings/projects-settings-page.tsx` | settings-page | Badge, Banner, Button, EmptyState, HStack, List, ListItem | aligned — uses Astryx (Badge, Banner, Button, EmptyState, HStack, List, ListItem) | aligned |
-| `apps/desktop/src/renderer/settings/provider-add-form.tsx` | settings-module | Banner, Button, Collapsible, HStack, VStack | aligned — uses Astryx (Banner, Button, Collapsible, HStack, VStack) | aligned |
-| `apps/desktop/src/renderer/settings/provider-add-model-dialog.tsx` | settings-module | Button, Dialog, DialogHeader, Layout, LayoutContent | aligned — uses Astryx (Button, Dialog, DialogHeader, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/settings/password-input.tsx` | settings-module | IconButton, InputGroup, InputGroupText, TextInput | aligned — uses Astryx (IconButton, InputGroup, InputGroupText, TextInput) | aligned |
+| `apps/desktop/src/renderer/settings/permission-center-page.tsx` | settings-page | Banner, Button, Collapsible, CollapsibleGroup, HStack, List, ListItem, MetadataList, MetadataListItem, StatusDot, Text, VStack | aligned — uses Astryx (Banner, Button, Collapsible, CollapsibleGroup, HStack, List, ListItem, MetadataList) | aligned |
+| `apps/desktop/src/renderer/settings/personalization-settings-section.tsx` | settings-module | SegmentedControl, SegmentedControlItem, TextArea, TextInput | aligned — uses Astryx (SegmentedControl, SegmentedControlItem, TextArea, TextInput) | aligned |
+| `apps/desktop/src/renderer/settings/projects-settings-page.tsx` | settings-page | Badge, Banner, Button, EmptyState, HStack, List, ListItem, MoreMenu, TextInput | aligned — uses Astryx (Badge, Banner, Button, EmptyState, HStack, List, ListItem, MoreMenu) | aligned |
+| `apps/desktop/src/renderer/settings/provider-add-form.tsx` | settings-module | Banner, Button, Collapsible, FormLayout, HStack, TextInput, VStack | aligned — uses Astryx (Banner, Button, Collapsible, FormLayout, HStack, TextInput, VStack) | aligned |
+| `apps/desktop/src/renderer/settings/provider-add-model-dialog.tsx` | settings-module | Button, Dialog, DialogHeader, FormLayout, HStack, Layout, LayoutContent, LayoutFooter, NumberInput, TextInput | aligned — uses Astryx (Button, Dialog, DialogHeader, FormLayout, HStack, Layout, LayoutContent, LayoutFooter) | aligned |
 | `apps/desktop/src/renderer/settings/provider-brand-marks.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/settings/provider-catalog-page.tsx` | settings-page | Banner, Button, EmptyState, HStack, List, ListItem, Section, Selector, VStack | aligned — uses Astryx (Banner, Button, EmptyState, HStack, List, ListItem, Section, Selector) | aligned |
-| `apps/desktop/src/renderer/settings/provider-connection-detail.tsx` | settings-module | Banner, Button, Divider, HStack, Heading, Selector, Text, VStack | aligned — uses Astryx (Banner, Button, Divider, HStack, Heading, Selector, Text, VStack) | aligned |
+| `apps/desktop/src/renderer/settings/provider-catalog-page.tsx` | settings-page | Banner, Button, EmptyState, HStack, List, ListItem, Section, Selector, TextInput, VStack | aligned — uses Astryx (Banner, Button, EmptyState, HStack, List, ListItem, Section, Selector) | aligned |
+| `apps/desktop/src/renderer/settings/provider-connection-detail.tsx` | settings-module | Banner, Button, Divider, DropdownMenu, DropdownMenuCheckboxItem, Grid, HStack, Heading, Link, NumberInput, Selector, Text, TextInput, VStack | aligned — uses Astryx (Banner, Button, Divider, DropdownMenu, DropdownMenuCheckboxItem, Grid, HStack, Heading) | aligned |
 | `apps/desktop/src/renderer/settings/provider-display.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/settings/provider-enabled-model-manager.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `apps/desktop/src/renderer/settings/provider-enabled-model-manager.tsx` | settings-module | MultiSelector | aligned — uses Astryx (MultiSelector) | aligned |
 | `apps/desktop/src/renderer/settings/provider-oauth-section.tsx` | settings-module | Banner, Button, HStack, Text, VStack | aligned — uses Astryx (Banner, Button, HStack, Text, VStack) | aligned |
-| `apps/desktop/src/renderer/settings/providers-panel.tsx` | settings-module | Badge, Banner, Button, EmptyState, HStack, Heading, List, ListItem, Text, VStack | aligned — uses Astryx (Badge, Banner, Button, EmptyState, HStack, Heading, List, ListItem) | aligned |
-| `apps/desktop/src/renderer/settings/request-customization-editor.tsx` | settings-module | Button, HStack, IconButton, Text, VStack | aligned — uses Astryx (Button, HStack, IconButton, Text, VStack) | aligned |
-| `apps/desktop/src/renderer/settings/runtime-host-connection-code-dialog.tsx` | settings-module | Button, Dialog, DialogHeader, Layout, LayoutContent | aligned — uses Astryx (Button, Dialog, DialogHeader, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/settings/providers-panel.tsx` | settings-module | Badge, Banner, Button, EmptyState, HStack, Heading, List, ListItem, Skeleton, StatusDot, Text, VStack | aligned — uses Astryx (Badge, Banner, Button, EmptyState, HStack, Heading, List, ListItem) | aligned |
+| `apps/desktop/src/renderer/settings/request-customization-editor.tsx` | settings-module | Button, HStack, IconButton, Text, TextArea, TextInput, VStack | aligned — uses Astryx (Button, HStack, IconButton, Text, TextArea, TextInput, VStack) | aligned |
+| `apps/desktop/src/renderer/settings/runtime-host-connection-code-dialog.tsx` | settings-module | Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter, TextArea | aligned — uses Astryx (Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter, TextArea) | aligned |
 | `apps/desktop/src/renderer/settings/runtime-host-interaction-boundary.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/settings/runtime-host-management-dialog.tsx` | settings-module | Badge, Banner, Button, Dialog, DialogHeader, IconButton, Layout, LayoutContent, Selector, Spinner, Switch, Text, Tooltip | aligned — uses Astryx (Badge, Banner, Button, Dialog, DialogHeader, IconButton, Layout, LayoutContent) | aligned |
-| `apps/desktop/src/renderer/settings/runtime-host-onboarding-dialog.tsx` | settings-module | Banner, Button, Dialog, DialogHeader, Layout, LayoutContent, SegmentedControl, SegmentedControlItem, Selector, Spinner, Text | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, Layout, LayoutContent, SegmentedControl, SegmentedControlItem) | aligned |
-| `apps/desktop/src/renderer/settings/runtime-host-profiles-section.tsx` | settings-module | Badge, Banner, Button, HStack, List, ListItem, SegmentedControl, SegmentedControlItem, Selector, Switch | aligned — uses Astryx (Badge, Banner, Button, HStack, List, ListItem, SegmentedControl, SegmentedControlItem) | aligned |
-| `apps/desktop/src/renderer/settings/runtime-host-project-directory-editor.tsx` | settings-module | Button | aligned — uses Astryx (Button) | aligned |
+| `apps/desktop/src/renderer/settings/runtime-host-management-dialog.tsx` | settings-module | Badge, Banner, Button, Dialog, DialogHeader, IconButton, Layout, LayoutContent, LayoutFooter, MoreMenu, Selector, Spinner, Switch, Text, TextInput, Tooltip | aligned — uses Astryx (Badge, Banner, Button, Dialog, DialogHeader, IconButton, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/settings/runtime-host-onboarding-dialog.tsx` | settings-module | Banner, Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter, SegmentedControl, SegmentedControlItem, Selector, Spinner, Text, TextInput | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, FormLayout, Layout, LayoutContent, LayoutFooter) | aligned |
+| `apps/desktop/src/renderer/settings/runtime-host-profiles-section.tsx` | settings-module | Badge, Banner, Button, HStack, List, ListItem, MoreMenu, SegmentedControl, SegmentedControlItem, Selector, Switch, TextInput | aligned — uses Astryx (Badge, Banner, Button, HStack, List, ListItem, MoreMenu, SegmentedControl) | aligned |
+| `apps/desktop/src/renderer/settings/runtime-host-project-directory-editor.tsx` | settings-module | Button, TextInput | aligned — uses Astryx (Button, TextInput) | aligned |
 | `apps/desktop/src/renderer/settings/runtime-host-settings-target.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `apps/desktop/src/renderer/settings/runtime-host-ssh-terminal-dialog.tsx` | settings-module | Banner, Button, Dialog, DialogHeader, Layout, LayoutContent | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, Layout, LayoutContent) | aligned |
+| `apps/desktop/src/renderer/settings/runtime-host-ssh-terminal-dialog.tsx` | settings-module | Banner, Button, Dialog, DialogHeader, Layout, LayoutContent, LayoutFooter | aligned — uses Astryx (Banner, Button, Dialog, DialogHeader, Layout, LayoutContent, LayoutFooter) | aligned |
 | `apps/desktop/src/renderer/settings/settings-expandable-row.tsx` | settings-module | Button, HStack, Text | aligned — uses Astryx (Button, HStack, Text) | aligned |
 | `apps/desktop/src/renderer/settings/settings-metric-card.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/settings/settings-modal.tsx` | settings-page | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/settings/settings-route-header.tsx` | settings-module | HStack, Heading, IconButton, Text, Toolbar, VStack | aligned — uses Astryx (HStack, Heading, IconButton, Text, Toolbar, VStack) | aligned |
 | `apps/desktop/src/renderer/settings/settings-rows.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/settings/settings-section.tsx` | settings-module | Divider, HStack, Heading, Item, Text, VStack | aligned — uses Astryx (Divider, HStack, Heading, Item, Text, VStack) | aligned |
-| `apps/desktop/src/renderer/settings/settings-skeleton.tsx` | settings-module | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `apps/desktop/src/renderer/settings/settings-skeleton.tsx` | settings-module | Skeleton | aligned — uses Astryx (Skeleton) | aligned |
 | `apps/desktop/src/renderer/settings/settings-status-summary-filter.tsx` | settings-module | Button | aligned — uses Astryx (Button) | aligned |
-| `apps/desktop/src/renderer/settings/settings-surface.tsx` | settings-module | Badge, Banner, Button, IconButton, Layout, LayoutContent, LayoutHeader, LayoutPanel, Selector, SideNav | aligned — uses Astryx (Badge, Banner, Button, IconButton, Layout, LayoutContent, LayoutHeader, LayoutPanel) | aligned |
-| `apps/desktop/src/renderer/settings/subagent-settings-page.tsx` | settings-page | Badge, Banner, Button, EmptyState, HStack, IconButton, Selector, VStack | aligned — uses Astryx (Badge, Banner, Button, EmptyState, HStack, IconButton, Selector, VStack) | aligned |
-| `apps/desktop/src/renderer/settings/tasks-settings-page.tsx` | settings-page | Button, EmptyState, HStack, List, ListItem, TextInput | aligned — uses Astryx (Button, EmptyState, HStack, List, ListItem, TextInput) | aligned |
-| `apps/desktop/src/renderer/settings/usage-settings-page.tsx` | settings-page | Banner, Button, Card, EmptyState, SegmentedControl, SegmentedControlItem, Selector, Tab, TabList | aligned — uses Astryx (Banner, Button, Card, EmptyState, SegmentedControl, SegmentedControlItem, Selector, Tab) | aligned |
-| `apps/desktop/src/renderer/settings/web-search-settings-page.tsx` | settings-page | Banner, Button, EmptyState, Selector | aligned — uses Astryx (Banner, Button, EmptyState, Selector) | aligned |
+| `apps/desktop/src/renderer/settings/settings-surface.tsx` | settings-module | Badge, Banner, Button, IconButton, Layout, LayoutContent, LayoutHeader, LayoutPanel, Selector, SideNav, SideNavItem, SideNavSection | aligned — uses Astryx (Badge, Banner, Button, IconButton, Layout, LayoutContent, LayoutHeader, LayoutPanel) | aligned |
+| `apps/desktop/src/renderer/settings/subagent-settings-page.tsx` | settings-page | Badge, Banner, Button, EmptyState, HStack, IconButton, Selector, Switch, TextArea, TextInput, VStack | aligned — uses Astryx (Badge, Banner, Button, EmptyState, HStack, IconButton, Selector, Switch) | aligned |
+| `apps/desktop/src/renderer/settings/tasks-settings-page.tsx` | settings-page | Button, EmptyState, HStack, List, ListItem, MoreMenu, StackItem, TextInput | aligned — uses Astryx (Button, EmptyState, HStack, List, ListItem, MoreMenu, StackItem, TextInput) | aligned |
+| `apps/desktop/src/renderer/settings/usage-settings-page.tsx` | settings-page | Banner, Button, Card, EmptyState, SegmentedControl, SegmentedControlItem, Selector, Switch, Tab, TabList, Table, TextInput | aligned — uses Astryx (Banner, Button, Card, EmptyState, SegmentedControl, SegmentedControlItem, Selector, Switch) | aligned |
+| `apps/desktop/src/renderer/settings/web-search-settings-page.tsx` | settings-page | Banner, Button, EmptyState, Link, Selector, StatusDot, Switch, TextInput | aligned — uses Astryx (Banner, Button, EmptyState, Link, Selector, StatusDot, Switch, TextInput) | aligned |
 | `apps/desktop/src/renderer/styles.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/agent-graph.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/astryx-mount.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
@@ -194,70 +195,71 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/styles/workbar/terminal.css` | shell-chrome-or-panel | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/styles/workhub.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/work-board-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, Spinner, TextInput | aligned — uses Astryx (Banner, Button, EmptyState, Spinner, TextInput) | aligned |
-| `apps/desktop/src/renderer/workhub-surface.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
-| `packages/ui/src/astryx-chat-reasoning.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/astryx-i18n.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `apps/desktop/src/renderer/workhub-surface.tsx` | other | Button, ChatMessage, ChatMessageBubble, ChatMessageList, Skeleton | aligned — uses Astryx (Button, ChatMessage, ChatMessageBubble, ChatMessageList, Skeleton) | aligned |
+| `packages/ui/src/astryx-chat-reasoning.tsx` | shell-chrome-or-panel | Icon | aligned — uses Astryx (Icon) | aligned |
+| `packages/ui/src/astryx-i18n.tsx` | ui-composition | InternationalizationProvider | aligned — uses Astryx (InternationalizationProvider) | aligned |
 | `packages/ui/src/attachment-image.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/attachment-kinds.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `packages/ui/src/attachment-kinds.tsx` | ui-composition | Icon | aligned — uses Astryx (Icon) | aligned |
 | `packages/ui/src/bot-brand-logo.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/capability-audit-strip.tsx` | ui-composition | Banner | aligned — uses Astryx (Banner) | aligned |
 | `packages/ui/src/chat-empty-hero.tsx` | shell-chrome-or-panel | Item | aligned — uses Astryx (Item) | aligned |
-| `packages/ui/src/chat-model-switcher.tsx` | shell-chrome-or-panel | Button | aligned — uses Astryx (Button) | aligned |
+| `packages/ui/src/chat-model-switcher.tsx` | shell-chrome-or-panel | Button, DropdownMenu, DropdownMenuItem | aligned — uses Astryx (Button, DropdownMenu, DropdownMenuItem) | aligned |
 | `packages/ui/src/chat-surface-layout.tsx` | shell-chrome-or-panel | ChatLayout | aligned — uses Astryx (ChatLayout) | aligned |
-| `packages/ui/src/chat-turn.tsx` | shell-chrome-or-panel | Badge, Banner, Button, HStack, IconButton, Spinner, Token, Tooltip | aligned — uses Astryx (Badge, Banner, Button, HStack, IconButton, Spinner, Token, Tooltip) | aligned |
-| `packages/ui/src/chat-view.tsx` | shell-chrome-or-panel | Button, EmptyState, HStack, Spinner, Text | aligned — uses Astryx (Button, EmptyState, HStack, Spinner, Text) | aligned |
+| `packages/ui/src/chat-turn.tsx` | shell-chrome-or-panel | Badge, Banner, Button, ChatMessage, ChatMessageBubble, ChatMessageMetadata, ChatSystemMessage, ChatTokenizedText, HStack, IconButton, Spinner, Thumbnail, Timestamp, Token, Tooltip | aligned — uses Astryx (Badge, Banner, Button, ChatMessage, ChatMessageBubble, ChatMessageMetadata, ChatSystemMessage, ChatTokenizedText) | aligned |
+| `packages/ui/src/chat-view.tsx` | shell-chrome-or-panel | Button, ButtonGroup, ChatMessageList, EmptyState, HStack, Spinner, Text | aligned — uses Astryx (Button, ButtonGroup, ChatMessageList, EmptyState, HStack, Spinner, Text) | aligned |
 | `packages/ui/src/components.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/composer-message-queue.tsx` | shell-chrome-or-panel | Button, IconButton, List, ListItem | raw `<textarea` (API Use-the-System) | polish |
-| `packages/ui/src/composer.tsx` | shell-chrome-or-panel | Button, ChatComposer, IconButton, Lightbox, Token, Tooltip | aligned — uses Astryx (Button, ChatComposer, IconButton, Lightbox, Token, Tooltip) | aligned |
-| `packages/ui/src/daily-review-panel.tsx` | module-hub | Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem, SegmentedControl, SegmentedControlItem, Text, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem) | aligned |
+| `packages/ui/src/composer.tsx` | shell-chrome-or-panel | Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, IconButton, Lightbox, Token, Tooltip | aligned — uses Astryx (Button, ChatComposer, ChatComposerDrawer, ChatComposerInput, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuDivider, DropdownMenuItem) | aligned |
+| `packages/ui/src/daily-review-panel.tsx` | module-hub | Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem, SegmentedControl, SegmentedControlItem, Skeleton, StackItem, Text, Toolbar, VStack | aligned — uses Astryx (Banner, Button, Divider, EmptyState, HStack, Heading, List, ListItem) | aligned |
 | `packages/ui/src/icons.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/inline-reference.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `packages/ui/src/inline-reference.tsx` | ui-composition | ChatTokenizedText | aligned — uses Astryx (ChatTokenizedText) | aligned |
 | `packages/ui/src/inline-rename-input.tsx` | ui-composition | TextInput | aligned — uses Astryx (TextInput) | aligned |
 | `packages/ui/src/locale-context.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/maka-wordmark.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/markdown-body.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `packages/ui/src/markdown-body.tsx` | ui-composition | CodeBlock, Link, Markdown | aligned — uses Astryx (CodeBlock, Link, Markdown) | aligned |
 | `packages/ui/src/markdown-math.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/markdown.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/mermaid-diagram.tsx` | ui-composition | Button, Collapsible, Dialog, IconButton, Toolbar | aligned — uses Astryx (Button, Collapsible, Dialog, IconButton, Toolbar) | aligned |
-| `packages/ui/src/model-picker.tsx` | ui-composition | Selector | aligned — uses Astryx (Selector) | aligned |
+| `packages/ui/src/mermaid-diagram.tsx` | ui-composition | Button, CodeBlock, Collapsible, Dialog, IconButton, Toolbar | aligned — uses Astryx (Button, CodeBlock, Collapsible, Dialog, IconButton, Toolbar) | aligned |
+| `packages/ui/src/model-picker.tsx` | ui-composition | Selector, SelectorOption | aligned — uses Astryx (Selector, SelectorOption) | aligned |
 | `packages/ui/src/module-hub-selector.tsx` | ui-composition | Tab, TabList | aligned — uses Astryx (Tab, TabList) | aligned |
 | `packages/ui/src/module-pages.tsx` | ui-composition | EmptyState, Spinner | aligned — uses Astryx (EmptyState, Spinner) | aligned |
-| `packages/ui/src/permission-mode-menu.tsx` | ui-composition | Selector | aligned — uses Astryx (Selector) | aligned |
+| `packages/ui/src/permission-mode-menu.tsx` | ui-composition | DropdownMenu, DropdownMenuRadioGroup, DropdownMenuRadioItem, Selector, SelectorOption | aligned — uses Astryx (DropdownMenu, DropdownMenuRadioGroup, DropdownMenuRadioItem, Selector, SelectorOption) | aligned |
 | `packages/ui/src/primitives/chat.tsx` | primitive | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/primitives/module-page.tsx` | primitive | Dialog, DialogHeader, HStack, Heading, Layout, LayoutContent, LayoutHeader, LayoutPanel, ResizeHandle, Text, VStack | aligned — uses Astryx (Dialog, DialogHeader, HStack, Heading, Layout, LayoutContent, LayoutHeader, LayoutPanel) | aligned |
+| `packages/ui/src/primitives/module-page.tsx` | primitive | Dialog, DialogHeader, HStack, Heading, Layout, LayoutContent, LayoutHeader, LayoutPanel, ResizeHandle, StackItem, Text, VStack | aligned — uses Astryx (Dialog, DialogHeader, HStack, Heading, Layout, LayoutContent, LayoutHeader, LayoutPanel) | aligned |
 | `packages/ui/src/primitives/page-header.tsx` | primitive | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/primitives/stat-tile.tsx` | primitive | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/prompt-anchor-rail.tsx` | ui-composition | Button | aligned — uses Astryx (Button) | aligned |
+| `packages/ui/src/prompt-anchor-rail.tsx` | ui-composition | Button, HoverCard | aligned — uses Astryx (Button, HoverCard) | aligned |
 | `packages/ui/src/quote-ref-chip.tsx` | ui-composition | Button, IconButton | aligned — uses Astryx (Button, IconButton) | aligned |
 | `packages/ui/src/relative-time.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `packages/ui/src/sandbox-boundary-prompt.tsx` | ui-composition | Button | aligned — uses Astryx (Button) | aligned |
-| `packages/ui/src/scheduled-task-form-dialog.tsx` | module-hub | Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, Selector, Text, TextInput | aligned — uses Astryx (Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, Selector, Text) | aligned |
-| `packages/ui/src/scheduled-task-inspector.tsx` | module-hub | Button, Divider, HStack, Heading, List, ListItem, MetadataList, MetadataListItem, Switch, Text, VStack | aligned — uses Astryx (Button, Divider, HStack, Heading, List, ListItem, MetadataList, MetadataListItem) | aligned |
-| `packages/ui/src/scheduled-task-panel.tsx` | module-hub | Button, Divider, EmptyState, List, ListItem, SegmentedControl, SegmentedControlItem, Selector, Text, TextInput, Toolbar | aligned — uses Astryx (Button, Divider, EmptyState, List, ListItem, SegmentedControl, SegmentedControlItem, Selector) | aligned |
-| `packages/ui/src/search-modal.tsx` | dialog-overlay | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/session-context-layer.tsx` | shell-chrome-or-panel | BreadcrumbItem, Breadcrumbs, IconButton, LayoutHeader, Text, Token, Tooltip | aligned — uses Astryx (BreadcrumbItem, Breadcrumbs, IconButton, LayoutHeader, Text, Token, Tooltip) | aligned |
-| `packages/ui/src/session-history-list.tsx` | shell-chrome-or-panel | Badge, VStack | aligned — uses Astryx (Badge, VStack) | aligned |
+| `packages/ui/src/scheduled-task-form-dialog.tsx` | module-hub | Button, DateTimeInput, Dialog, DialogHeader, DropdownMenu, DropdownMenuItem, FormLayout, HStack, Layout, LayoutContent, LayoutFooter, Selector, Text, TextArea, TextInput | aligned — uses Astryx (Button, DateTimeInput, Dialog, DialogHeader, DropdownMenu, DropdownMenuItem, FormLayout, HStack) | aligned |
+| `packages/ui/src/scheduled-task-inspector.tsx` | module-hub | Button, Divider, HStack, Heading, List, ListItem, MetadataList, MetadataListItem, StackItem, StatusDot, Switch, Text, VStack | aligned — uses Astryx (Button, Divider, HStack, Heading, List, ListItem, MetadataList, MetadataListItem) | aligned |
+| `packages/ui/src/scheduled-task-panel.tsx` | module-hub | Button, Divider, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuItem, EmptyState, List, ListItem, SegmentedControl, SegmentedControlItem, Selector, StatusDot, Text, TextInput, Toolbar | aligned — uses Astryx (Button, Divider, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuItem, EmptyState, List, ListItem) | aligned |
+| `packages/ui/src/search-modal.tsx` | dialog-overlay | CommandPalette, CommandPaletteFooter, CommandPaletteInput | aligned — uses Astryx (CommandPalette, CommandPaletteFooter, CommandPaletteInput) | aligned |
+| `packages/ui/src/session-context-layer.tsx` | shell-chrome-or-panel | BreadcrumbItem, Breadcrumbs, ButtonGroup, Icon, IconButton, LayoutHeader, MoreMenu, OverflowList, StatusDot, Text, Token, Tooltip | aligned — uses Astryx (BreadcrumbItem, Breadcrumbs, ButtonGroup, Icon, IconButton, LayoutHeader, MoreMenu, OverflowList) | aligned |
+| `packages/ui/src/session-history-list.tsx` | shell-chrome-or-panel | Badge, MoreMenu, SideNavItem, SideNavSection, StatusDot, VStack | aligned — uses Astryx (Badge, MoreMenu, SideNavItem, SideNavSection, StatusDot, VStack) | aligned |
 | `packages/ui/src/session-list-panel.tsx` | shell-chrome-or-panel | SegmentedControl, SegmentedControlItem, SideNav | aligned — uses Astryx (SegmentedControl, SegmentedControlItem, SideNav) | aligned |
 | `packages/ui/src/session-rail-context.tsx` | shell-chrome-or-panel | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/session-rename-dialog.tsx` | dialog-overlay | Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, TextInput | aligned — uses Astryx (Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, TextInput) | aligned |
-| `packages/ui/src/session-sidebar-nav.tsx` | shell-chrome-or-panel | IconButton, Tooltip | aligned — uses Astryx (IconButton, Tooltip) | aligned |
-| `packages/ui/src/skill-inspector.tsx` | shell-chrome-or-panel | Button, Divider, HStack, Heading, MetadataList, MetadataListItem, Switch, Text, VStack | aligned — uses Astryx (Button, Divider, HStack, Heading, MetadataList, MetadataListItem, Switch, Text) | aligned |
-| `packages/ui/src/skills-panel.tsx` | module-hub | Button, EmptyState, IconButton, List, ListItem, SegmentedControl, SegmentedControlItem, Selector, Text, TextInput, Toolbar | aligned — uses Astryx (Button, EmptyState, IconButton, List, ListItem, SegmentedControl, SegmentedControlItem, Selector) | aligned |
+| `packages/ui/src/session-rename-dialog.tsx` | dialog-overlay | Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter, TextInput | aligned — uses Astryx (Button, Dialog, DialogHeader, HStack, Layout, LayoutContent, LayoutFooter, TextInput) | aligned |
+| `packages/ui/src/session-sidebar-nav.tsx` | shell-chrome-or-panel | Icon, IconButton, SideNavItem, SideNavSection, Tooltip | aligned — uses Astryx (Icon, IconButton, SideNavItem, SideNavSection, Tooltip) | aligned |
+| `packages/ui/src/skill-inspector.tsx` | shell-chrome-or-panel | Button, Divider, HStack, Heading, MetadataList, MetadataListItem, StackItem, StatusDot, Switch, Text, VStack | aligned — uses Astryx (Button, Divider, HStack, Heading, MetadataList, MetadataListItem, StackItem, StatusDot) | aligned |
+| `packages/ui/src/skills-panel.tsx` | module-hub | Button, DropdownMenu, DropdownMenuItem, EmptyState, IconButton, List, ListItem, SegmentedControl, SegmentedControlItem, Selector, StatusDot, Text, TextInput, Toolbar | aligned — uses Astryx (Button, DropdownMenu, DropdownMenuItem, EmptyState, IconButton, List, ListItem, SegmentedControl) | aligned |
 | `packages/ui/src/styles.css` | ui-composition | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `packages/ui/src/task-ledger-panel.tsx` | shell-chrome-or-panel | Banner, Collapsible, EmptyState, IconButton, Spinner | aligned — uses Astryx (Banner, Collapsible, EmptyState, IconButton, Spinner) | aligned |
-| `packages/ui/src/titlebar-session-identity.tsx` | shell-chrome-or-panel | BreadcrumbItem, Breadcrumbs, IconButton, Tooltip | aligned — uses Astryx (BreadcrumbItem, Breadcrumbs, IconButton, Tooltip) | aligned |
-| `packages/ui/src/toast.tsx` | ui-composition | Button, HStack, Text, VStack | aligned — uses Astryx (Button, HStack, Text, VStack) | aligned |
-| `packages/ui/src/tool-activity.tsx` | ui-composition | Banner, Button, ChatToolCalls, List, ListItem, Text | aligned — uses Astryx (Banner, Button, ChatToolCalls, List, ListItem, Text) | aligned |
+| `packages/ui/src/titlebar-session-identity.tsx` | shell-chrome-or-panel | BreadcrumbItem, Breadcrumbs, Icon, IconButton, Tooltip | aligned — uses Astryx (BreadcrumbItem, Breadcrumbs, Icon, IconButton, Tooltip) | aligned |
+| `packages/ui/src/toast.tsx` | ui-composition | AlertDialog, Button, HStack, LayerProvider, Text, VStack | aligned — uses Astryx (AlertDialog, Button, HStack, LayerProvider, Text, VStack) | aligned |
+| `packages/ui/src/tool-activity.tsx` | ui-composition | Banner, Button, ChatToolCalls, List, ListItem, StatusDot, Text, VisuallyHidden | aligned — uses Astryx (Banner, Button, ChatToolCalls, List, ListItem, StatusDot, Text, VisuallyHidden) | aligned |
 | `packages/ui/src/tool-activity/diff-code-preview.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/tool-activity/tool-code-block.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/tool-activity/tool-result-preview.tsx` | ui-composition | Button | aligned — uses Astryx (Button) | aligned |
-| `packages/ui/src/transcript-scroll-authority.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `packages/ui/src/tool-activity/tool-code-block.tsx` | ui-composition | CodeBlock | aligned — uses Astryx (CodeBlock) | aligned |
+| `packages/ui/src/tool-activity/tool-result-preview.tsx` | ui-composition | Button, Link | aligned — uses Astryx (Button, Link) | aligned |
+| `packages/ui/src/transcript-scroll-authority.tsx` | ui-composition | ChatLayoutScrollButton | aligned — uses Astryx (ChatLayoutScrollButton) | aligned |
 | `packages/ui/src/ui.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
-| `packages/ui/src/user-question-prompt.tsx` | ui-composition | Button, TextInput | aligned — uses Astryx (Button, TextInput) | aligned |
-| `packages/ui/src/workspace-picker.tsx` | ui-composition | none | aligned — no raw controls; no Astryx JSX usage | aligned |
+| `packages/ui/src/user-question-prompt.tsx` | ui-composition | Button, RadioList, RadioListItem, TextInput | aligned — uses Astryx (Button, RadioList, RadioListItem, TextInput) | aligned |
+| `packages/ui/src/workspace-picker.tsx` | ui-composition | DropdownMenu, DropdownMenuItem | aligned — uses Astryx (DropdownMenu, DropdownMenuItem) | aligned |
 
 ## Severity legend
 
 - **blocker** — raw interactive control with an Astryx twin available (`button`/`input`/`select`).
+- **reimplementation** — a public `@maka/ui` export shadows a shipped Astryx component (same name, not a re-export). A neutral signal for review, not proof of a semantic re-implementation.
 - **polish** — off-rhythm control heights or softer smells; not wrong primitive choice.
 - **aligned** — no blocker smell found; Astryx usage noted when present.
diff --git a/package.json b/package.json
index f171851d5c..762424ce31 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "astryx:theme": "node scripts/build-astryx-theme.mjs",
     "astryx:surface-inventory": "node scripts/check-astryx-surface-inventory.mjs",
     "astryx:surface-inventory:write": "node scripts/generate-astryx-surface-inventory.mjs",
+    "astryx:surface-inventory:test": "node --test scripts/generate-astryx-surface-inventory.test.mjs",
     "sync:model-metadata": "node scripts/sync-model-metadata.mjs",
     "refresh:model-metadata": "node scripts/sync-model-metadata.mjs --refresh",
     "check:model-metadata": "node scripts/sync-model-metadata.mjs --check",
diff --git a/scripts/ci-test-plan.test.mjs b/scripts/ci-test-plan.test.mjs
index c6c0adb5a0..a657ab3450 100644
--- a/scripts/ci-test-plan.test.mjs
+++ b/scripts/ci-test-plan.test.mjs
@@ -325,6 +325,20 @@ test('core CI checks the Astryx inventory for every code change before building'
   assert.doesNotMatch(inventoryStep, /continue-on-error/u);
 });
 
+test('CI installs dependencies whenever the Astryx surface inventory runs', () => {
+  const workflow = readWorkflow('ci.yml');
+  // The inventory step imports the generator, which resolves @astryxdesign/core
+  // and parses the @maka/ui barrel. An inventory-doc-only PR is `astryx_surface`
+  // without `code`, so the `npm ci` step must gate on astryx_surface too — else
+  // the generator runs with no dependencies installed and fails closed.
+  const npmCi = workflow.indexOf('run: npm ci');
+  assert.ok(npmCi >= 0, 'expected an `npm ci` install step');
+  const stepStart = workflow.lastIndexOf('\n      - name:', npmCi) + 1;
+  const stepEnd = workflow.indexOf('\n      - ', npmCi);
+  const installStep = workflow.slice(stepStart, stepEnd);
+  assert.match(installStep, /steps\.plan\.outputs\.astryx_surface == 'true'/u);
+});
+
 test('core CI validates affected installed CLI packages on its existing runner', () => {
   const workflow = readWorkflow('ci.yml');
   const toolchain = workflow.indexOf(
diff --git a/scripts/generate-astryx-surface-inventory.mjs b/scripts/generate-astryx-surface-inventory.mjs
index 093938f21e..076e7753bd 100644
--- a/scripts/generate-astryx-surface-inventory.mjs
+++ b/scripts/generate-astryx-surface-inventory.mjs
@@ -22,12 +22,19 @@
  * Enumerates every product UI surface file and emits a file-level Astryx-fit
  * inventory (markdown + machine-readable path list).
  *
+ * Both the known Astryx component set and the `@maka/ui` re-export map are
+ * derived from source at generation time (never hand-maintained), and the
+ * derivation is fail-closed: any unresolved barrel target, a version that does
+ * not match the pinned dependency, or a suspiciously small parse aborts the run
+ * rather than emitting a partial inventory (see #3868).
+ *
  * Run: node scripts/generate-astryx-surface-inventory.mjs
  * Writes: docs/astryx-surface-file-inventory.md
  *         docs/astryx-surface-file-inventory.paths
  */
-import { readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
-import { join, relative } from 'node:path';
+import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
 const root = join(fileURLToPath(new URL('..', import.meta.url)));
@@ -59,72 +66,321 @@ export const EXCLUDE_BASENAME = [
   { re: /^use-.*\.ts$/, reason: 'hook implementation (UI is in consumer tsx)' },
 ];
 
-/** Canonical Astryx component names we care about for inventory. */
-const ASTRYX_COMPONENTS = new Set([
+const NAMED_COMPONENT_RE = /^[A-Z][A-Za-z0-9]*$/;
+
+/**
+ * Sanity floor for the derived Astryx set plus a few components that must be
+ * present. If the declaration parse regresses to a partial result, these
+ * assertions turn it into a hard failure instead of a quietly shrunk inventory.
+ */
+const MIN_ASTRYX_COMPONENTS = 150;
+const KEY_ASTRYX_COMPONENTS = [
   'Button',
-  'IconButton',
   'TextInput',
   'Selector',
-  'List',
-  'ListItem',
-  'Item',
+  'Text',
+  'Card',
   'EmptyState',
-  'Spinner',
-  'Banner',
   'Dialog',
-  'DialogHeader',
-  'Layout',
-  'LayoutContent',
-  'LayoutHeader',
-  'LayoutPanel',
-  'Card',
-  'Section',
-  'Collapsible',
-  'ToggleButton',
-  'SegmentedControl',
-  'SegmentedControlItem',
-  'Heading',
-  'Text',
-  'HStack',
-  'VStack',
-  'Toolbar',
-  'Badge',
-  'Tooltip',
-  'CheckboxInput',
-  'Switch',
-  'Breadcrumbs',
-  'BreadcrumbItem',
-  'SideNav',
-  'AppShell',
-  'Token',
-  'Lightbox',
-  'ChatComposer',
-  'ChatLayout',
-  'ChatToolCalls',
-  'Divider',
-  'MetadataList',
-  'MetadataListItem',
-  'TabList',
-  'Tab',
-  'ContextMenu',
-  'ResizeHandle',
-]);
+  'Timestamp',
+  'ChatMessage',
+  'Thumbnail',
+];
+
+function stripComments(src) {
+  return src.replace(/\/\*[\s\S]*?\*\//g, ' ').replace(/(^|[^:])\/\/.*$/gm, '$1');
+}
+
+/** Add PascalCase value exports from one `.d.ts` block to `into`. */
+function collectDeclaredComponents(block, into) {
+  // export { A, B as C, type D } → A, C (skip type-only, *Props, *Context)
+  for (const m of block.matchAll(/export\s*\{([^}]*)\}/g)) {
+    for (const raw of m[1].split(',')) {
+      const part = raw.trim();
+      if (!part || /^type\s/.test(part)) continue;
+      const asMatch = part.match(/\bas\s+([A-Za-z0-9_]+)$/);
+      const name = asMatch ? asMatch[1] : part.split(/\s+/)[0];
+      if (NAMED_COMPONENT_RE.test(name) && !name.endsWith('Props') && !name.endsWith('Context')) {
+        into.add(name);
+      }
+    }
+  }
+  // export declare const|function|class Name
+  for (const m of block.matchAll(
+    /export\s+declare\s+(?:const|function|class)\s+([A-Za-z0-9_]+)/g,
+  )) {
+    if (NAMED_COMPONENT_RE.test(m[1])) into.add(m[1]);
+  }
+}
+
+/** The exact `@astryxdesign/core` version pinned in the repo's root manifest. */
+function pinnedAstryxVersion(repoRoot) {
+  const pkg = JSON.parse(readFileSync(join(repoRoot, 'package.json'), 'utf8'));
+  const deps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) };
+  const pin = deps['@astryxdesign/core'];
+  return pin ? pin.replace(/^[\^~=]/, '') : null;
+}
+
+let astryxComponentsCache = null;
 
 /**
- * @maka/ui barrel names that re-export Astryx (not lucide icons, not product-only).
- * Keep narrow — icons.tsx is lucide-only and must stay astryx=none.
+ * Read one declaration file, fold its PascalCase component exports into `set`,
+ * then recurse through every `export * from './rel'` it declares. Barrel targets
+ * resolve relative to the file's own directory, so a nested
+ * `dist/Group/index.d.ts` → `export * from './Sub'` reads `dist/Group/Sub/…` —
+ * the full barrel graph, not just the first layer. Fail-closed: an unreadable
+ * file or an unresolved relative target throws rather than silently shrinking
+ * the set. `seen` guards import cycles and repeated reads.
  */
-const MAKA_UI_ASTRYX_REEXPORTS = new Set([
-  'Badge',
-  'Selector',
-  'Card',
-  'Button',
-  'IconButton',
-  'Spinner',
-  'EmptyState',
-  'Tooltip',
-  'Banner',
-]);
+function collectDistBarrel(file, set, seen) {
+  if (seen.has(file)) return;
+  seen.add(file);
+  let src;
+  try {
+    src = readFileSync(file, 'utf8');
+  } catch {
+    throw new Error(
+      `cannot derive Astryx component set: ${relative(root, file)} is unreadable — reinstall @astryxdesign/core`,
+    );
+  }
+  collectDeclaredComponents(src, set);
+  const dir = dirname(file);
+  for (const m of src.matchAll(/export\s*\*\s*from\s*['"](\.[^'"]*)['"]/g)) {
+    const spec = m[1]; // any relative barrel: './Dir', '../Sibling', …
+    const base = resolve(dir, spec);
+    const dirIndex = join(base, 'index.d.ts');
+    const flat = `${base}.d.ts`;
+    if (existsSync(dirIndex)) collectDistBarrel(dirIndex, set, seen);
+    else if (existsSync(flat)) collectDistBarrel(flat, set, seen);
+    else
+      throw new Error(
+        `cannot derive Astryx component set: unresolved \`export * from '${spec}'\` in ${relative(root, file)} — reinstall @astryxdesign/core`,
+      );
+  }
+}
+
+/**
+ * Parse an `@astryxdesign/core` `dist` directory into its set of PascalCase
+ * component exports: `dist/index.d.ts` plus every per-dir `index.d.ts` (or flat
+ * `Dir.d.ts`) reachable through the `export * from './Dir'` barrel graph,
+ * traversed recursively so a future multi-level barrel cannot silently drop
+ * components. Fail-closed — an unresolved barrel target throws rather than
+ * quietly shrinking the set. Pure (no memo, no version check) so it is
+ * unit-testable against fixture declaration dirs.
+ */
+export function parseAstryxDistComponents(distDir) {
+  const set = new Set();
+  collectDistBarrel(join(distDir, 'index.d.ts'), set, new Set());
+  return set;
+}
+
+/**
+ * Reject a suspiciously small or key-component-missing parse. Turns a partial
+ * declaration read into a hard failure instead of a quietly shrunk inventory.
+ */
+export function assertAstryxComponentSet(set, version) {
+  if (set.size < MIN_ASTRYX_COMPONENTS) {
+    throw new Error(
+      `Astryx component parse looks incomplete: derived ${set.size} components (< ${MIN_ASTRYX_COMPONENTS}) from @astryxdesign/core@${version}`,
+    );
+  }
+  const missing = KEY_ASTRYX_COMPONENTS.filter((name) => !set.has(name));
+  if (missing.length > 0) {
+    throw new Error(
+      `Astryx component parse is missing expected components: ${missing.join(', ')} — the declaration format may have changed`,
+    );
+  }
+}
+
+/**
+ * Resolve `@astryxdesign/core`, parse its shipped `.d.ts`, and return the
+ * installed version alongside the sorted set of exported component names. We
+ * parse the declarations rather than importing the ESM, because the runtime
+ * has StyleX/CSS side effects a plain `node` import cannot evaluate.
+ *
+ * Fail-closed: an unresolved barrel target, a version that disagrees with the
+ * pinned dependency, or a parse that yields fewer than `MIN_ASTRYX_COMPONENTS`
+ * (or is missing a key component) throws rather than returning a partial set —
+ * a silently incomplete set is exactly the drift #3868 removes. Memoized.
+ */
+export function loadAstryxComponents() {
+  if (astryxComponentsCache) return astryxComponentsCache;
+  const require = createRequire(import.meta.url);
+  let distDir;
+  try {
+    distDir = dirname(require.resolve('@astryxdesign/core'));
+  } catch {
+    throw new Error(
+      'cannot derive Astryx component set: @astryxdesign/core did not resolve — run `npm install` (deps are required to generate the inventory)',
+    );
+  }
+  const pkgPath = join(dirname(distDir), 'package.json');
+  const version = JSON.parse(readFileSync(pkgPath, 'utf8')).version;
+  const pinned = pinnedAstryxVersion(root);
+  if (pinned && pinned !== version) {
+    throw new Error(
+      `Astryx version drift: resolved @astryxdesign/core@${version} but the root package.json pins ${pinned} — regenerate after \`npm ci\``,
+    );
+  }
+  const set = parseAstryxDistComponents(distDir);
+  assertAstryxComponentSet(set, version);
+  astryxComponentsCache = { version, components: new Set([...set].sort()) };
+  return astryxComponentsCache;
+}
+
+/**
+ * Resolve a TypeScript source module referenced by a `.js` import specifier
+ * (Node16 style) to its on-disk `.ts`/`.tsx` (or directory `index`).
+ */
+function resolveSourceModule(fromFile, spec) {
+  const base = resolve(dirname(fromFile), spec.replace(/\.js$/, ''));
+  for (const candidate of [
+    `${base}.ts`,
+    `${base}.tsx`,
+    join(base, 'index.ts'),
+    join(base, 'index.tsx'),
+  ]) {
+    if (existsSync(candidate)) return candidate;
+  }
+  return null;
+}
+
+/**
+ * Resolve the exported names of a source module to their origin:
+ *   { kind: 'astryx', canonical } — (transitively) re-exported from @astryxdesign/core
+ *   { kind: 'local', file }       — defined in `file`
+ *   { kind: 'external' }          — re-exported from a third-party package
+ * Recurses through relative `export *` / `export { … } from './x'` chains and
+ * throws on any unresolved relative target (fail-closed). `memo`/`seen` bound
+ * work and guard import cycles.
+ */
+function collectModuleExports(file, components, memo, seen) {
+  if (memo.has(file)) return memo.get(file);
+  if (seen.has(file)) return new Map();
+  seen.add(file);
+  const out = new Map();
+  const code = stripComments(readFileSync(file, 'utf8'));
+
+  // Local bindings imported from Astryx, so a bare `export { X }` can be classified.
+  const astryxLocalToOrig = new Map();
+  for (const m of code.matchAll(
+    /import\s*\{([^}]+)\}\s*from\s*['"]@astryxdesign\/core[^'"]*['"]/g,
+  )) {
+    for (const raw of m[1].split(',')) {
+      const part = raw.trim().replace(/^type\s+/, '');
+      if (!part) continue;
+      const asMatch = part.match(/^(\w+)\s+as\s+(\w+)$/);
+      const orig = asMatch ? asMatch[1] : part.split(/\s+/)[0];
+      const local = asMatch ? asMatch[2] : orig;
+      if (local) astryxLocalToOrig.set(local, orig);
+    }
+  }
+
+  // export * from '<spec>'
+  for (const m of code.matchAll(/export\s*\*\s*from\s*['"]([^'"]+)['"]/g)) {
+    const spec = m[1];
+    if (spec.startsWith('@astryxdesign/core')) {
+      for (const canonical of components) out.set(canonical, { kind: 'astryx', canonical });
+    } else if (spec.startsWith('.')) {
+      const target = resolveSourceModule(file, spec);
+      if (!target) {
+        throw new Error(
+          `cannot resolve @maka/ui exports: unresolved \`export * from '${spec}'\` in ${relative(root, file)}`,
+        );
+      }
+      for (const [name, origin] of collectModuleExports(target, components, memo, seen)) {
+        out.set(name, origin);
+      }
+    }
+    // A non-relative `export *` (e.g. from 'react') re-exports unknowable names;
+    // none is an Astryx twin or a local component, so it cannot shadow one.
+  }
+
+  // export { A, B as C, type D } [from '<spec>']
+  for (const m of code.matchAll(/export\s*\{([^}]*)\}\s*(?:from\s*['"]([^'"]+)['"])?/g)) {
+    const spec = m[2];
+    let relExports = null;
+    if (spec && spec.startsWith('.')) {
+      const target = resolveSourceModule(file, spec);
+      if (!target) {
+        throw new Error(
+          `cannot resolve @maka/ui exports: unresolved \`export { … } from '${spec}'\` in ${relative(root, file)}`,
+        );
+      }
+      relExports = collectModuleExports(target, components, memo, seen);
+    }
+    for (const raw of m[1].split(',')) {
+      const part = raw.trim();
+      if (!part || /^type\s/.test(part)) continue;
+      const asMatch = part.match(/^([A-Za-z0-9_]+)\s+as\s+([A-Za-z0-9_]+)$/);
+      const orig = asMatch ? asMatch[1] : part.split(/\s+/)[0];
+      const pub = asMatch ? asMatch[2] : orig;
+      if (spec && spec.startsWith('@astryxdesign/core')) {
+        out.set(pub, { kind: 'astryx', canonical: orig });
+      } else if (relExports) {
+        out.set(pub, relExports.get(orig) || { kind: 'local', file });
+      } else if (spec) {
+        out.set(pub, { kind: 'external' });
+      } else {
+        out.set(
+          pub,
+          astryxLocalToOrig.has(orig)
+            ? { kind: 'astryx', canonical: astryxLocalToOrig.get(orig) }
+            : { kind: 'local', file },
+        );
+      }
+    }
+  }
+
+  // export const/function/class Name (a local definition)
+  for (const m of code.matchAll(
+    /export\s+(?:async\s+)?(?:const|function|class)\s+([A-Za-z0-9_]+)/g,
+  )) {
+    out.set(m[1], { kind: 'local', file });
+  }
+
+  memo.set(file, out);
+  return out;
+}
+
+const makaUiBarrelCache = new Map();
+
+/**
+ * Resolve the public `@maka/ui` surface (`packages/ui/src/index.ts`) into:
+ *   - `reexports`: Map<publicName, canonicalAstryxName> — every name the barrel
+ *     re-exports (transitively) from @astryxdesign/core. Replaces a hand-written
+ *     list; the "Astryx used" column and the shadow check share this one fact.
+ *   - `shadowsByFile`: Map<repoRelFile, Set<name>> — public exports whose name
+ *     matches a shipped Astryx component but which are defined locally (not a
+ *     re-export). This is the only "reimplementation" signal we assert on: a
+ *     name collision is not proof of a semantic re-implementation, but a public
+ *     API that shadows an Astryx component is worth surfacing in review.
+ * Memoized per repo root; fail-closed via `collectModuleExports`.
+ */
+export function loadMakaUiBarrel(repoRoot = root) {
+  if (makaUiBarrelCache.has(repoRoot)) return makaUiBarrelCache.get(repoRoot);
+  const { components } = loadAstryxComponents();
+  const indexFile = join(repoRoot, 'packages/ui/src/index.ts');
+  if (!existsSync(indexFile)) {
+    throw new Error(`cannot resolve @maka/ui exports: ${relative(repoRoot, indexFile)} not found`);
+  }
+  const exportsMap = collectModuleExports(indexFile, components, new Map(), new Set());
+  const reexports = new Map();
+  const shadowsByFile = new Map();
+  for (const [name, origin] of exportsMap) {
+    if (origin.kind === 'astryx') {
+      reexports.set(name, origin.canonical);
+    } else if (origin.kind === 'local' && origin.file && components.has(name)) {
+      const rel = relative(repoRoot, origin.file).replaceAll('\\', '/');
+      if (!shadowsByFile.has(rel)) shadowsByFile.set(rel, new Set());
+      shadowsByFile.get(rel).add(name);
+    }
+  }
+  const result = { reexports, shadowsByFile };
+  makaUiBarrelCache.set(repoRoot, result);
+  return result;
+}
+
 const RAW_BUTTON_RE = /<\s*button\b/;
 const RAW_INPUT_RE = /<\s*input\b/;
 const RAW_SELECT_RE = /<\s*select\b/;
@@ -210,52 +466,35 @@ function roleFor(rel) {
   return 'other';
 }
 
-function stripComments(src) {
-  return src.replace(/\/\*[\s\S]*?\*\//g, ' ').replace(/(^|[^:])\/\/.*$/gm, '$1');
-}
-
 /**
- * Collect Astryx component names from real imports + JSX only (never comments).
+ * Collect Astryx component names used in a file from real imports + JSX only.
  * - import { Button as UiButton } from '@astryxdesign/core' → Button (canonical)
- * - import { Badge } from '@maka/ui' when Badge is a known Astryx re-export
+ * - import { Badge } from '@maka/ui' when Badge is a derived Astryx re-export
  * - <Button / <UiButton only counts if bound from those imports
  */
-function collectAstryxUsage(code) {
-  const localToCanonical = new Map(); // local binding → canonical name
-  const used = new Set();
+function collectAstryxUsage(code, astryxComponents, makaUiReexports) {
+  const localToCanonical = new Map(); // local binding → canonical Astryx name
 
-  // import { A, B as C } from '@astryxdesign/core...'  (and /subdir)
+  // import { A, B as C } from '@astryxdesign/core...'  or from the '@maka/ui' root barrel
   const importBlockRe =
-    /import\s*\{([^}]+)\}\s*from\s*['"](@astryxdesign\/core(?:\/[^'"]+)?|@maka\/ui(?:\/[^'"]+)?)['"]/g;
+    /import\s*\{([^}]+)\}\s*from\s*['"](@astryxdesign\/core(?:\/[^'"]+)?|@maka\/ui)['"]/g;
   let im;
   while ((im = importBlockRe.exec(code)) !== null) {
     const spec = im[1];
     const from = im[2];
     const isAstryxPkg = from.startsWith('@astryxdesign/core');
-    const isMakaUiRoot = from === '@maka/ui';
     for (const part of spec.split(',')) {
       const bit = part.trim();
       if (!bit) continue;
-      // type imports: type Foo
       const cleaned = bit.replace(/^type\s+/, '').trim();
       if (!cleaned || cleaned === 'type') continue;
       const asMatch = cleaned.match(/^(\w+)\s+as\s+(\w+)$/);
-      let original;
-      let local;
-      if (asMatch) {
-        original = asMatch[1];
-        local = asMatch[2];
-      } else {
-        original = cleaned.split(/\s+/)[0];
-        local = original;
-      }
-      if (isAstryxPkg && ASTRYX_COMPONENTS.has(original)) {
-        localToCanonical.set(local, original);
-        used.add(original); // imported = available; count as used if also JSX or always?
-        // Import alone is enough to claim the primitive is in the dependency set;
-        // prefer also requiring JSX below for "uses".
-      } else if (isMakaUiRoot && MAKA_UI_ASTRYX_REEXPORTS.has(original)) {
+      const original = asMatch ? asMatch[1] : cleaned.split(/\s+/)[0];
+      const local = asMatch ? asMatch[2] : original;
+      if (isAstryxPkg && astryxComponents.has(original)) {
         localToCanonical.set(local, original);
+      } else if (!isAstryxPkg && makaUiReexports.has(original)) {
+        localToCanonical.set(local, makaUiReexports.get(original));
       }
     }
   }
@@ -266,9 +505,7 @@ function collectAstryxUsage(code) {
   while ((dm = defaultRe.exec(code)) !== null) {
     const local = dm[1];
     const sub = (dm[2] || '').split('/')[0];
-    if (sub && ASTRYX_COMPONENTS.has(sub)) {
-      localToCanonical.set(local, sub);
-    }
+    if (sub && astryxComponents.has(sub)) localToCanonical.set(local, sub);
   }
 
   // JSX: <LocalName or <LocalName.
@@ -277,19 +514,16 @@ function collectAstryxUsage(code) {
   let jx;
   while ((jx = jsxRe.exec(code)) !== null) {
     const local = jx[1];
-    if (localToCanonical.has(local)) {
-      jsxUsed.add(localToCanonical.get(local));
-    }
+    if (localToCanonical.has(local)) jsxUsed.add(localToCanonical.get(local));
   }
-
-  // "Uses" = appeared in JSX with a binding from Astryx (or maka re-export).
-  // Import-only without JSX does not count (avoids unused import noise).
   return jsxUsed;
 }
 
-function analyzeTsx(rel, text) {
+export function analyzeTsx(rel, text, ctx) {
+  const { astryxComponents, makaUiReexports, shadowNames } = ctx;
   const code = stripComments(text);
-  const named = collectAstryxUsage(code);
+  const named = collectAstryxUsage(code, astryxComponents, makaUiReexports);
+  const shadows = shadowNames ? [...shadowNames].sort() : [];
   const rawButton = RAW_BUTTON_RE.test(code);
   const rawInput = RAW_INPUT_RE.test(code);
   const rawSelect = RAW_SELECT_RE.test(code);
@@ -299,11 +533,15 @@ function analyzeTsx(rel, text) {
   if (rawInput) gaps.push('raw `<input` (API Use-the-System)');
   if (rawSelect) gaps.push('raw `<select` (API Use-the-System)');
   if (rawTextarea) gaps.push('raw `<textarea` (API Use-the-System)');
+  for (const name of shadows) {
+    gaps.push(`public export \`${name}\` shadows Astryx component (not a re-export)`);
+  }
   if (named.size === 0 && (rawButton || rawInput || rawSelect)) {
     gaps.push('no Astryx import/JSX with raw controls (API Use-the-System)');
   }
   let severity = 'aligned';
   if (rawButton || rawInput || rawSelect) severity = 'blocker';
+  else if (shadows.length > 0) severity = 'reimplementation';
   else if (rawTextarea) severity = 'polish';
 
   const note =
@@ -358,7 +596,7 @@ function analyzeCss(rel, text) {
   };
 }
 
-function analyze(repoRoot, rel) {
+function analyze(repoRoot, rel, ctx) {
   const full = join(repoRoot, rel);
   const text = readFileSync(full, 'utf8');
   const role = roleFor(rel);
@@ -366,15 +604,23 @@ function analyze(repoRoot, rel) {
     const a = analyzeCss(rel, text);
     return { path: rel, role, ...a };
   }
-  const a = analyzeTsx(rel, text);
+  const a = analyzeTsx(rel, text, {
+    astryxComponents: ctx.astryxComponents,
+    makaUiReexports: ctx.makaUiReexports,
+    shadowNames: ctx.shadowsByFile.get(rel) || null,
+  });
   return { path: rel, role, ...a };
 }
 
 export function renderAstryxSurfaceInventory(repoRoot = root) {
+  const { version, components } = loadAstryxComponents();
+  const { reexports, shadowsByFile } = loadMakaUiBarrel(repoRoot);
+  const ctx = { astryxComponents: components, makaUiReexports: reexports, shadowsByFile };
+
   const { files, excluded } = listProductSurfaceFiles(repoRoot);
-  const rows = files.map((rel) => analyze(repoRoot, rel));
+  const rows = files.map((rel) => analyze(repoRoot, rel, ctx));
 
-  const bySev = { blocker: 0, polish: 0, aligned: 0 };
+  const bySev = { blocker: 0, reimplementation: 0, polish: 0, aligned: 0 };
   for (const r of rows) bySev[r.severity] = (bySev[r.severity] || 0) + 1;
 
   const lines = [];
@@ -384,11 +630,14 @@ export function renderAstryxSurfaceInventory(repoRoot = root) {
   lines.push(
     'Each row is one on-disk product surface file. Regenerated inventory must stay in sync with disk (coverage gate).',
   );
+  lines.push(
+    `Generated against \`@astryxdesign/core@${version}\` (${components.size} component exports).`,
+  );
   lines.push('');
   lines.push('Wiki bar: Design Conventions · API Use-the-System · Theming · Container Padding.');
   lines.push('');
   lines.push(
-    `**Totals:** ${rows.length} files — blocker ${bySev.blocker}, polish ${bySev.polish}, aligned ${bySev.aligned}.`,
+    `**Totals:** ${rows.length} files — blocker ${bySev.blocker}, reimplementation ${bySev.reimplementation}, polish ${bySev.polish}, aligned ${bySev.aligned}.`,
   );
   lines.push('');
   lines.push('## Exclusions (explicit)');
@@ -431,6 +680,9 @@ export function renderAstryxSurfaceInventory(repoRoot = root) {
   lines.push(
     '- **blocker** — raw interactive control with an Astryx twin available (`button`/`input`/`select`).',
   );
+  lines.push(
+    '- **reimplementation** — a public `@maka/ui` export shadows a shipped Astryx component (same name, not a re-export). A neutral signal for review, not proof of a semantic re-implementation.',
+  );
   lines.push(
     '- **polish** — off-rhythm control heights or softer smells; not wrong primitive choice.',
   );
@@ -444,6 +696,7 @@ export function renderAstryxSurfaceInventory(repoRoot = root) {
     files,
     excluded,
     totals: bySev,
+    version,
   };
 }
 
@@ -456,7 +709,7 @@ function main() {
   console.log(`wrote ${relative(root, mdPath)} (${rendered.files.length} files)`);
   console.log(`wrote ${relative(root, pathsPath)}`);
   console.log(
-    `severity: blocker=${rendered.totals.blocker} polish=${rendered.totals.polish} aligned=${rendered.totals.aligned}`,
+    `astryx @${rendered.version}: blocker=${rendered.totals.blocker} reimplementation=${rendered.totals.reimplementation} polish=${rendered.totals.polish} aligned=${rendered.totals.aligned}`,
   );
 }
 
diff --git a/scripts/generate-astryx-surface-inventory.test.mjs b/scripts/generate-astryx-surface-inventory.test.mjs
new file mode 100644
index 0000000000..d92f104be3
--- /dev/null
+++ b/scripts/generate-astryx-surface-inventory.test.mjs
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import assert from 'node:assert/strict';
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { after, describe, test } from 'node:test';
+
+import {
+  analyzeTsx,
+  assertAstryxComponentSet,
+  loadAstryxComponents,
+  loadMakaUiBarrel,
+  parseAstryxDistComponents,
+} from './generate-astryx-surface-inventory.mjs';
+
+const tmpRoots = [];
+/** Materialize a fake repo root (`packages/ui/src/*`) from a {relPath: source} map. */
+function fixtureRepo(files) {
+  const repoRoot = mkdtempSync(join(tmpdir(), 'astryx-inv-'));
+  tmpRoots.push(repoRoot);
+  for (const [rel, contents] of Object.entries(files)) {
+    const abs = join(repoRoot, rel);
+    mkdirSync(join(abs, '..'), { recursive: true });
+    writeFileSync(abs, contents);
+  }
+  return repoRoot;
+}
+after(() => {
+  for (const dir of tmpRoots) rmSync(dir, { force: true, recursive: true });
+});
+
+describe('Astryx component set derivation (#3868)', () => {
+  test('is derived from @astryxdesign/core with the resolved version', () => {
+    const { version, components } = loadAstryxComponents();
+    assert.match(version, /^\d+\.\d+\.\d+/);
+    assert.ok(components instanceof Set);
+    // Components the old 47-name hand-list omitted — the drift #3868 fixes.
+    for (const name of ['Timestamp', 'ChatMessage', 'ChatMessageMetadata', 'Thumbnail']) {
+      assert.ok(components.has(name), `expected derived set to include ${name}`);
+    }
+    // Fail-closed floor: a partial parse must not slip through.
+    assert.ok(components.size >= 150, `expected >=150 components, got ${components.size}`);
+    // Type/prop exports are not components.
+    assert.ok(!components.has('ButtonProps'));
+    assert.ok(!components.has('BaseProps'));
+  });
+});
+
+describe('Astryx declaration parsing is fail-closed (#3868)', () => {
+  test('traverses a genuine multi-level `export *` barrel graph', () => {
+    // dist/index.d.ts --export*--> Group --export*--> Sub --export*--> Leaf,
+    // where the component is only declared in the deepest file. A one-layer
+    // parser would stop at Group and silently omit Deep; the recursive walk
+    // (relative to each file's own dir) must reach it.
+    const repoRoot = fixtureRepo({
+      'dist/index.d.ts': ["export { Direct } from './Direct';", "export * from './Group';"].join(
+        '\n',
+      ),
+      'dist/Group/index.d.ts': "export * from './Sub';\n",
+      'dist/Group/Sub/index.d.ts': "export * from './Leaf';\n",
+      'dist/Group/Sub/Leaf/index.d.ts': 'export declare const Deep: unknown;\n',
+    });
+    const set = parseAstryxDistComponents(join(repoRoot, 'dist'));
+    assert.ok(set.has('Direct'), 'top-level named re-export resolves');
+    assert.ok(set.has('Deep'), 'component behind a 3-level barrel graph resolves');
+  });
+
+  test('resolves a flat `Dir.d.ts` barrel target alongside directory barrels', () => {
+    const repoRoot = fixtureRepo({
+      'dist/index.d.ts': "export * from './Flat';\n",
+      'dist/Flat.d.ts': 'export declare function FlatOne(): null;\n',
+    });
+    const set = parseAstryxDistComponents(join(repoRoot, 'dist'));
+    assert.ok(set.has('FlatOne'));
+  });
+
+  test('is cycle-safe when barrels re-export each other', () => {
+    // A ⇄ B mutual `export *` must terminate, not overflow the stack.
+    const repoRoot = fixtureRepo({
+      'dist/index.d.ts': "export * from './A';\n",
+      'dist/A/index.d.ts': ["export * from '../B';", 'export declare const FromA: unknown;'].join(
+        '\n',
+      ),
+      'dist/B/index.d.ts': ["export * from '../A';", 'export declare const FromB: unknown;'].join(
+        '\n',
+      ),
+    });
+    const set = parseAstryxDistComponents(join(repoRoot, 'dist'));
+    assert.ok(set.has('FromA'));
+    assert.ok(set.has('FromB'));
+  });
+
+  test('throws on an unresolved barrel target', () => {
+    const repoRoot = fixtureRepo({ 'dist/index.d.ts': "export * from './Missing';\n" });
+    assert.throws(() => parseAstryxDistComponents(join(repoRoot, 'dist')), /unresolved/i);
+  });
+
+  test('throws on an unresolved target nested below the first barrel layer', () => {
+    const repoRoot = fixtureRepo({
+      'dist/index.d.ts': "export * from './Group';\n",
+      'dist/Group/index.d.ts': "export * from './Gone';\n",
+    });
+    assert.throws(() => parseAstryxDistComponents(join(repoRoot, 'dist')), /unresolved/i);
+  });
+
+  test('rejects a partial parse (too few components / missing a key component)', () => {
+    assert.throws(() => assertAstryxComponentSet(new Set(['Button']), '0.5.0'), /incomplete/i);
+    const bigButMissingKey = new Set(Array.from({ length: 200 }, (_, i) => `Widget${i}`));
+    assert.throws(() => assertAstryxComponentSet(bigButMissingKey, '0.5.0'), /missing/i);
+  });
+});
+
+describe('@maka/ui barrel resolution (#3868)', () => {
+  test('derives the Astryx re-export map from the real barrel', () => {
+    const { reexports } = loadMakaUiBarrel();
+    // Auto-derived (replaces a hand-written 9-name list) — much broader coverage.
+    assert.ok(reexports.size >= 20, `expected a broad re-export map, got ${reexports.size}`);
+    // A direct re-export maps to its canonical Astryx name.
+    assert.equal(reexports.get('Selector'), 'Selector');
+    assert.equal(reexports.get('Button'), 'Button');
+    assert.equal(reexports.get('CommandPalette'), 'CommandPalette');
+  });
+
+  test('resolves nested export graphs and flags only local public shadows', () => {
+    const repoRoot = fixtureRepo({
+      'packages/ui/src/index.ts': [
+        "export { Button, Badge as UiBadge } from '@astryxdesign/core';",
+        "export * from './local.js';",
+        'export function Card() { return null; }', // local public shadow: Card is an Astryx component
+        'export function MyWidget() { return null; }', // not an Astryx name → not a shadow
+      ].join('\n'),
+      'packages/ui/src/local.ts': [
+        "export { Timestamp } from '@astryxdesign/core';",
+        'export function helperThing() { return null; }',
+      ].join('\n'),
+    });
+    const { reexports, shadowsByFile } = loadMakaUiBarrel(repoRoot);
+    // Direct + aliased + transitive (through export *) re-exports all resolve.
+    assert.equal(reexports.get('Button'), 'Button');
+    assert.equal(reexports.get('UiBadge'), 'Badge');
+    assert.equal(reexports.get('Timestamp'), 'Timestamp');
+    // Only the locally-defined public export whose name shadows Astryx is flagged.
+    assert.equal(shadowsByFile.get('packages/ui/src/index.ts')?.has('Card'), true);
+    assert.equal(shadowsByFile.get('packages/ui/src/index.ts')?.has('MyWidget'), false);
+  });
+
+  test('fails closed on an unresolved relative barrel target', () => {
+    const repoRoot = fixtureRepo({
+      'packages/ui/src/index.ts': "export * from './does-not-exist.js';\n",
+    });
+    assert.throws(() => loadMakaUiBarrel(repoRoot), /unresolved/i);
+  });
+});
+
+describe('analyzeTsx severity (#3868)', () => {
+  const astryxComponents = loadAstryxComponents().components;
+  const base = { astryxComponents, makaUiReexports: new Map(), shadowNames: null };
+
+  test('counts a rendered Astryx component in the "Astryx used" column', () => {
+    const src = `
+      import { Timestamp } from '@astryxdesign/core';
+      export function Row() { return <Timestamp value={0} />; }
+    `;
+    const result = analyzeTsx('packages/ui/src/row.tsx', src, base);
+    assert.match(result.astryx, /Timestamp/);
+    assert.equal(result.severity, 'aligned');
+  });
+
+  test('counts an Astryx component imported via the @maka/ui re-export map', () => {
+    const src = `
+      import { Selector } from '@maka/ui';
+      export function Row() { return <Selector value="x" />; }
+    `;
+    const result = analyzeTsx('apps/desktop/src/renderer/row.tsx', src, {
+      ...base,
+      makaUiReexports: new Map([['Selector', 'Selector']]),
+    });
+    assert.match(result.astryx, /Selector/);
+    assert.equal(result.severity, 'aligned');
+  });
+
+  test('flags a public export that shadows an Astryx component', () => {
+    const src = 'export function Button() { return null; }\n';
+    const result = analyzeTsx('packages/ui/src/button.tsx', src, {
+      ...base,
+      shadowNames: new Set(['Button']),
+    });
+    assert.equal(result.severity, 'reimplementation');
+    assert.match(result.gaps, /public export `Button` shadows Astryx component/);
+  });
+
+  test('does not flag a private local component that merely shares a name', () => {
+    // No shadowNames for this file (it is not a public @maka/ui export).
+    const src = `
+      export function ModuleHubSelector() {
+        function Selector() { return null; }
+        return <Selector />;
+      }
+    `;
+    const result = analyzeTsx('packages/ui/src/module-hub-selector.tsx', src, base);
+    assert.equal(result.severity, 'aligned');
+    assert.doesNotMatch(result.gaps, /shadows/);
+  });
+
+  test('still flags a raw interactive control as a blocker', () => {
+    const src = 'export function Bad() { return <button type="button">x</button>; }\n';
+    const result = analyzeTsx('packages/ui/src/bad.tsx', src, base);
+    assert.equal(result.severity, 'blocker');
+  });
+});