basalt-ui 1.29.0 → 1.29.2

package/AGENTS.md

@@ -31,7 +31,7 @@ Toolchain: Bun runtime, oxlint + oxfmt, conventional commits (empty scope), `mas
 ## Hard rules
 
 **Mantine-free boundary**: `basalt-ui/charts`, `basalt-ui/tokens`, `basalt-ui/guard`,
-`basalt-ui/query`, `basalt-ui/router-tanstack`, `basalt-ui/agent`, and `basalt-ui/state` must
+`basalt-ui/router-tanstack`, `basalt-ui/agent`, and `basalt-ui/state` must
 import zero `@mantine/*`. `@visx/*` is permitted only inside `src/charts/**`. `@visx/*`
 (`basalt/visx-boundary`) is enforced by an oxlint plugin rule in both the repo and the shipped
 consumer preset.

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.29.2](https://github.com/jkrumm/basalt-ui/compare/v1.29.1...v1.29.2) (2026-09-03)
+
+
+### Bug Fixes
+
+* distribute unwrap's NonNullable over Eden's union response shape ([d46bc00](https://github.com/jkrumm/basalt-ui/commit/d46bc00ae46fcbe76e0b89516140735b1f3295fb))
+
+## [1.29.1](https://github.com/jkrumm/basalt-ui/compare/v1.29.0...v1.29.1) (2026-09-03)
+
+
+### Bug Fixes
+
+* collapse unwrap's two overloads into one conditional generic ([80152d7](https://github.com/jkrumm/basalt-ui/commit/80152d7d8030ce3455d8ba4f314e6aa59a88feab))
+* let BasaltDevDock's router prop accept a real TanStack Router ([955cdfc](https://github.com/jkrumm/basalt-ui/commit/955cdfca02d28e04e4665e652f1b0a53eb92cdfb))
+* make chart-missing-aria-label's tag scan brace-depth aware ([0d6c122](https://github.com/jkrumm/basalt-ui/commit/0d6c12239e99dc26b15d202050810c7788317acf))
+* retire basalt/query-dual-import — its premise is unreachable post-C1 ([372bc1f](https://github.com/jkrumm/basalt-ui/commit/372bc1fa9a32008a1cde2f13e0a2f826262cbe39))
+
 # [1.29.0](https://github.com/jkrumm/basalt-ui/compare/v1.28.0...v1.29.0) (2026-09-02)
 
 

package/MIGRATING.md

@@ -48,6 +48,23 @@ see § The shell scrollport below.
 
 What is new, one line each — nothing here renames or removes anything:
 
+- **`BasaltDevDock`'s `router` prop now accepts a real TanStack `Router` instance with no cast** —
+  the prior structural stand-in rejected a class instance under TS weak-type detection (no property
+  overlap, no index signature), forcing `router={router as never}`. It is now `router?: object`:
+  any non-null object is assignable, and the devtools panel remains the only reader.
+- **`unwrap` collapses to ONE generic signature with a conditional return**, replacing the two
+  overloads this same minor introduced. The overload pair resolved `unwrap` to `unknown` whenever it
+  was passed as a bare callback (`api.threads.get().then(unwrap)`) — `.then()` reads the declared
+  type of the reference rather than applying an overload, and TS cannot propagate generic inference
+  across an overload set the way it can for a single signature. `.then(unwrap)` now infers `TData`
+  again, alongside `unwrap(await p)` and `unwrap(p)` — nothing about the runtime behaviour changed.
+- **`unwrap` strips `null`/`undefined` from a union-typed Eden response again** — the single
+  conditional signature above still inferred `TData` off `Envelope<infer TData>`, and an Eden
+  Treaty response is a UNION of envelopes (`{ data: T; error: null } | { data: null; error:
+EdenFetchError }`), not one envelope with a nullable `data`; inferring through the wrapper type
+  read `T | null` at every Eden call site. `UnwrapResult` now infers the raw `data` field and wraps
+  it in `NonNullable`, which distributes over a union `R` — `unwrap(await api.x.get())` resolves to
+  `T` again, with no `| null`. Runtime unchanged.
 - **`scrollParentOf` / `SCROLLPORT_ATTRIBUTE`** (`basalt-ui`) — resolve which box actually scrolls an
   element (`null` = the document). The seam behind the shell scrollport change below.
 - **`PageAside`** (`basalt-ui`) — the right-hand aside REGION a route claims, with the panel filter
@@ -730,6 +747,16 @@ half is deliberately NOT exempted the same way — a local `StatCard` beside an
 `import { StatCard as Base }` kept the name AND a piece of the original, which is the fork shape this
 rule most wants to see.
 
+### Guards — `basalt/query-dual-import` removed
+
+**Retired, not merely relaxed** — its `RETIRED_RULE_IDS` entry (kept recognized, so an existing
+`theme-allow query-dual-import` still reads as a dead waiver rather than a typo) and its
+`PLUGIN_RULE_GRACE` ledger row are both deleted. Its whole premise — a raw `@tanstack/react-query`
+import beside `basalt-ui/query` — went unreachable the moment `./query` dropped (see § Consolidation
+above): a consumer now MUST import `@tanstack/react-query` directly, and the rule warned on every
+one of those imports instead of the drift it was written to catch (90+ false positives on a single
+consumer). `query-fn-unwrap` is unaffected — it is a different rule, still `warn` (grace → 1.30.0).
+
 ### `basalt-ui/data` — a typed facet id, and a required `getItemKey`
 
 **`BasaltDataTable`: a mistyped `facets[].columnId` used to render no pill, silently — `if

package/README.md

@@ -143,8 +143,8 @@ The canonical stack, once a router and a query client join the example above:
 ```
 
 The order is load-bearing, not stylistic: `BasaltProvider` auto-mounts `ConnectivityProvider`
-(`./connectivity`), which aggregates React-Query's own status and so must sit **above** the query
-client; `BasaltOverlays` must sit **inside** the theme, since Modals/Spotlight/Notifications
+(C1: absorbed onto the root barrel from the dropped `./connectivity`), which aggregates
+React-Query's own status and so must sit **above** the query client; `BasaltOverlays` must sit **inside** the theme, since Modals/Spotlight/Notifications
 resolve `--vx-*` tokens through Mantine's context; the router goes **last** so every route
 component renders with the theme, the data layer and the overlay layer already mounted above it.
 `agent/rules/basalt-mantine.md` points here rather than restating the tree.
@@ -322,31 +322,31 @@ deleted rather than silently surviving into the next real skew.
 
 ## Subpath exports
 
-| Subpath             | Mantine? | Purpose                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| ------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `.`                 | coupled  | `BasaltProvider`, `createBasaltTheme` / `baseTheme` / `cssVariablesResolver`, `BasaltShell` + sidebar / mobile nav / breadcrumbs / `PageBar`, `Section` / `WidgetHeader`, `NavCountBadge`, `SidebarAccount` + the provider-agnostic account contract (`BasaltAccountProps`/`State`/`Actions`), `ThreadWorkspace` + thread-chat components, dashboard composites (`DeltaBadge`, `StatCard`, `EmptyState`, `SettingsSection`/`SettingsRow`/`DangerZone`) and the query-branch trio `QueryState` / `LoadingState` / `ErrorState`, shell types — the root entry still re-exports the thread-chat components; `./agent-chat` takes the same components standalone, without `BasaltProvider`, the shell, the dashboard composites, or `./connectivity` |
-| `./charts`          | **free** | `CartesianChart` + visx primitives, kinds, sparklines, hooks, token re-exports                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `./tokens`          | **free** | `VX` token refs, `buildPaletteCss`, `defineSeries`, `seriesTokens`, `groupTokens`, `alpha`, `ColorPair` / `SeriesMap` types                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `./theme-lab`       | coupled  | `ThemeLabControls`, `applyOverrides`, `loadOverrides`, `COLOR_GROUPS` for live theme inspection                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `./vite`            | —        | `basaltViteConfig(opts)` — Vite preset for basalt-ui consumer apps; `basaltAppPlugin(opts)` — PWA head, manifest, and icon metadata derived from the token palette                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `./guard`           | **free** | `checkSource`, `GUARD_RULES`, `Finding` types — the headless theme-guard core; plus the annotation reader `--audit-allows` is built on: `findAllowAnnotations`, `neutralizeAllowAnnotation`, `NEUTRALIZED_ALLOW_TOKEN`, `PLUGIN_RULE_IDS`, `AllowAnnotationSite`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `./query`           | **free** | `createBasaltQueryClient`, transport-agnostic `unwrap`, lazy `BasaltQueryDevtools`, `toErrorMessage` / `errorStatus` — the only route to those two; the root barrel does not re-export them                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `./router-tanstack` | **free** | TanStack Router bridge: `defineNav`/`navGroup`/`navTarget`/`flattenNav` + `useNav` (→ `{ sections, mobileNav }`), `useBasaltNav` (active route), `useRouterBreadcrumbs`, and `createSearchStore` + the `field.*` vocabulary                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `./forms`           | coupled  | Mantine form adapter: `useBasaltForm`, `inputProps`, `FormErrorSummary`, `useFormDraft` (Standard Schema)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `./notifications`   | coupled  | Mantine notifications: `notify` helpers, typed registry, persisted history, `NotificationBell`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `./commands`        | coupled  | Typed command bus + overlay controller, `toSpotlightActions`, `ShortcutsHelp`, `BasaltOverlays`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `./data`            | coupled  | Convenience barrel pulling both peer groups: `BasaltDataTable`, `BasaltVirtualList` (Mantine-rendered) — prefer `./data/table` / `./data/virtual` for per-feature opt-in                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `./data/table`      | coupled  | `BasaltDataTable` — sortable data table over TanStack Table, rendered with Mantine                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `./data/virtual`    | coupled  | `BasaltVirtualList` — windowed virtual list over TanStack Virtual, rendered with Mantine                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `./agent`           | **free** | Headless streaming layer (`useAgentStream`, `PartList`) + multi-thread `createThreadsStore` / `useAgentThreadRuns` / outcome seam                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `./agent-chat`      | coupled  | Mantine-styled thread-chat components over `./agent`: `ThreadWorkspace`, `ThreadFeed` (`variant`/`renderRow`), `ThreadFeedRow` (inline-expanding Slack row, lazily mounted + kept mounted), `ThreadOutcomeCard`, `ThreadDetailPanel`, `Composer`, `ThreadTranscript` (`groupConsecutive`/`affordances`/`virtualize` — windowed transcripts open at the newest message unless `initialScroll: 'start'`; `virtualize` is enabled by the optional `@tanstack/react-virtual` peer, absent it degrades to an unwindowed, height-bound pane), `threadPartRenderers` — **requires `motion`**, not merely an optional peer; see [Requirements](#requirements)                                                                                            |
-| `./state`           | **free** | createPersistedState (versioned localStorage) + the store field vocabulary (field.enum/multi/range/number/boolean/string, FieldHandle, lanes) + createLocalStore, the router-free store — Mantine-free state primitives                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `./connectivity`    | coupled  | `ConnectivityProvider` (aggregates browser/React-Query/SSE/health-check status), `useConnectivity`, `ConnectivityIndicator` — auto-mounted by `BasaltProvider`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `./content`         | coupled  | `Prose`, `CodeBlock`, `Callout`, `TableOfContents`, `ReadingProgress`, `Markdown`, `MermaidDiagram`, `ArticleLayout`, `ArticleCard` / `ArticleGrid`, `GuideLink` / `GuideDrawer`, `mdxComponents`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `./styles.css`      | —        | `@layer basalt` base styles, iOS input safety net, font stack                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| `./tokens.css`      | **free** | Prebuilt `--vx-*` stylesheet — the default `buildPaletteCss()` output as a plain file, for a consumer with a bundler but no React or Mantine. **With no bundler, use the `basalt-ui tokens:css` CLI instead** and commit the emitted file: importing this subpath needs bare-specifier resolution. See [`docs/FRAMEWORK-FREE.md`](https://github.com/jkrumm/basalt-ui/blob/master/docs/FRAMEWORK-FREE.md)                                                                                                                                                                                                                                                                                                                                        |
-| `./configs/*`       | —        | Raw toolchain presets — oxlint, oxfmt, tsconfig (base/react-app/node), lefthook                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `./llms.txt`        | —        | Machine-readable surface map — one entry per published subpath with import specifier, description, layer, and optional peers                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| Subpath             | Mantine? | Purpose                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| ------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `.`                 | coupled  | `BasaltProvider`, `createBasaltTheme` / `baseTheme` / `cssVariablesResolver`, `BasaltShell` + sidebar / mobile nav / breadcrumbs / `PageBar` / `PageAside`, `Section` / `WidgetHeader`, `NavCountBadge`, `SidebarAccount` + the provider-agnostic account contract (`BasaltAccountProps`/`State`/`Actions`), `ThreadWorkspace` + thread-chat components, dashboard composites (`DeltaBadge`, `StatCard`, `EmptyState`, `SettingsSection`/`SettingsRow`/`DangerZone`), the query-branch trio `QueryState` / `LoadingState` / `ErrorState`, `createBasaltQueryClient` / `unwrap` / `toErrorMessage` / `errorStatus` / `BasaltQueryDevtools` (C1: absorbed from the dropped `./query`), `ConnectivityProvider` (auto-mounted) / `useConnectivity` / `ConnectivityIndicator` (C1: absorbed from the dropped `./connectivity`), shell types — the root entry still re-exports the thread-chat components; `./agent-chat` takes the same components standalone, without `BasaltProvider`, the shell, or the dashboard composites |
+| `./charts`          | **free** | `CartesianChart` + visx primitives, kinds, sparklines, hooks, token re-exports                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `./tokens`          | **free** | `VX` token refs, `buildPaletteCss`, `defineSeries`, `seriesTokens`, `groupTokens`, `alpha`, `ColorPair` / `SeriesMap` types                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| `./theme-lab`       | coupled  | `ThemeLabControls`, `applyOverrides`, `loadOverrides`, `COLOR_GROUPS` for live theme inspection                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `./vite`            | —        | `basaltViteConfig(opts)` — Vite preset for basalt-ui consumer apps; `basaltAppPlugin(opts)` — PWA head, manifest, and icon metadata derived from the token palette                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `./guard`           | **free** | `checkSource`, `GUARD_RULES`, `Finding` types — the headless theme-guard core; plus the annotation reader `--audit-allows` is built on: `findAllowAnnotations`, `neutralizeAllowAnnotation`, `NEUTRALIZED_ALLOW_TOKEN`, `PLUGIN_RULE_IDS`, `AllowAnnotationSite`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| `./format`          | **free** | `Intl`-backed, Mantine-free, React-free formatting: `money`/`percent`/`integer`/`compact`/`deltaPct`, `duration`/`durationClock`/`clock`/`weekday`/`relativeTime`, `km`/`kcal`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `./router-tanstack` | **free** | TanStack Router bridge: `defineNav`/`navGroup`/`navTarget`/`flattenNav` + `useNav` (→ `{ sections, mobileNav }`), `useBasaltNav` (active route), `useRouterBreadcrumbs`, and `createSearchStore` + the `field.*` vocabulary                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| `./forms`           | coupled  | Mantine form adapter: `useBasaltForm`, `inputProps`, `FormErrorSummary`, `useFormDraft` (Standard Schema)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| `./notifications`   | coupled  | Mantine notifications: `notify` helpers, typed registry, persisted history, `NotificationBell`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `./commands`        | coupled  | Typed command bus + overlay controller, `toSpotlightActions`, `ShortcutsHelp`, `BasaltOverlays`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `./data/table`      | coupled  | `BasaltDataTable` — sortable data table over TanStack Table, rendered with Mantine                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `./data/virtual`    | coupled  | `BasaltVirtualList` — windowed virtual list over TanStack Virtual, rendered with Mantine                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `./agent`           | **free** | Headless streaming layer (`useAgentStream`, `PartList`) + multi-thread `createThreadsStore` / `useAgentThreadRuns` / outcome seam                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `./agent-chat`      | coupled  | Mantine-styled thread-chat components over `./agent`: `ThreadWorkspace`, `ThreadFeed` (`variant`/`renderRow`), `ThreadFeedRow` (inline-expanding Slack row, lazily mounted + kept mounted), `ThreadOutcomeCard`, `ThreadDetailPanel`, `Composer`, `ThreadTranscript` (`groupConsecutive`/`affordances`/`virtualize` — windowed transcripts open at the newest message unless `initialScroll: 'start'`; `virtualize` is enabled by the optional `@tanstack/react-virtual` peer, absent it degrades to an unwindowed, height-bound pane), `threadPartRenderers` — **requires `motion`**, not merely an optional peer; see [Requirements](#requirements)                                                                                                                                                                                                                                                                                                                                                                      |
+| `./content`         | coupled  | `Prose`, `CodeBlock`, `Callout`, `TableOfContents`, `ReadingProgress`, `Markdown`, `MermaidDiagram`, `ArticleLayout`, `ArticleCard` / `ArticleGrid`, `GuideLink` / `GuideDrawer`, `mdxComponents`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| `./controls`        | coupled  | The control tier: `FilterSet` + the `FieldHandle`-bound filters (`RangeFilter`/`CompareFilter`/`SelectFilter`/`MultiSelectFilter`/`NumberFilter`/`SearchFilter`/`ToggleFilter`), `ViewTabs`, `ActionGroup`/`OverflowMenu`/`SyncButton`, plus the aside's `PanelRow`/`SliderControl` row primitives — `pill`/`sheet`/`panel` surfaces, picked by the home, never a prop                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `./controls-dates`  | coupled  | `DateRangePicker` — the `@mantine/dates` implementation of `RangeFilter`'s `customPicker` seam; its own subpath so `./controls` resolves and renders with no `@mantine/dates` installed                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `./state`           | **free** | createPersistedState (versioned localStorage) + the store field vocabulary (field.enum/multi/range/number/boolean/string, FieldHandle, lanes) + createLocalStore, the router-free store — Mantine-free state primitives                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| `./styles.css`      | —        | `@layer basalt` base styles, iOS input safety net, font stack                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `./tokens.css`      | **free** | Prebuilt `--vx-*` stylesheet — the default `buildPaletteCss()` output as a plain file, for a consumer with a bundler but no React or Mantine. **With no bundler, use the `basalt-ui tokens:css` CLI instead** and commit the emitted file: importing this subpath needs bare-specifier resolution. See [`docs/FRAMEWORK-FREE.md`](https://github.com/jkrumm/basalt-ui/blob/master/docs/FRAMEWORK-FREE.md)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| `./configs/*`       | —        | Raw toolchain presets — oxlint, oxfmt, tsconfig (base/react-app/node), lefthook                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `./llms.txt`        | —        | Machine-readable surface map — one entry per published subpath with import specifier, description, layer, and optional peers                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 
 Named exports only — no default exports.
 
@@ -496,28 +496,32 @@ It resolves ahead of the `xTicks` COUNT, which is unchanged; omit both and ticks
 Reach for values on a dense time axis — the tick chooser appends the final key unconditionally, so
 a count that misses the last index collides two labels at the right edge at every count.
 
-### `./query` — TanStack Query adapter
+### Query — `createBasaltQueryClient` / `unwrap` (root barrel)
+
+`./query` was dropped in 1.29.0 (C1 consolidation) — its two exports moved onto the root barrel,
+which already requires `@tanstack/react-query` as a peer. TanStack itself
+(`QueryClientProvider`, hooks, `queryOptions`) is imported straight from `@tanstack/react-query`,
+never re-exported by basalt.
 
 ```bash
 bun add @tanstack/react-query @tanstack/react-query-devtools
 ```
 
 ```tsx
-import { createBasaltQueryClient, QueryClientProvider, unwrap } from 'basalt-ui/query'
+import { createBasaltQueryClient } from 'basalt-ui'
+import { QueryClientProvider } from '@tanstack/react-query'
 
 const [client] = useState(() => createBasaltQueryClient())
 // queryFn: () => unwrap(api.users.get())
 ```
 
-`toErrorMessage(err, fallback?)` and `errorStatus(err)` also live here — decode an unknown thrown
-value into something renderable, folding an HTTP status into the fallback when the body decodes to
-nothing usable (`''`, `'{}'`, `'[object Object]'`, …).
+`toErrorMessage(err, fallback?)` and `errorStatus(err)` also live on the root barrel — decode an
+unknown thrown value into something renderable, folding an HTTP status into the fallback when the
+body decodes to nothing usable (`''`, `'{}'`, `'[object Object]'`, …). `BasaltQueryDevtools` (lazy)
+is there too.
 
 #### Rendering a query — `QueryState`
 
-Imported from **`basalt-ui`**, not `basalt-ui/query`: it renders Mantine, and `./query` is a
-guard-enforced Mantine-free entry.
-
 ```tsx
 import { QueryState } from 'basalt-ui'
 
@@ -634,17 +638,17 @@ export const COMMANDS = defineCommands({
 runCommand('file:save')
 ```
 
-### `./data` — TanStack Table + Virtual
+### `./data/table` + `./data/virtual` — TanStack Table + Virtual
 
-`./data` is a convenience barrel that pulls in both peer groups. Prefer the fine subpaths below
-for per-feature opt-in — each only requires its own peer.
+Two subpaths, one per peer group (C1: there is no bare `./data` barrel) — install only what you
+use.
 
 ```bash
 bun add @tanstack/react-table @tanstack/react-virtual
 ```
 
 ```tsx
-import { BasaltDataTable, BasaltVirtualList, createColumnHelper } from 'basalt-ui/data'
+import { BasaltDataTable, createColumnHelper } from 'basalt-ui/data/table'
 
 const col = createColumnHelper<Row>()
 const columns = [

package/agent/rules/basalt-batteries.md

@@ -10,7 +10,7 @@ paths:
 
 <!-- basalt:coverage -->
 <!-- GENERATED from src/surfaces.ts — `bun scripts/check-coverage.ts --write`. Do not hand-edit. -->
-<!-- backed by: guard kinds — none · oxlint rules — basalt/agent-no-raw-usechat, basalt/agent-resume-guard, basalt/ai-sdk-major, basalt/forms-field-key, basalt/query-dual-import, basalt/query-fn-unwrap -->
+<!-- backed by: guard kinds — none · oxlint rules — basalt/agent-no-raw-usechat, basalt/agent-resume-guard, basalt/ai-sdk-major, basalt/forms-field-key, basalt/query-fn-unwrap -->
 <!-- not guarded: — -->
 <!-- /basalt:coverage -->
 

package/agent/templates/query-client.ts.tpl

@@ -4,7 +4,7 @@
  *
  * Scaffold written by `basalt-ui init`. This file is yours — `basalt-ui sync` will not overwrite it.
  */
