Group panels/ toolkit into controls/dialogs/cursor; cleanse refactor plan

panels/ subfolders for the reusable pieces that were sitting flat:
- controls/  grid, color_picker, asset_picker (field-adjacent components)
- dialogs/   file_dialog (reusable modal)
- cursor/    cursortip, drag_cursor (map cursor overlays)

Import sites updated across the crate. The editor-hosting machinery
(manager, view, input, editor_slot, field_session, modal_stack,
action_dispatcher, brush_sync, editor, registry) stays flat for now.
brush.rs stays in the UI layer: it is the action-strip renderer, not a
brush, and moving it out would reintroduce the states -> panel dependency.

Delete the spent ui-architecture.md design doc; rewrite the WIP refactor
plan to record what is done and keep only the remaining structural work.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: gajop

docs/porting/01-wip-refactor-plan.md

@@ -1,131 +1,80 @@
 ---
 name: Rust WIP refactor plan
-description: Structural work to complete in rust-wip before selectively moving domains into rust-stable
+description: Remaining structural work in rust-wip before selectively moving domains into rust-stable
 ---
 
 # Rust WIP refactor plan
 
-## Purpose
-
 `rust-wip` is functionally broad but developed as a fast, exploratory workspace.
-Before work is transferred into `rust-stable`, make its ownership boundaries and
-module structure match [conventions.md](conventions.md). The stable branch should
-then receive small, reviewable domain slices rather than architectural cleanup.
-
-This is a plan, not a license to cherry-pick the existing WIP history. The
-current 87 WIP-only commits are archaeological evidence; WIP is the source
-snapshot and stable receives deliberate file-level transfers.
-
-## Assessment baseline
-
-On 2026-07-18, `rust-stable` was the merge base of `rust-wip`. The committed
-delta was 463 files, +44,043 / -2,642 lines. The largest native additions were
-the panel UI (+13,421 lines), Chonsole (+3,729), editing states (+2,999), and
-developer console (+1,944).
-
-The backend is already mostly feature-first: commands, models, and tests are
-generally co-located under their feature directories. The main exception is the
-native UI, which is organized by rendering technology under `panels/editors`.
-
-## Refactors required before stable transfers
-
-### 1. Make feature UI feature-owned
+Before work transfers into `rust-stable`, its ownership boundaries and module
+structure must match [conventions.md](conventions.md), so the stable branch
+receives small, reviewable domain slices rather than architectural cleanup.
 
-`panels/` must retain only reusable RmlUi infrastructure: host/document
-lifecycle, fields, modal primitives, grid, input, and shared theme. Move actual
-editor behaviour beside the feature it represents:
+## Done
 
-```text
-objects/ui/{definitions,properties,collision}/
-heightmap/ui/
-grass/ui/
-metal/ui/
-textures/ui/
-map_settings/ui/
-teams/ui/
-project/ui/
-```
+- Feature UI is feature-owned (`<feature>/ui/`, each editor split into
+  `model` / `layout` / `behavior`); the old `panels/editors/` is gone.
+- `ModelShader` extracted to `sbc/render/`; `states` no longer imports panel UI.
+- `PanelManager` decomposed into `EditorSlot` / `FieldSession` / `ModalStack` /
+  `ActionDispatcher` / `BrushSync`; the wide `Editor` trait is implemented once
+  by the generic `Runtime<B>`.
+- Shared theme split into `panels/theme/*.rcss`.
+- Concrete UI moved out of `panels/`: the dev editor → `dev/`, the new-project
+  dialog → `project/`, def thumbnails → `objects/`. Reusable pieces grouped
+  under `panels/{controls,dialogs,cursor,fields,runtime,theme}`.
 
-The generic panel registry can remain shared, but each feature must register its
-own editor. This is the highest-value refactor: an Objects or Textures transfer
-then becomes a coherent domain copy rather than surgery inside a generic folder.
+## Remaining
 
-### 2. Remove the state → panel dependency
+### Objects boundary
 
-Editing states currently depend on `panels::ModelShader` for ghost previews,
-selection highlights, movement, and rotation. Extract world rendering to
-`states` or a neutral renderer module. Map interaction must not depend on the
-right-hand panel implementation.
+Properties and Collision still duplicate selection projection and object-field
+mapping. Extract a shared `objects/ui/selection.rs` both project through. Also
+TODO #1: replace the generic JSON Area/Feature/Unit object commands with
+concrete typed commands, and cache static object-field descriptors.
 
-### 3. Shrink the panel coordinator and editor contract
+### Split project IO from the Project feature
 
-`PanelManager` currently owns document lifecycle, editor lifecycle, actions,
-field commits/drags, modal coordination, state synchronisation, and cursor tips.
-Keep a small composition point, but extract active-editor lifecycle, modal
-coordination, toolbar actions, and field commits into focused components.
+Finish extracting project paths + save/load/export registrations into a neutral
+project-IO/workspace module (`io_registries`, `paths` exist but still sit inside
+`project/`). Scenario metadata, archive export, reload, map info, and the
+project editor stay in `project/`. This is TODO #16; it stops each saving
+feature depending on the whole Project feature.
 
-Likewise split the broad `Editor` trait into explicit capabilities around
-lifecycle/rendering, field hosting, brush/state binding, and optional modal
-ownership. Do not introduce a general event bus or UI framework: retain the
-explicit update/input order, just give each concern a narrow owner.
+### Texture material ownership
 
-### 4. Finish the Objects boundary
+`list_materials` / `material_of` still live in `textures/ui/model.rs`. Move
+material discovery/parsing into the `textures` feature proper; the editor
+consumes it. Texture/material ownership must not be trapped in a panel editor
+before the Textures domain transfers.
 
-Refactor the Objects UI into definitions/catalog/filtering/placement/thumbnails,
-properties, and collision submodules. Properties and collision must share
-selection projection and object-field mapping rather than duplicate conversion
-logic.
+### Split the E2ERun monolith
 
-At the same time, complete TODO #1 in [todo.md](todo.md): replace generic
-JSON-based Area/Feature/Unit object commands with concrete typed commands, and
-cache static object-field descriptors. This makes Objects safer and smaller to
-review in stable.
+`tools/e2e/runner.py` (~1150 lines) into engine-session lifecycle, input,
+assertions + command-log reading, screenshots/artifacts, and reporting. Semantic
+UI coordinates already live in `scenarios/geometry.py`.
 
-### 5. Split project persistence from the Project feature
+### Finish the panels/ toolkit
 
-Extract project paths plus save/load/export registrations into a neutral
-project-IO/workspace module. Leave scenario metadata, archive export, reload,
-map info, and project-editor functionality in `project/`. This is TODO #16 and
-prevents each saving feature from depending on the whole Project feature.
+- `brush.rs` is misnamed: it is the brush-editor action-strip UI plus a couple
+  of asset-field helpers, not "a brush". Rename to reflect that it is UI (e.g. an
+  action-strip control) — it must stay in the UI layer, because it renders RML
+  and moving it out reintroduces the `states → panel` dependency.
+- `modal_stack` enumerates concrete dialogs as fields
+  (`new_project: NewProjectDialog`). If it is meant to be the app-wide modal
+  concept, dialogs should self-register (inventory, like editors) rather than be
+  listed. Also review what `modal_stack` actually does.
+- `tokens.rcss`: a single source for colours/spacing/sizes needs build-time
+  substitution, because RmlUi's RCSS has no variables.
 
-### 6. Split the texture editor by ownership
+### Loud duplicate registration
 
-Move material discovery/parsing into `textures`, separate saved-brush state, and
-leave a thin UI composition layer. Texture/material ownership must not be
-trapped in one large panel editor before the Textures domain is transferred.
+Duplicate model-factory registration should fail loudly, as duplicate command
+registration already does.
 
-### 7. Establish a shared native RmlUi theme
+## Do not rewrite first
 