-import { createBasaltQueryClient } from 'basalt-ui/query'
+import { createBasaltQueryClient } from 'basalt-ui'
 
 export const queryClient = createBasaltQueryClient({
   // staleTime: 60_000,   // optional: global cache freshness window (ms)

package/configs/oxlint-plugin.js

@@ -91,8 +91,16 @@ import { fileURLToPath } from 'node:url'
  * - `duplicate-notifications-mount` — its only case, `<BasaltNotifications />` mounted beside
  *   `<BasaltOverlays notifications>`, is unreachable now that `BasaltNotifications` no longer
  *   exists as a standalone export; the rule had nothing left to fire on.
- */
-export const RETIRED_RULE_IDS = new Set(['unframed-chart', 'duplicate-notifications-mount'])
+ * - `query-dual-import` — its whole premise (a raw `@tanstack/react-query` import beside
+ *   `basalt-ui/query`) is unreachable now that C1 (1.29.0) dropped the `./query` subpath: a
+ *   consumer MUST import `@tanstack/react-query` directly, so the rule warned on every such
+ *   import instead of the drift it was written to catch.
+ */
+export const RETIRED_RULE_IDS = new Set([
+  'unframed-chart',
+  'duplicate-notifications-mount',
+  'query-dual-import',
+])
 
 /**
  * Rule ids a `theme-allow` may name — this plugin's own rules plus `src/guard`'s kinds. Duplicated
@@ -3354,83 +3362,15 @@ const providerAboveRouter = {
   },
 }
 
-// ── Rule 27 — query-dual-import ─────────────────────────────────────────────────────────────────
+// Rule 27 — query-dual-import — RETIRED. 1.29.0 dropped every raw TanStack re-export from
+// `basalt-ui/query` (the subpath itself is gone), so "dual-importing `@tanstack/react-query`
+// beside `basalt-ui/query`" is no longer a thing a consumer can even do — a consumer MUST import
+// `@tanstack/react-query` directly now, and this rule warned on every such import (90+ false
+// positives on argo alone). See `RETIRED_RULE_IDS` below.
 
-/** `@tanstack/react-query` and its subpaths — never `@tanstack/react-query-devtools`. */
-const TANSTACK_QUERY_SOURCE = /^@tanstack\/react-query(?:\/|$)/
-
-/** The `basalt-ui/query` subpath, exactly — the seam the hooks are supposed to arrive through. */
+/** The `basalt-ui/query` subpath, exactly — kept for `query-fn-unwrap`'s own gate below. */
 const BASALT_QUERY_SOURCE = 'basalt-ui/query'
 
-/** The root barrel — where `QueryState` and the dashboard composites live. */
-const BASALT_ROOT_SOURCE = 'basalt-ui'
-
-const QUERY_DUAL_IMPORT_MESSAGE =
-  'Dual query import — this file imports from @tanstack/react-query AND from basalt-ui/query. ' +
-  'Take the hooks, the client factory and `unwrap` from basalt-ui/query only: two entry points to ' +
-  'one library is how a second QueryClient, a second devtools bundle and a duplicated ' +
-  '`toErrorMessage` reach an app (agent/rules/basalt-batteries.md). ' +
-  '(basalt/query-dual-import)'
-
-const QUERY_ROOT_IMPORT_MESSAGE =
-  'Raw @tanstack/react-query import in a basalt file — the hooks come through basalt-ui/query, ' +
-  'which re-exports them beside `createBasaltQueryClient`, `unwrap`, `toErrorMessage` and the lazy ' +
-  'devtools (agent/rules/basalt-batteries.md). Import from basalt-ui/query instead. ' +
-  '(basalt/query-dual-import)'
-
-/**
- * The `basalt-batteries.md` law "import query hooks from `basalt-ui/query`, never dual-import
- * `@tanstack/react-query`" — F5, and one of the two `./query` surfaces that shipped advisory.
- *
- * TWO forms, one id, because they are one law read at two strengths. The DUAL form (both
- * specifiers present) is the law verbatim. The softer form — a raw `@tanstack/react-query` import
- * in a file that also imports the basalt root barrel — is a heuristic: it says "this file is
- * already a basalt file, so the query seam is right there", and it is the form that actually
- * catches the drift, since a file that has never heard of `basalt-ui/query` cannot dual-import.
- * The softer form is why the whole rule lands at `warn` rather than `error`.
- *
- * Gated on the LITERAL specifier, never on `ownTree` relative resolution: basalt's own
- * `src/query/**` and `src/dashboard/query-state.tsx` import `@tanstack/react-query` because they
- * ARE the seam, and they reach their siblings relatively. A file that writes `basalt-ui/query` is
- * by definition a consumer of the published surface.
- */
-// Ships: warn (grace → 1.30.0)
-const queryDualImport = {
-  meta: {
-    type: 'suggestion',
-    docs: { description: 'Warn on a raw @tanstack/react-query import beside a basalt import.' },
-    schema: [],
-  },
-  create(context) {
-    if (isTestFile(context)) return {}
-    const raw = []
-    let basaltQuery = false
-    let basaltRoot = false
-
-    return {
-      ImportDeclaration(node) {
-        const source = node.source?.value
-        if (typeof source !== 'string') return
-        if (source === BASALT_QUERY_SOURCE) basaltQuery = true
-        else if (source === BASALT_ROOT_SOURCE) basaltRoot = true
-        // `import type { UseQueryResult } from '@tanstack/react-query'` is erased at compile time
-        // — there is no runtime import to route through the seam, and typing against the library's
-        // own result type is exactly what `QueryStateLike` documents as legitimate. Same skip
-        // `agent-no-raw-usechat` and `ai-sdk-major` take.
-        else if (TANSTACK_QUERY_SOURCE.test(source) && node.importKind !== 'type') raw.push(node)
-      },
-      'Program:exit'() {
-        if (!basaltQuery && !basaltRoot) return
-        const message = basaltQuery ? QUERY_DUAL_IMPORT_MESSAGE : QUERY_ROOT_IMPORT_MESSAGE
-        for (const node of raw) {
-          if (hasThemeAllow(context, node, 'query-dual-import')) continue
-          context.report({ node, message })
-        }
-      },
-    }
-  },
-}
-
 // ── Rule 28 — query-fn-unwrap ───────────────────────────────────────────────────────────────────
 
 const QUERY_FN_UNWRAP_MESSAGE =
@@ -3904,18 +3844,6 @@ export const PLUGIN_RULE_GRACE = {
       'image-gen and the playground is measured — every one of them mounts a router, so the ' +
       'false-positive question has a real sample.',
   },
-  'query-dual-import': {
-    since: '1.28.0',
-    promote: '1.30.0',
-    why:
-      'F5 — the basalt-batteries.md law with no guard. TWO forms under one id: the dual import ' +
-      '(both `@tanstack/react-query` and `basalt-ui/query` in one file) is the law verbatim, and ' +
-      'the softer form — a raw `@tanstack/react-query` import in a file that also imports the ' +
-      'basalt root barrel — is the heuristic that actually catches the drift, since a file that ' +
-      'never names `basalt-ui/query` cannot dual-import. The soft form is what holds the whole ' +
-      'rule at `warn`: "this file is already a basalt file" is a claim about intent. 1.30.0 is ' +
-      'when the consumer count is measured and the soft form is either kept or split off.',
-  },
   'forms-field-key': {
     since: '1.28.0',
     promote: '1.30.0',
@@ -4000,7 +3928,6 @@ export default {
     'search-literal-link': searchLiteralLink,
     'use-search-from-literal': useSearchFromLiteral,
     'provider-above-router': providerAboveRouter,
-    'query-dual-import': queryDualImport,
     'query-fn-unwrap': queryFnUnwrap,
     'deprecated-export': deprecatedExport,
     'forms-field-key': formsFieldKey,

package/configs/oxlint-plugin.test.ts

@@ -38,7 +38,6 @@ beforeEach(() => {
       jsPlugins: [PLUGIN_PATH],
       rules: {
         'basalt/provider-above-router': 'error',
-        'basalt/query-dual-import': 'error',
         'basalt/query-fn-unwrap': 'error',
         'basalt/deprecated-export': 'error',
         'basalt/forms-field-key': 'error',
@@ -3050,85 +3049,9 @@ describe('basalt/provider-above-router', () => {
   })
 })
 
-// ── query-dual-import (F5) ───────────────────────────────────────────────────
-
-describe('basalt/query-dual-import', () => {
-  it('flags a file importing from both @tanstack/react-query and basalt-ui/query', () => {
-    const { code, rules, output } = run(
-      `import { useQuery } from '@tanstack/react-query'\n` +
-        `import { unwrap } from 'basalt-ui/query'\n` +
-        `export const useThing = () => useQuery({ queryKey: ['t'], queryFn: () => unwrap(get()) })\n`,
-    )
-    expect(code).toBe(1)
-    expect(rules).toContain('query-dual-import')
-    expect(output).toContain('Dual query import')
-  })
-
-  // The softer half — the one that actually catches the drift, and why the rule is `warn`.
-  it('flags a raw @tanstack/react-query import beside a basalt root import', () => {
-    const { code, rules, output } = run(
-      `import { useQuery } from '@tanstack/react-query'\n` +
-        `import { QueryState } from 'basalt-ui'\n` +
-        `export const useThing = () => useQuery({ queryKey: ['t'], queryFn: get })\n`,
-    )
-    expect(code).toBe(1)
-    expect(rules).toContain('query-dual-import')
-    expect(output).toContain('Raw @tanstack/react-query import')
-  })
-
-  it('does NOT flag basalt-ui/query on its own', () => {
-    const { code, rules } = run(
-      `import { useQuery, unwrap } from 'basalt-ui/query'\n` +
-        `export const useThing = () => useQuery({ queryKey: ['t'], queryFn: () => unwrap(get()) })\n`,
-    )
-    expect(code).toBe(0)
-    expect(rules).not.toContain('query-dual-import')
-  })
-
-  // `import type` is erased at compile time — there is no runtime import to route through the
-  // seam, and typing against the library's own result type is what `QueryStateLike` documents as
-  // legitimate. Same skip `agent-no-raw-usechat` and `ai-sdk-major` take.
-  it('does NOT flag a type-only @tanstack/react-query import beside basalt-ui/query', () => {
-    const { code, rules } = run(
-      `import type { UseQueryResult } from '@tanstack/react-query'\n` +
-        `import { unwrap } from 'basalt-ui/query'\n` +
-        `export const pick = (q: UseQueryResult<number>) => unwrap(q.data)\n`,
-    )
-    expect(code).toBe(0)
-    expect(rules).not.toContain('query-dual-import')
-  })
-
-  it('does NOT flag @tanstack/react-query in a file with no basalt import', () => {
-    const { code, rules } = run(
-      `import { useQuery } from '@tanstack/react-query'\n` +
-        `export const useThing = () => useQuery({ queryKey: ['t'], queryFn: get })\n`,
-    )
-    expect(code).toBe(0)
-    expect(rules).not.toContain('query-dual-import')
-  })
-
-  // The devtools package is a different package, not a subpath.
-  it('does NOT flag @tanstack/react-query-devtools', () => {
-    const { code, rules } = run(
-      `import { ReactQueryDevtools } from '@tanstack/react-query-devtools'\n` +
-        `import { unwrap } from 'basalt-ui/query'\n` +
-        `export const D = () => <ReactQueryDevtools />\n`,
-    )
-    expect(code).toBe(0)
-    expect(rules).not.toContain('query-dual-import')
-  })
-
-  it('honours a theme-allow naming the rule', () => {
-    const { code, rules } = run(
-      `// theme-allow query-dual-import — the persister API has no basalt re-export yet\n` +
-        `import { useQuery } from '@tanstack/react-query'\n` +
-        `import { unwrap } from 'basalt-ui/query'\n` +
-        `export const useThing = () => useQuery({ queryKey: ['t'], queryFn: () => unwrap(g()) })\n`,
-    )
-    expect(code).toBe(0)
-    expect(rules).not.toContain('query-dual-import')
-  })
-})
+// `basalt/query-dual-import` is RETIRED (`RETIRED_RULE_IDS`) — its own describe block was removed
+// along with the rule; see `KNOWN_RULE_IDS` below for the coverage that remains: it is still a
+// valid (dead) `theme-allow` id, never a typo.
 
 // ── query-fn-unwrap (F5) ─────────────────────────────────────────────────────
 

package/configs/oxlint.json

@@ -42,7 +42,6 @@
     "basalt/search-literal-link": "error",
     "basalt/use-search-from-literal": "error",
     "basalt/provider-above-router": "warn",
-    "basalt/query-dual-import": "warn",
     "basalt/query-fn-unwrap": "warn",
     "basalt/deprecated-export": "warn",
     "basalt/forms-field-key": "warn",

package/dist/dev-dock.d.ts

@@ -3,9 +3,7 @@ import type { BasaltProps } from './common/props.js';
 import type { ThemeLabControlsProps } from './theme-lab/index.js';
 /** Which panel is open. `null` renders nothing (the dock is unmounted, not hidden). */
 export type BasaltDevDockTool = 'router' | 'query' | 'theme';
-type DevDockRouter = {
-    __routerHasBeenSetup?: unknown;
-} | Record<string, unknown>;
+type DevDockRouter = object;
 export type BasaltDevDockProps = BasaltProps & {
     /** Which panel to show. `null` renders nothing. */
     tool: BasaltDevDockTool | null;

package/dist/dev-dock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-dock.d.ts","sourceRoot":"","sources":["../src/dev-dock.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAExD,uFAAuF;AACvF,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAA;AAY5D,KAAK,aAAa,GAAG;IAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAuBjF,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG;IAC7C,mDAAmD;IACnD,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAC9B;oFACgF;IAChF,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB;8DAC0D;IAC1D,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,iGAAiG;IACjG,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,CAAA;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAC5B,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,EACR,SAAS,EACT,KAAK,GACN,EAAE,kBAAkB,GAAG,SAAS,CA8DhC"}
+{"version":3,"file":"dev-dock.d.ts","sourceRoot":"","sources":["../src/dev-dock.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAExD,uFAAuF;AACvF,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAA;AAe5D,KAAK,aAAa,GAAG,MAAM,CAAA;AAuB3B,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG;IAC7C,mDAAmD;IACnD,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAC9B;oFACgF;IAChF,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB;8DAC0D;IAC1D,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,iGAAiG;IACjG,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,CAAA;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAC5B,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,EACR,SAAS,EACT,KAAK,GACN,EAAE,kBAAkB,GAAG,SAAS,CA8DhC"}

package/dist/forms/use-form-submit.d.ts

@@ -28,7 +28,7 @@ export type UseFormSubmitOptions<Values extends Record<string, unknown>> = {
     onError?: (err: unknown) => void;
     /**
      * Turns a thrown value into the message `submitError` carries. Defaults to `toErrorMessage`
-     * (`basalt-ui/query`), which already unwraps `Error`, `{ message }` and Eden's `{ status, value }`.
+     * (root barrel), which already unwraps `Error`, `{ message }` and Eden's `{ status, value }`.
      * Override it to brand the copy or to branch on `errorStatus(err)`.
      */
     mapError?: (err: unknown) => string;

package/dist/guard/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/guard/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,CAAA;AA4lB9D,8EAA8E;AAC9E,eAAO,MAAM,oBAAoB,EAAE,WAmBlC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAExE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,eAAO,MAAM,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAiBrE,CAAA;AA0GD,sGAAsG;AACtG,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAA;CAC7C,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,WAAW,EAChB,eAAe,EAAE,SAAS,MAAM,EAAE,GACjC,sBAAsB,EAAE,CAc1B;AAID;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,MAAM,CAmD9C,CAAA;AAgeF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,gGACwD,CAAA;AA8F1F;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,EAAE,WAAW,CAAC,SAAS,CAyB5D,CAAA;AA2NF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;gCA0BL,WAAW;;;;;;;gCAcX,WAAW;;;;;gCAMX,WAAW;;;;;;;gCAaX,WAAW;;;;;;;gCAQX,WAAW;;;;;;gCAOX,WAAW;;;;;;;gCASX,WAAW;;;;;;gCAOX,WAAW;;;;;;;gCAaX,WAAW;;;;;;gCAMX,WAAW;;;;;;;gCAaX,WAAW;;;;;;;gCAUX,WAAW;;;;;;;gCAUX,WAAW;;;;;;;gCASX,WAAW;;;;;;;gCAUX,WAAW;;;;;;;;;;;;gCAgBX,WAAW;;;;;;gCAOX,WAAW;;;;;;;gCASX,WAAW;;;;;;;;;;;;;;;;;;;;;CA2BmB,CAAA;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAEvD;AAKD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgBvD;AAUD;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,EAAE,CAkbtF;AAID;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,iDAAiD;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,gFAAgF;IAChF,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IAC/B,6FAA6F;IAC7F,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,gDAAgD;IAChD,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAA;IACzC,oFAAoF;IACpF,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,oGAAoG;IACpG,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IACxC,wCAAwC;IACxC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,qGAAqG;IACrG,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,iCAAiC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,WAAW,GACf,mBAAmB,EAAE,CAuBvB;AAED,kGAAkG;AAClG,eAAO,MAAM,uBAAuB,6BAA6B,CAAA;AAEjE;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAM9F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/guard/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,CAAA;AA2nB9D,8EAA8E;AAC9E,eAAO,MAAM,oBAAoB,EAAE,WAmBlC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAExE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,eAAO,MAAM,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAiBrE,CAAA;AA0GD,sGAAsG;AACtG,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAA;CAC7C,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,WAAW,EAChB,eAAe,EAAE,SAAS,MAAM,EAAE,GACjC,sBAAsB,EAAE,CAc1B;AAID;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,MAAM,CAsD9C,CAAA;AAgeF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,gGACwD,CAAA;AA8F1F;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,EAAE,WAAW,CAAC,SAAS,CAyB5D,CAAA;AA2NF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;gCA0BL,WAAW;;;;;;;gCAcX,WAAW;;;;;gCAMX,WAAW;;;;;;;gCAaX,WAAW;;;;;;;gCAQX,WAAW;;;;;;gCAOX,WAAW;;;;;;;gCASX,WAAW;;;;;;gCAOX,WAAW;;;;;;;gCAaX,WAAW;;;;;;gCAMX,WAAW;;;;;;;gCAaX,WAAW;;;;;;;gCAUX,WAAW;;;;;;;gCAUX,WAAW;;;;;;;gCASX,WAAW;;;;;;;gCAUX,WAAW;;;;;;;;;;;;gCAgBX,WAAW;;;;;;gCAOX,WAAW;;;;;;;gCASX,WAAW;;;;;;;;;;;;;;;;;;;;;CA2BmB,CAAA;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAEvD;AAKD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgBvD;AAUD;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,EAAE,CAqbtF;AAID;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,iDAAiD;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,gFAAgF;IAChF,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IAC/B,6FAA6F;IAC7F,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,gDAAgD;IAChD,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAA;IACzC,oFAAoF;IACpF,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,oGAAoG;IACpG,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IACxC,wCAAwC;IACxC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,qGAAqG;IACrG,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,iCAAiC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,WAAW,GACf,mBAAmB,EAAE,CAuBvB;AAED,kGAAkG;AAClG,eAAO,MAAM,uBAAuB,6BAA6B,CAAA;AAEjE;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAM9F"}

package/dist/guard/index.js

@@ -107,8 +107,33 @@ const AXIS_WRAPPER_FILE = /(?:^|\/)Axes\.tsx$/;
 const RADIUS_PROP_RE = /\bradius=(?:\{[0-9]+\}|"[0-9]+")/g;
 const MOTION_TRANSITION_NUMERIC = /\btransition\s*=\s*\{\{[^}]*\b(?:duration|stiffness|damping|mass)\s*:\s*-?\d/g;
 const MOTION_TRANSITION_EASE_ARRAY = /\btransition\s*=\s*\{\{[^}]*\bease\s*:\s*\[/g;
-const CHART_ENTRY_POINT_TAG = /<(MultiLine|Bars|BandStrip|Donut|DualPanel|Heatmap|MirroredBars|ZonedLine|StackedArea|LineSparkline|BarSparkline)\b(?:<[^<>]*>)?(?:=>|[^>])*?>/g;
+const CHART_ENTRY_POINT_TAG_START = /<(MultiLine|Bars|BandStrip|Donut|DualPanel|Heatmap|MirroredBars|ZonedLine|StackedArea|LineSparkline|BarSparkline)\b(?:<[^<>]*>)?/g;
 const HAS_ARIA_LABEL_PROP = /\bariaLabel\s*=/;
+function scanChartTagClose(codeText, start) {
+  let depth = 0;
+  let i = start;
+  while (i < codeText.length) {
+    const ch = codeText[i];
+    if (ch === '"' || ch === "'" || ch === "`") {
+      const quote = ch;
+      i++;
+      while (i < codeText.length && codeText[i] !== quote) {
+        i += codeText[i] === "\\" ? 2 : 1;
+      }
+      i++;
+      continue;
+    }
+    if (ch === "{") {
+      depth++;
+    } else if (ch === "}") {
+      depth = Math.max(0, depth - 1);
+    } else if (ch === ">" && depth === 0) {
+      return i;
+    }
+    i++;
+  }
+  return -1;
+}
 const LOCAL_COMPONENT_DEF = /(?:^|[\n;}])\s*(?:export\s+)?(?:default\s+)?(?:async\s+)?(?:function|class|const|let|var)\s+([A-Z]\w*)/g;
 const BASALT_NAMED_IMPORT = /import\s+(?:type\s+)?\{([^}]*)\}\s+from\s+['"]basalt-ui(?:\/[^'"]*)?['"]/g;
 function localComponentNames(codeText) {
@@ -265,7 +290,6 @@ const PLUGIN_RULE_IDS = /* @__PURE__ */ new Set([
   // `checkSource`'s reach: provenance here is an import graph and a JSX ancestry, neither of which
   // a 12-line regex window has. Same reason `bound-control-outside-home` has no text-lane twin.
   "provider-above-router",
-  "query-dual-import",
   "query-fn-unwrap",
   "deprecated-export",
   // Same lane: `{...inputProps(…)}` without a sibling `key` is a JSX-ancestry claim (does this
@@ -291,7 +315,11 @@ const PLUGIN_RULE_IDS = /* @__PURE__ */ new Set([
   // Retired plugin rule — `<BasaltNotifications />` mounted beside `<BasaltOverlays
   // notifications>` is unreachable now that `BasaltNotifications` no longer exists as a
   // standalone export. Mirrored by the plugin's own `RETIRED_RULE_IDS`.
-  "duplicate-notifications-mount"
+  "duplicate-notifications-mount",
+  // Retired plugin rule — its whole premise (a raw `@tanstack/react-query` import beside
+  // `basalt-ui/query`) is unreachable now that C1 (1.29.0) dropped the `./query` subpath.
+  // Mirrored by the plugin's own `RETIRED_RULE_IDS`.
+  "query-dual-import"
 ]);
 const MIN_ALLOW_REASON_LENGTH = 4;
 function parseAllowAnnotation(rest, scope) {
@@ -778,7 +806,7 @@ const GUARD_RULES = {
   },
   "chart-missing-aria-label": {
     kind: "chart-missing-aria-label",
-    pattern: CHART_ENTRY_POINT_TAG,
+    pattern: CHART_ENTRY_POINT_TAG_START,
     // handled inline (full-text tag-scoped scan); entry keeps registry complete
     enabled: (cfg) => cfg.chartMissingAriaLabel,
     // JSX-tag-shaped (`<MultiLine …>`) — never appears in CSS text.
@@ -1061,11 +1089,14 @@ function checkSource(text, relPath, cfg) {
   const basaltNames = ariaLabelRuns ? basaltImportedNames(codeText) : /* @__PURE__ */ new Set();
   const isShippedTag = (tag) => basaltNames.has(tag) || !localNames.has(tag);
   if (ariaLabelRuns) {
-    for (const m of codeText.matchAll(CHART_ENTRY_POINT_TAG)) {
-      const tagText = m[0];
+    for (const m of codeText.matchAll(CHART_ENTRY_POINT_TAG_START)) {
+      const matchStart = m.index ?? 0;
       if (!isShippedTag(m[1])) continue;
+      const closeIdx = scanChartTagClose(codeText, matchStart + m[0].length);
+      if (closeIdx === -1) continue;
+      const tagText = codeText.slice(matchStart, closeIdx + 1);
       if (HAS_ARIA_LABEL_PROP.test(tagText)) continue;
-      const startLine = codeText.slice(0, m.index ?? 0).split("\n").length;
+      const startLine = codeText.slice(0, matchStart).split("\n").length;
       const endLine = startLine + (tagText.split("\n").length - 1);
       if (isAllowedInRange(startLine, endLine, "chart-missing-aria-label")) continue;
       findings.push({

package/dist/query-client.d.ts

@@ -34,11 +34,23 @@ export declare function createBasaltQueryClient(config?: QueryClientConfig): Que
  * wrapper that leaves `data` unset on a miss — rather than explicitly `null` — is caught the same
  * way; the two envelope shapes argo's own pre-basalt `unwrap` and basalt's ONLY differed on.
  *
- * **Two overloads, one name** — a Promise of the envelope (basalt's original shape,
- * `queryFn: () => unwrap(api.x.get())`), or the ALREADY-RESOLVED envelope itself
- * (`unwrap(await api.x.get())`, or passed directly as a `.then(unwrap)` callback — both argo's
- * 97 call sites' shapes). Never a generic argument to disambiguate: TS infers the right overload
- * from whether the argument IS a `Promise`.
+ * **One generic signature, a conditional return** — a Promise of the envelope (basalt's original
+ * shape, `queryFn: () => unwrap(api.x.get())`) or the ALREADY-RESOLVED envelope itself
+ * (`unwrap(await api.x.get())`), both resolve `TData` off the same conditional. The two-overload
+ * form this replaced (1.29.0) resolved `unwrap` to `unknown` whenever it was passed as a bare
+ * callback — `.then(unwrap)` never applies an overload, it just reads the declared type of the
+ * `unwrap` reference — so `api.threads.get().then(unwrap)` silently widened. A single generic
+ * signature has exactly one type to read regardless of how the reference is used.
+ *
+ * **The conditional infers the raw `data` type and strips `null`/`undefined` from it**, rather
+ * than inferring the already-narrowed `Envelope<TData>`'s `TData` directly — Eden Treaty's
+ * response type is a UNION of envelope shapes (`{ data: T; error: null } | { data: null; error:
+ * EdenFetchError }`), and inferring through `Envelope<infer TData>` reads `TData` off whichever
+ * union member the conditional happens to match, landing on `T | null` at every Eden call site. A
+ * conditional type distributes over a union input when the checked type is a bare type parameter,
+ * so inferring `D` from `{ data: infer D; error: unknown }` and wrapping the result in
+ * `NonNullable` runs the check per union member and unions the results back together —
+ * `NonNullable<T> | NonNullable<null>` collapses to `T`.
  *
  * @example
  * import { unwrap } from 'basalt-ui'
@@ -48,16 +60,26 @@ export declare function createBasaltQueryClient(config?: QueryClientConfig): Que
  * // mutation:
  * mutationFn: (body) => unwrap(api.resource.post({ body }))
  *
- * // resolved-envelope — either shape:
+ * // resolved-envelope — either shape, including a bare `.then(unwrap)` callback:
  * const rows = unwrap(await api.users.get())
  * const rows2 = await api.users.get().then(unwrap)
  */
-export declare function unwrap<TData>(response: Promise<{
+export declare function unwrap<R extends Envelope | Promise<Envelope>>(response: R): UnwrapResult<R>;
+/** Transport-agnostic `{ data, error }` result shape — Eden Treaty, a raw fetch wrapper, etc. */
+type Envelope<TData = unknown> = {
     data: TData | null | undefined;
     error: unknown;
-}>): Promise<TData>;
-export declare function unwrap<TData>(response: {
-    data: TData | null | undefined;
+};
+/** `unwrap`'s conditional return: a `Promise<TData>` when `R` is a promised envelope, `TData` when
+ * it is an already-resolved one — inferred off the SAME `R` the overload used to split on, and
+ * distributing over a union `R` (see the JSDoc above) so an Eden Treaty response's null branch
+ * never leaks into the resolved type. */
+type UnwrapResult<R> = R extends Promise<{
+    data: infer TData;
+    error: unknown;
+}> ? Promise<NonNullable<TData>> : R extends {
+    data: infer TData;
     error: unknown;
-}): TData;
+} ? NonNullable<TData> : never;
+export {};
 //# sourceMappingURL=query-client.d.ts.map

package/dist/query-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-client.d.ts","sourceRoot":"","sources":["../src/query-client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAW9D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,CAAC,EAAE,iBAAiB,GAAG,WAAW,CAQ/E;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAC1B,QAAQ,EAAE,OAAO,CAAC;IAAE,IAAI,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,GACpE,OAAO,CAAC,KAAK,CAAC,CAAA;AACjB,wBAAgB,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE;IAAE,IAAI,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG,KAAK,CAAA"}
+{"version":3,"file":"query-client.d.ts","sourceRoot":"","sources":["../src/query-client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAW9D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,CAAC,EAAE,iBAAiB,GAAG,WAAW,CAQ/E;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAK3F;AAED,iGAAiG;AACjG,KAAK,QAAQ,CAAC,KAAK,GAAG,OAAO,IAAI;IAAE,IAAI,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAA;AAEnF;;;yCAGyC;AACzC,KAAK,YAAY,CAAC,CAAC,IACjB,CAAC,SAAS,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,GACpD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,GAC3B,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC7C,WAAW,CAAC,KAAK,CAAC,GAClB,KAAK,CAAA"}

package/dist/query-client.js

@@ -15,7 +15,9 @@ function createBasaltQueryClient(config) {
   });
 }
 function unwrap(response) {
-  if (response instanceof Promise) return response.then((envelope) => unwrapEnvelope(envelope));
+  if (response instanceof Promise) {
+    return response.then((envelope) => unwrapEnvelope(envelope));
+  }
   return unwrapEnvelope(response);
 }
 function unwrapEnvelope(envelope) {

package/dist/surfaces.d.ts

@@ -32,7 +32,7 @@ export type RuleName = 'tokens' | 'charts' | 'mantine' | 'state' | 'controls' |
  * const id: PluginRuleId = 'hand-rolled-filter' // ok
  * // const bad: PluginRuleId = 'hand-rolled-filters' // tsc error
  */
-export declare const PLUGIN_RULE_ID_LIST: readonly ["no-raw-font-size", "raw-size-literal", "card-inset", "chart-in-raw-surface", "hand-rolled-plot", "chart-legend-literal", "shadow-basalt-export", "hand-rolled-shell", "raw-scroll-container", "hand-rolled-filter", "control-outside-home", "bound-control-outside-home", "control-size-literal", "page-bar-budget", "in-body-page-title", "responsive-twin", "search-literal-link", "use-search-from-literal", "provider-above-router", "query-dual-import", "query-fn-unwrap", "deprecated-export", "forms-field-key", "visx-boundary", "visx-tooltip", "token-layer-boundary", "agent-resume-guard", "agent-no-raw-usechat", "ai-sdk-major", "no-import-meta-env"];
+export declare const PLUGIN_RULE_ID_LIST: readonly ["no-raw-font-size", "raw-size-literal", "card-inset", "chart-in-raw-surface", "hand-rolled-plot", "chart-legend-literal", "shadow-basalt-export", "hand-rolled-shell", "raw-scroll-container", "hand-rolled-filter", "control-outside-home", "bound-control-outside-home", "control-size-literal", "page-bar-budget", "in-body-page-title", "responsive-twin", "search-literal-link", "use-search-from-literal", "provider-above-router", "query-fn-unwrap", "deprecated-export", "forms-field-key", "visx-boundary", "visx-tooltip", "token-layer-boundary", "agent-resume-guard", "agent-no-raw-usechat", "ai-sdk-major", "no-import-meta-env"];
 /** One registered oxlint plugin rule id — the literal union of {@link PLUGIN_RULE_ID_LIST}. */
 export type PluginRuleId = (typeof PLUGIN_RULE_ID_LIST)[number];
 /** The 3 shipped skill names (agent/skills/basalt-{name}/SKILL.md, placed into a consumer's
@@ -424,7 +424,7 @@ export declare const SURFACES: {
         readonly rule: "batteries";
         readonly skill: readonly ["basalt-app"];
         readonly guardKinds: readonly [];
-        readonly pluginRules: readonly ["query-dual-import", "query-fn-unwrap"];
+        readonly pluginRules: readonly ["query-fn-unwrap"];
         readonly globs: {
             readonly shipped: readonly ["**/*.{ts,tsx}"];
             readonly repo: readonly ["packages/basalt-ui/src/**"];

package/dist/surfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surfaces.d.ts","sourceRoot":"","sources":["../src/surfaces.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"surfaces.d.ts","sourceRoot":"","sources":["../src/surfaces.ts"],"names":[],"mappings":"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"}

package/dist/surfaces.js

@@ -18,7 +18,6 @@ const PLUGIN_RULE_ID_LIST = [
   "search-literal-link",
   "use-search-from-literal",
   "provider-above-router",
-  "query-dual-import",
   "query-fn-unwrap",
   "deprecated-export",
   "forms-field-key",
@@ -456,10 +455,12 @@ const SURFACES = {
     rule: "batteries",
     skill: ["basalt-app"],
     guardKinds: [],
-    // query-dual-import / query-fn-unwrap: reassigned here from the now-dropped `./query` surface
-    // (C1 consolidation — createBasaltQueryClient/unwrap/BasaltQueryDevtools are root barrel
-    // exports now, but their doctrine stays `batteries` — "use the shipped thing" — not `mantine`).
-    pluginRules: ["query-dual-import", "query-fn-unwrap"],
+    // query-fn-unwrap: reassigned here from the now-dropped `./query` surface (C1 consolidation —
+    // createBasaltQueryClient/unwrap/BasaltQueryDevtools are root barrel exports now, but their
+    // doctrine stays `batteries` — "use the shipped thing" — not `mantine`). `query-dual-import`
+    // was retired alongside it — its premise (a raw `@tanstack/react-query` import beside
+    // `basalt-ui/query`) is unreachable now that the `./query` subpath is gone.
+    pluginRules: ["query-fn-unwrap"],
     globs: {
       // Shipped is a catch-all (not just src/**+app/**) so consumer code under components/, lib/,
       // features/, etc. is also covered. The @visx/*-only-in-charts and Mantine-free charts/tokens

package/llms.txt

@@ -1,4 +1,4 @@
-# basalt-ui v1.29.0
+# basalt-ui v1.29.2
 # Opinionated framework for Mantine-based React apps — theme, app shell, visx charts, toolchain presets
 #
 # basalt-ui is an opinionated framework for Mantine-based React apps.
@@ -19,7 +19,7 @@
 # ./tokens.css subpath. Guide: docs/FRAMEWORK-FREE.md in the repo.
 
 Package: basalt-ui
-Version: 1.29.0
+Version: 1.29.2
 
 ## basalt-ui
 Import: import { ... } from 'basalt-ui'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basalt-ui",
-  "version": "1.29.0",
+  "version": "1.29.2",
   "description": "Opinionated framework for Mantine-based React apps — theme, app shell, visx charts, toolchain presets",
   "keywords": [
     "charts",

package/src/dev-dock.tsx

@@ -42,11 +42,14 @@ const TOOL_TITLE: Record<BasaltDevDockTool, string> = {
   theme: 'Theme Lab',
 }
 
-// Minimal structural shape of a TanStack `Router` instance — avoids a hard, eager type
-// dependency on `@tanstack/react-router` for a consumer who never renders the `'router'` tool.
-// `TanStackRouterDevtoolsPanel` itself takes the real (much wider) `AnyRouter` type; this
-// structural subset is only what THIS component threads through as a prop.
-type DevDockRouter = { __routerHasBeenSetup?: unknown } | Record<string, unknown>
+// Any non-null object — avoids a hard, eager type dependency on `@tanstack/react-router` for a
+// consumer who never renders the `'router'` tool, while still accepting a REAL `Router` class
+// instance with no cast. A narrower structural type (matching a `Router` field, or falling back
+// to `Record<string, unknown>`) used to reject that instance under TS weak-type detection: a
+// class instance declares no index signature, so it has no excess-property overlap with either
+// branch. `TanStackRouterDevtoolsPanel` itself takes the real (much wider) `AnyRouter` type; the
+// devtools panel is the only reader of this prop, so `object` is exactly as wide as it needs to be.
+type DevDockRouter = object
 
 const LazyRouterDevtoolsPanel = lazy(() =>
   import('@tanstack/react-router-devtools').then((m) => ({
@@ -135,8 +138,8 @@ export function BasaltDevDock({
           {tool === 'router' && router !== undefined && (
             <LazyRouterDevtoolsPanel
               // The devtools panel's own `router` prop takes the real `AnyRouter` type;
-              // `DevDockRouter` is deliberately a narrower structural stand-in so this module
-              // never eagerly imports the router's types.
+              // `DevDockRouter` is deliberately the widest structural stand-in (`object`) so this
+              // module never eagerly imports the router's types.
               // oxlint-disable-next-line typescript/no-explicit-any -- see above
               router={router as any}
               isOpen

package/src/forms/use-form-submit.ts

@@ -82,7 +82,7 @@ export type UseFormSubmitOptions<Values extends Record<string, unknown>> = {
   onError?: (err: unknown) => void
   /**
    * Turns a thrown value into the message `submitError` carries. Defaults to `toErrorMessage`
-   * (`basalt-ui/query`), which already unwraps `Error`, `{ message }` and Eden's `{ status, value }`.
+   * (root barrel), which already unwraps `Error`, `{ message }` and Eden's `{ status, value }`.
    * Override it to brand the copy or to branch on `errorStatus(err)`.
    */
   mapError?: (err: unknown) => string

package/src/guard/index.ts

@@ -154,8 +154,8 @@ const INLINE_FONT_SIZE =
 // A `Card` / `Paper` opening tag carrying `withBorder`. Card depth is `--vx-shadow-card`, whose 1px
 // ring lives INSIDE the shadow value; `withBorder` therefore adds a SECOND, real `border` property
 // on top of it (the theme's `styles.root` pins bg/shadow/radius but never clears `border`), and the
-// card reads heavy/boxed. Bounded full-text tag scan, same shape as CHART_ENTRY_POINT_TAG below, so
-// a multi-line-formatted tag still resolves to one match.
+// card reads heavy/boxed. Bounded full-text tag scan, same shape as CHART_ENTRY_POINT_TAG_START below,
+// so a multi-line-formatted tag still resolves to one match.
 //
 // Two deliberate non-matches:
 //   • `<Card.Section withBorder>` — a section DIVIDER, not card depth. Excluded by the `(?![\w.])`
@@ -409,18 +409,49 @@ const MOTION_TRANSITION_NUMERIC =
   /\btransition\s*=\s*\{\{[^}]*\b(?:duration|stiffness|damping|mass)\s*:\s*-?\d/g
 const MOTION_TRANSITION_EASE_ARRAY = /\btransition\s*=\s*\{\{[^}]*\bease\s*:\s*\[/g
 
-// A chart entry-point JSX tag (the 7 kinds + 2 sparklines) — full opening/self-closing tag,
-// scanned for a missing `ariaLabel` prop (an accessible text alternative for the SVG graphic).
-// Bounded, full-text scan so a multi-line-formatted tag still resolves to one match. The scan must
-// survive two `>` decoys inside an opening tag: an explicit JSX generic argument
-// (`<MultiLine<Point>`) — consumed by the optional `<[^<>]*>` group — and arrow functions in prop
-// expressions (`getX={(d) => d.date}`) — consumed atomically by the `=>` alternative so their `>`
-// never terminates the tag early. A bare `>` comparison inside a prop expression still ends the
-// match (accepted limitation of the bounded scan).
-const CHART_ENTRY_POINT_TAG =
-  /<(MultiLine|Bars|BandStrip|Donut|DualPanel|Heatmap|MirroredBars|ZonedLine|StackedArea|LineSparkline|BarSparkline)\b(?:<[^<>]*>)?(?:=>|[^>])*?>/g
+// A chart entry-point JSX tag (the 7 kinds + 2 sparklines) — matches the opening `<Name` plus an
+// optional explicit JSX generic argument (`<MultiLine<Point>`); the rest of the tag (up to its
+// closing `>`) is resolved by `scanChartTagClose` below, brace-depth aware, so it survives every
+// `>`-shaped decoy inside a prop expression — arrow functions (`=>`), comparisons (`>=`, `<=`),
+// shifts (`>>`) — without needing to enumerate them: a `>` only closes the tag outside every `{…}`.
+const CHART_ENTRY_POINT_TAG_START =
+  /<(MultiLine|Bars|BandStrip|Donut|DualPanel|Heatmap|MirroredBars|ZonedLine|StackedArea|LineSparkline|BarSparkline)\b(?:<[^<>]*>)?/g
 const HAS_ARIA_LABEL_PROP = /\bariaLabel\s*=/
 
+/**
+ * Scans forward from `start` (immediately after a chart tag's name/generic-args) for the `>` that
+ * closes the JSX tag. Curly-brace depth aware: a `>` only closes the tag at depth 0, so anything
+ * living inside a `{…}` prop expression — `=>`, `>=`, `<=`, `>>`, a nested JSX child's own `>` —
+ * never ends the tag early. String/template literals are skipped verbatim so a quoted `>`
+ * cannot perturb the depth count either. Returns the index of the closing `>`, or -1 if the tag
+ * never closes (malformed/truncated source — the caller treats that as no match).
+ */
+function scanChartTagClose(codeText: string, start: number): number {
+  let depth = 0
+  let i = start
+  while (i < codeText.length) {
+    const ch = codeText[i]
+    if (ch === '"' || ch === "'" || ch === '`') {
+      const quote = ch
+      i++
+      while (i < codeText.length && codeText[i] !== quote) {
+        i += codeText[i] === '\\' ? 2 : 1
+      }
+      i++
+      continue
+    }
+    if (ch === '{') {
+      depth++
+    } else if (ch === '}') {
+      depth = Math.max(0, depth - 1)
+    } else if (ch === '>' && depth === 0) {
+      return i
+    }
+    i++
+  }
+  return -1
+}
+
 // ── Tag provenance, shared by chart-missing-aria-label ────────────────────────────────────────────
 //
 // `chart-missing-aria-label` keys on a JSX tag NAME, which is the whole of its signal — so a
@@ -472,13 +503,13 @@ function basaltImportedNames(codeText: string): ReadonlySet<string> {
 const RAW_FORM_CONTROL = /<(?:input|select|textarea)\b/g
 
 // A raw form-control's own opening tag — bounded full-text scan (same shape as CARD_SURFACE_TAG /
-// CHART_ENTRY_POINT_TAG), used ONLY by sub-16-input-font to search the tag's own inline `style`
+// CHART_ENTRY_POINT_TAG_START), used ONLY by sub-16-input-font to search the tag's own inline `style`
 // for a sub-floor fontSize.
 const RAW_FORM_CONTROL_TAG = /<(?:input|select|textarea)\b(?:=>|[^>])*?>/g
 
 // ── Control-home patterns (docs/CONTROLS-SPEC.md §6 — the text lane of laws C1/C8) ──────────────
 //
-// Bounded full-text tag scans, the CARD_SURFACE_TAG / CHART_ENTRY_POINT_TAG shape: a `<Title>` and a
+// Bounded full-text tag scans, the CARD_SURFACE_TAG / CHART_ENTRY_POINT_TAG_START shape: a `<Title>` and a
 // `<Select>` are both routinely formatted across lines, so a per-line regex would see neither.
 
 /** A `<Title …>` opening tag, however it is wrapped. `order` is judged separately, on the tag text. */
@@ -877,7 +908,6 @@ export const PLUGIN_RULE_IDS: ReadonlySet<string> = new Set([
   // `checkSource`'s reach: provenance here is an import graph and a JSX ancestry, neither of which
   // a 12-line regex window has. Same reason `bound-control-outside-home` has no text-lane twin.
   'provider-above-router',
-  'query-dual-import',
   'query-fn-unwrap',
   'deprecated-export',
   // Same lane: `{...inputProps(…)}` without a sibling `key` is a JSX-ancestry claim (does this
@@ -904,6 +934,10 @@ export const PLUGIN_RULE_IDS: ReadonlySet<string> = new Set([
   // notifications>` is unreachable now that `BasaltNotifications` no longer exists as a
   // standalone export. Mirrored by the plugin's own `RETIRED_RULE_IDS`.
   'duplicate-notifications-mount',
+  // Retired plugin rule — its whole premise (a raw `@tanstack/react-query` import beside
+  // `basalt-ui/query`) is unreachable now that C1 (1.29.0) dropped the `./query` subpath.
+  // Mirrored by the plugin's own `RETIRED_RULE_IDS`.
+  'query-dual-import',
 ])
 
 /** The shortest string accepted as a written reason — enough to exclude a stray separator. */
@@ -1901,7 +1935,7 @@ export const GUARD_RULES = {
   },
   'chart-missing-aria-label': {
     kind: 'chart-missing-aria-label',
-    pattern: CHART_ENTRY_POINT_TAG, // handled inline (full-text tag-scoped scan); entry keeps registry complete
+    pattern: CHART_ENTRY_POINT_TAG_START, // handled inline (full-text tag-scoped scan); entry keeps registry complete
     enabled: (cfg: GuardConfig) => cfg.chartMissingAriaLabel,
     // JSX-tag-shaped (`<MultiLine …>`) — never appears in CSS text.
     appliesTo: (relPath) => !relPath.endsWith('.css'),
@@ -2349,12 +2383,15 @@ export function checkSource(text: string, relPath: string, cfg: GuardConfig): Fi
   // that is missing the prop. The allow-comment is honored anywhere in the tag's span, so a
   // `theme-allow` that used to sit on the closing line keeps working.
   if (ariaLabelRuns) {
-    for (const m of codeText.matchAll(CHART_ENTRY_POINT_TAG)) {
-      const tagText = m[0]
+    for (const m of codeText.matchAll(CHART_ENTRY_POINT_TAG_START)) {
+      const matchStart = m.index ?? 0
       // A tag this file defines itself is not the shipped kind — it does not take `ariaLabel`.
       if (!isShippedTag(m[1] as string)) continue
+      const closeIdx = scanChartTagClose(codeText, matchStart + m[0].length)
+      if (closeIdx === -1) continue
+      const tagText = codeText.slice(matchStart, closeIdx + 1)
       if (HAS_ARIA_LABEL_PROP.test(tagText)) continue
-      const startLine = codeText.slice(0, m.index ?? 0).split('\n').length
+      const startLine = codeText.slice(0, matchStart).split('\n').length
       const endLine = startLine + (tagText.split('\n').length - 1)
       if (isAllowedInRange(startLine, endLine, 'chart-missing-aria-label')) continue
       findings.push({

package/src/query-client.ts

@@ -55,11 +55,23 @@ export function createBasaltQueryClient(config?: QueryClientConfig): QueryClient
  * wrapper that leaves `data` unset on a miss — rather than explicitly `null` — is caught the same
  * way; the two envelope shapes argo's own pre-basalt `unwrap` and basalt's ONLY differed on.
  *
- * **Two overloads, one name** — a Promise of the envelope (basalt's original shape,
- * `queryFn: () => unwrap(api.x.get())`), or the ALREADY-RESOLVED envelope itself
- * (`unwrap(await api.x.get())`, or passed directly as a `.then(unwrap)` callback — both argo's
- * 97 call sites' shapes). Never a generic argument to disambiguate: TS infers the right overload
- * from whether the argument IS a `Promise`.
+ * **One generic signature, a conditional return** — a Promise of the envelope (basalt's original
+ * shape, `queryFn: () => unwrap(api.x.get())`) or the ALREADY-RESOLVED envelope itself
+ * (`unwrap(await api.x.get())`), both resolve `TData` off the same conditional. The two-overload
+ * form this replaced (1.29.0) resolved `unwrap` to `unknown` whenever it was passed as a bare
+ * callback — `.then(unwrap)` never applies an overload, it just reads the declared type of the
+ * `unwrap` reference — so `api.threads.get().then(unwrap)` silently widened. A single generic
+ * signature has exactly one type to read regardless of how the reference is used.
+ *
+ * **The conditional infers the raw `data` type and strips `null`/`undefined` from it**, rather
+ * than inferring the already-narrowed `Envelope<TData>`'s `TData` directly — Eden Treaty's
+ * response type is a UNION of envelope shapes (`{ data: T; error: null } | { data: null; error:
+ * EdenFetchError }`), and inferring through `Envelope<infer TData>` reads `TData` off whichever
+ * union member the conditional happens to match, landing on `T | null` at every Eden call site. A
+ * conditional type distributes over a union input when the checked type is a bare type parameter,
+ * so inferring `D` from `{ data: infer D; error: unknown }` and wrapping the result in
+ * `NonNullable` runs the check per union member and unions the results back together —
+ * `NonNullable<T> | NonNullable<null>` collapses to `T`.
  *
  * @example
  * import { unwrap } from 'basalt-ui'
@@ -69,27 +81,32 @@ export function createBasaltQueryClient(config?: QueryClientConfig): QueryClient
  * // mutation:
  * mutationFn: (body) => unwrap(api.resource.post({ body }))
  *
- * // resolved-envelope — either shape:
+ * // resolved-envelope — either shape, including a bare `.then(unwrap)` callback:
  * const rows = unwrap(await api.users.get())
  * const rows2 = await api.users.get().then(unwrap)
  */
-export function unwrap<TData>(
-  response: Promise<{ data: TData | null | undefined; error: unknown }>,
-): Promise<TData>
-export function unwrap<TData>(response: { data: TData | null | undefined; error: unknown }): TData
-export function unwrap<TData>(
-  response:
-    | Promise<{ data: TData | null | undefined; error: unknown }>
-    | { data: TData | null | undefined; error: unknown },
-): TData | Promise<TData> {
-  if (response instanceof Promise) return response.then((envelope) => unwrapEnvelope(envelope))
-  return unwrapEnvelope(response)
+export function unwrap<R extends Envelope | Promise<Envelope>>(response: R): UnwrapResult<R> {
+  if (response instanceof Promise) {
+    return response.then((envelope) => unwrapEnvelope(envelope)) as unknown as UnwrapResult<R>
+  }
+  return unwrapEnvelope(response as Envelope) as unknown as UnwrapResult<R>
 }
 
-function unwrapEnvelope<TData>(envelope: {
-  data: TData | null | undefined
-  error: unknown
-}): TData {
+/** Transport-agnostic `{ data, error }` result shape — Eden Treaty, a raw fetch wrapper, etc. */
+type Envelope<TData = unknown> = { data: TData | null | undefined; error: unknown }
+
+/** `unwrap`'s conditional return: a `Promise<TData>` when `R` is a promised envelope, `TData` when
+ * it is an already-resolved one — inferred off the SAME `R` the overload used to split on, and
+ * distributing over a union `R` (see the JSDoc above) so an Eden Treaty response's null branch
+ * never leaks into the resolved type. */
+type UnwrapResult<R> =
+  R extends Promise<{ data: infer TData; error: unknown }>
+    ? Promise<NonNullable<TData>>
+    : R extends { data: infer TData; error: unknown }
+      ? NonNullable<TData>
+      : never
+
+function unwrapEnvelope<TData>(envelope: Envelope<TData>): TData {
   const { data, error } = envelope
   if (error) throw error
   if (data === null || data === undefined)

package/src/surfaces.ts

@@ -56,7 +56,6 @@ export const PLUGIN_RULE_ID_LIST = [
   'search-literal-link',
   'use-search-from-literal',
   'provider-above-router',
-  'query-dual-import',
   'query-fn-unwrap',
   'deprecated-export',
   'forms-field-key',
@@ -672,10 +671,12 @@ export const SURFACES = {
     rule: 'batteries',
     skill: ['basalt-app'],
     guardKinds: [],
-    // query-dual-import / query-fn-unwrap: reassigned here from the now-dropped `./query` surface
-    // (C1 consolidation — createBasaltQueryClient/unwrap/BasaltQueryDevtools are root barrel
-    // exports now, but their doctrine stays `batteries` — "use the shipped thing" — not `mantine`).
-    pluginRules: ['query-dual-import', 'query-fn-unwrap'],
+    // query-fn-unwrap: reassigned here from the now-dropped `./query` surface (C1 consolidation —
+    // createBasaltQueryClient/unwrap/BasaltQueryDevtools are root barrel exports now, but their
+    // doctrine stays `batteries` — "use the shipped thing" — not `mantine`). `query-dual-import`
+    // was retired alongside it — its premise (a raw `@tanstack/react-query` import beside
+    // `basalt-ui/query`) is unreachable now that the `./query` subpath is gone.
+    pluginRules: ['query-fn-unwrap'],
     globs: {
       // Shipped is a catch-all (not just src/**+app/**) so consumer code under components/, lib/,
       // features/, etc. is also covered. The @visx/*-only-in-charts and Mantine-free charts/tokens