-Centralize common text, color, border, opacity, button, toggle, dropdown, and
-tooltip rules. Keep only document-specific layout in panel, Chonsole, and
-developer-console stylesheets. This prevents future stable slices from changing
-three visual systems for one control correction.
-
-### 8. Separate E2E runner responsibilities
-
-Split the `E2ERun` monolith into engine session lifecycle, input, assertions and
-command-log reading, screenshots/artifacts, and reporting. Keep semantic UI
-coordinates centralized in `scenarios/geometry.py`; that file already fixes the
-previous scattered-coordinate problem.
-
-## Do not rewrite these first
-
-- Chonsole is already sensibly divided into catalog, completion, input, history,
-  model, and views. Transfer it as one domain after shared RmlUi lifecycle work.
-- Developer console has a useful actions/log/metrics/manager/view split. Limit
-  restructuring to common lifecycle and theme extraction.
+- Chonsole (catalog/completion/input/history/model/views) and the developer
+  console (actions/log/metrics/manager/view) are already sensibly divided;
+  transfer each as one domain after shared RmlUi lifecycle work.
 - Do not replace the command system wholesale; reconcile only its required WIP
   delta against stable.
-
-## Completion criteria
-
-Before the first stable transfer:
-
-1. Feature UI no longer lives in `panels/editors`.
-2. `states` no longer imports panel UI/rendering.
-3. Project IO is independent of the Project feature.
-4. The shared native theme has a single source of truth.
-5. The E2E harness and verification ledger identify a feature's tests without
-   relying on obsolete phase documents.
-6. Duplicate model-factory registration fails loudly, as duplicate command
-   registration already does.

docs/porting/verification.md

@@ -42,9 +42,9 @@ python3 tools/e2e/ui_driver.py <target> --tag ui:rust
 | 3 | Objects → Properties | VERIFIED | Selection-driven fields, complete vector/table commits, map movement, and collision-field propagation. E2E `props_panel`. |
 | 4 | Objects → Collision | VERIFIED | Visibility, type/axis, scale/offset/center/aim, radius/height, linked cylinder scale, and blocking fields. E2E `props_panel` and `collision`. |
 | 5 | Map → Terrain | VERIFIED | Pattern, size, rotation, strength, height, direction, Add/Set/Smooth, textured preview, and a stationary held stroke. E2E `heightmap`, `map-editors`, `pattern-preview`, `terrain-stationary-hold`. |
-| 6 | Map → Texture | VERIFIED | Saved brushes, material dialog, Paint/Filter/DNTS/Void, and splat controls. Rust is the sole owner of texture paint, cache, stroke close, undo, and redo; native GL and Lua command-bridge tests cover that ownership contract. E2E `map-paint`, `map-editors`, `texture-panel`. |
-| 7 | Map → Metal | VERIFIED | Pattern, size, rotation, amount, and painting. E2E `map-editors`. |
-| 8 | Map → Grass | VERIFIED | Pattern, detail, size, rotation, and painting. E2E `map-editors`. |
+| 6 | Map → Texture | VERIFIED | Saved brushes, material dialog, Paint/Filter/DNTS/Void, and splat controls. Rust is the sole owner of texture paint, cache, stroke close, undo, and redo; native GL and Lua command-bridge tests cover that ownership contract. E2E `texture-paint`, `map-editors`. |
+| 7 | Map → Metal | VERIFIED | Pattern, size, rotation, amount, and painting. E2E `map-editors`, `metal-paint`. |
+| 8 | Map → Grass | VERIFIED | Pattern, detail, size, rotation, and painting. E2E `map-editors`, `grass-paint`. |
 | 9 | Map → Settings | VERIFIED | Rendering flags, splat fields, detail texture, and New/Existing texture paths. E2E `map-editors`, `settings-panel`. |
 | 10 | Env → Lighting | VERIFIED | Shadow mode, direction, six colours, and densities. E2E `lighting-panel`. |
 | 11 | Env → Sky | VERIFIED | Atmosphere colours, fog bounds, and skybox picker. E2E `sky-panel`. |

native/src/sbc/map_settings/ui/settings/layout.rs

@@ -1,6 +1,6 @@
 use spring_native::prelude::{Error, NativeInterfaceRef};
 
-use crate::sbc::panels::grid::{list_assets, GridItem};
+use crate::sbc::panels::controls::grid::{list_assets, GridItem};
 use crate::sbc::panels::runtime::Item;
 use crate::sbc::rml::{element_by_id, escape_rml};
 

native/src/sbc/map_settings/ui/settings/model.rs

@@ -2,9 +2,9 @@ use std::cell::RefCell;
 use std::collections::BTreeMap;
 use std::rc::Rc;
 
+use crate::sbc::panels::controls::grid::GridView;
 use crate::sbc::panels::field::FieldValue;
 use crate::sbc::panels::fields::{AssetField, BooleanField, NumericField};
-use crate::sbc::panels::grid::GridView;
 use crate::sbc::panels::runtime::{EditorModel, FieldMut, FieldRef, TableEntry, TableModel};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

native/src/sbc/objects/ui/definitions/behavior.rs

@@ -3,8 +3,8 @@ use spring_native::prelude::{Error, NativeInterfaceRef};
 use crate::sbc::command_system::model::Models;
 use crate::sbc::objects::thumbnails::ThumbKind;
 use crate::sbc::objects::ui::filters::DefTraits;
+use crate::sbc::panels::controls::grid::GridItem;
 use crate::sbc::panels::field::{escape_rml, ChangeQueue, CommitRequest, InteractionQueue};
-use crate::sbc::panels::grid::GridItem;
 use crate::sbc::panels::runtime::{Behavior, Event, Item, Outcome, Phase, Watch};
 use crate::sbc::rml::element_by_id;
 use crate::sbc::states::StateRequest;

native/src/sbc/objects/ui/definitions/model.rs

@@ -7,7 +7,7 @@ use spring_native::prelude::{Error, NativeInterfaceRef};
 use crate::sbc::command_system::model::Models;
 use crate::sbc::objects::thumbnails::ThumbnailRenderer;
 use crate::sbc::objects::ui::filters::{DefTraits, FEATURE_TYPES, TERRAINS, UNIT_TYPES};
-use crate::sbc::panels::grid::{GridItem, GridView};
+use crate::sbc::panels::controls::grid::{GridItem, GridView};
 use crate::sbc::panels::runtime::{
     Brush, DynChoice, DynChoiceDef, EditorModel, FieldMut, FieldRef, Num, NumDef, StrChoice,
     StrChoiceDef,

native/src/sbc/panels/asset_picker.rs …/src/sbc/panels/controls/asset_picker.rsnative/src/sbc/panels/asset_picker.rs renamed to native/src/sbc/panels/controls/asset_picker.rs native/src/sbc/panels/asset_picker.rs renamed to native/src/sbc/panels/controls/asset_picker.rs

@@ -8,8 +8,8 @@ use std::rc::Rc;
 
 use spring_native::prelude::{Error, NativeInterfaceRef};
 
+use crate::sbc::panels::controls::grid::{list_asset_tree, parent_dir, GridView};
 use crate::sbc::panels::field::{element_by_id, escape_rml};
-use crate::sbc::panels::grid::{list_asset_tree, parent_dir, GridView};
 
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum PickerEvent {

native/src/sbc/panels/color_picker.rs …/src/sbc/panels/controls/color_picker.rsnative/src/sbc/panels/color_picker.rs renamed to native/src/sbc/panels/controls/color_picker.rs native/src/sbc/panels/color_picker.rs renamed to native/src/sbc/panels/controls/color_picker.rs

@@ -0,0 +1,6 @@
+//! Interactive components fields and dialogs are built from — grid views and
+//! the colour/asset pickers. Field-like, but not `Field` value controls.
+
+pub(crate) mod asset_picker;
+pub(crate) mod color_picker;
+pub(crate) mod grid;