generic library now instead of string based

Cargo.toml

@@ -3,6 +3,7 @@ name = "pages-tui"
 version = "0.1.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
+description = "Type-safe TUI page routing with single-generic orchestration"
 
 [features]
 default = []

README.md

@@ -1,321 +1,142 @@
-# TUI Orchestrator
+WARNING this library is purely GLM4.7/Opus4.5 generated.
+Its based on a real production code that was not yet decoupled into a library.
+This library is core concept extracted for no_std usage. 
+For more info visit: https://gitlab.com/filipriec/komp_ac_client
+# pages-tui
 
-A complete, **ready-to-use TUI framework** that handles input routing, focus management, page navigation, and lifecycle hooks—so you can define your pages, buttons, and logic, and it just works.
+Type-safe TUI page routing with single-generic orchestration.
 
 ## Features
 
-- **Zero boilerplate** - Define components, library handles everything else
+| Feature | Description |
-- **Ready to use** - Register pages and run, no manual wiring needed
+|---------|-------------|
-- **Sensible defaults** - Works without configuration
+| (none) | Pure `no_std` + heapless. No allocator required. |
-- **Fully extendable** - Customize via traits when needed
+| `alloc` | Enables dynamic allocation (Vec, Box, HashMap). |
-- **no_std compatible** - Works on embedded systems and WebAssembly
+| `std` | Full std support (implies `alloc`). |
-- **Backend-agnostic** - No crossterm/ratatui dependencies
-- **Zero unsafe** - Pure Rust, no unsafe code
 
-## Quick Start
+### Default: Pure `no_std` Heapless
-
-### Define Your Component
-
-```rust
-extern crate alloc;
-
-use tui_orchestrator::prelude::*;
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-enum LoginFocus {
-    Username,
-    Password,
-    LoginButton,
-    CancelButton,
-}
-
-#[derive(Debug, Clone)]
-enum LoginEvent {
-    AttemptLogin { username: String, password: String },
-    Cancel,
-}
-
-struct LoginPage {
-    username: alloc::string::String,
-    password: alloc::string::String,
-}
-
-impl Component for LoginPage {
-    type Focus = LoginFocus;
-    type Action = ComponentAction;
-    type Event = LoginEvent;
-    
-    fn targets(&self) -> &[Self::Focus] {
-        &[
-            LoginFocus::Username,
-            LoginFocus::Password,
-            LoginFocus::LoginButton,
-            LoginFocus::CancelButton,
-        ]
-    }
-    
-    fn handle(&mut self, focus: &Self::Focus, action: Self::Action) -> Result<Option<Self::Event>> {
-        match (focus, action) {
-            (LoginFocus::LoginButton, ComponentAction::Select) => {
-                Ok(Some(LoginEvent::AttemptLogin {
-                    username: self.username.clone(),
-                    password: self.password.clone(),
-                }))
-            }
-            (LoginFocus::CancelButton, ComponentAction::Select) => {
-                Ok(Some(LoginEvent::Cancel))
-            }
-            _ => Ok(None),
-        }
-    }
-    
-    fn handle_text(&mut self, focus: &Self::Focus, ch: char) -> Result<Option<Self::Event>> {
-        match focus {
-            LoginFocus::Username => {
-                self.username.push(ch);
-                Ok(None)
-            }
-            LoginFocus::Password => {
-                self.password.push(ch);
-                Ok(None)
-            }
-            _ => Ok(None),
-        }
-    }
-}
-```
-
-### Register and Run
-
-```rust
-use tui_orchestrator::prelude::*;
-
-fn main() -> Result<()> {
-    let mut orch = Orchestrator::builder()
-        .with_page("login", LoginPage::new())
-        .with_default_bindings()
-        .build()?;
-    
-    orch.navigate_to("login")?;
-    
-    orch.run(&mut MyInputSource)?;
-}
-```
-
-**That's it.** The library handles:
-- Input processing (read keys, route to actions)
-- Focus management (next/prev navigation)
-- Page navigation (on_exit, swap, on_enter)
-- Default keybindings (Tab=Next, Enter=Select)
-- Event collection and routing
-
----
-
-## Core Concepts
-
-### Component
-
-The main abstraction in tui_orchestrator. A component represents a page or UI section with focusable elements.
-
-```rust
-pub trait Component {
-    type Focus: FocusId;         // What can receive focus
-    type Action: Action;          // What actions this handles
-    type Event: Clone + Debug;     // Events this component emits
-    
-    fn targets(&self) -> &[Self::Focus];
-    fn handle(&mut self, focus: &Self::Focus, action: Self::Action) -> Result<Option<Self::Event>>;
-}
-```
-
-**Optional methods** (all have defaults):
-- `on_enter()` - Called when component becomes active
-- `on_exit()` - Called when component becomes inactive
-- `on_focus()` - Called when a focus target gains focus
-- `on_blur()` - Called when a focus target loses focus
-- `handle_text()` - Called when character is typed
-- `can_navigate_forward/backward()` - Control focus movement
-
-### Component Actions
-
-Standard actions the library provides:
-
-```rust
-pub enum ComponentAction {
-    Next,           // Tab
-    Prev,            // Shift+Tab
-    First,           // Home
-    Last,            // End
-    Select,          // Enter
-    Cancel,          // Esc
-    TypeChar(char),  // Any character
-    Backspace,       // Backspace
-    Delete,          // Delete
-    Custom(usize),   // User-defined
-}
-```
-
-### Focus Management
-
-Focus tracks which element is currently active. The library provides:
-
-- `FocusManager<F>` - Generic focus tracking
-- `FocusQuery` - Read-only focus state for rendering
-- Automatic navigation (next, prev, first, last)
-
-### Orchestrator
-
-The complete TUI runtime that wires everything together:
-
-- `Orchestrator<C>` - Main framework struct
-- `process_frame()` - Process one input frame
-- `run()` - Complete main loop
-- Extension points for custom behavior
-
----
-
-## Extension Points
-
-For complex applications (like komp_ac), the library provides extension points to customize behavior:
-
-### ModeResolver
-
-Customize how modes are resolved (dynamic vs static).
-
-```rust
-impl ModeResolver for CustomResolver {
-    fn resolve(&self, focus: &dyn Any) -> Vec<ModeName> { ... }
-}
-```
-
-### OverlayManager
-
-Customize overlay types (dialogs, command palettes, search).
-
-```rust
-impl OverlayManager for CustomOverlayManager {
-    fn is_active(&self) -> bool { ... }
-    fn handle_input(&mut self, key: Key) -> Option<OverlayResult> { ... }
-}
-```
-
-### EventHandler
-
-Customize how events are routed to handlers.
-
-```rust
-impl EventHandler<AppEvent> for CustomHandler {
-    fn handle(&mut self, event: AppEvent) -> Result<HandleResult> { ... }
-}
-```
-
----
-
-## Example: Multi-Page App
-
-```rust
-#[derive(Debug, Clone)]
-enum MyPage {
-    Login(LoginPage),
-    Home(HomePage),
-    Settings(SettingsPage),
-}
-
-fn main() -> Result<()> {
-    let mut orch = Orchestrator::builder()
-        .with_page("login", LoginPage::new())
-        .with_page("home", HomePage::new())
-        .with_page("settings", SettingsPage::new())
-        .with_default_bindings()
-        .build()?;
-    
-    orch.navigate_to("login")?;
-    
-    orch.run()?;
-}
-```
-
-Navigation with history:
-```rust
-orch.navigate_to("home")?;
-orch.navigate_to("settings")?;
-orch.back()?  // Return to home
-```
-
----
-
-## Feature Flags
 
 ```toml
 [dependencies]
-tui_orchestrator = { version = "0.1", features = ["std"] }
+pages-tui = "0.2"
-
-# Optional features
-sequences = ["alloc"]  # Enable multi-key sequences
 ```
 
-- `default` - No features (pure no_std)
+No allocator needed! Uses `heapless` collections with const generic capacities.
-- `std` - Enable std library support
-- `alloc` - Enable alloc support (needed for collections)
 
----
+### With Allocation
 
-## Design Philosophy
+```toml
+[dependencies]
+pages-tui = { version = "0.2", features = ["alloc"] }
+```
 
-1. **Plugin-play model** - Library is runtime, components are plugins
+Uses `Vec`, `Box`, `HashMap` for dynamic sizing and trait objects.
-2. **Sensible defaults** - Zero configuration works
-3. **Optional everything** - Define only what you need
-4. **Extension points** - Override defaults when needed
-5. **User-focused** - "register page" not "bind chord to registry"
-6. **no_std first** - Works on embedded, opt-in std
 
----
+### With Full Std
 
-## For komp_ac Integration
+```toml
+[dependencies]
+pages-tui = { version = "0.2", features = ["std"] }
+```
 
-komp_ac can:
+## Usage
-1. Implement `Component` trait for all pages
-2. Use library's `Orchestrator` as runtime
-3. Extend with custom `ModeResolver` for dynamic Canvas-style modes
-4. Extend with custom `OverlayManager` for command palette, find file, search
-5. Extend with custom `EventHandler` for page/global/canvas routing
 
-**Result:** komp_ac uses library's core while keeping all custom behavior.
+Define your page as an enum that implements the `Page` trait:
 
-See [INTEGRATION_GUIDE.md](INTEGRATION_GUIDE.md) for details.
+```rust
+use pages_tui::prelude::*;
 
----
+#[derive(Debug, Clone)]
+enum MyPage {
+    Home { counter: i32 },
+    Settings { dark_mode: bool },
+}
 
-## Migration Guide
+impl Page for MyPage {
+    type Focus = MyFocus;
+    type Action = MyAction;
+    type Event = MyEvent;
 
-If you're migrating from a TUI built with manual wiring:
+    fn targets(&self) -> &[Self::Focus] {
+        match self {
+            MyPage::Home { .. } => &[MyFocus::Button(0)],
+            MyPage::Settings { .. } => &[MyFocus::Toggle],
+        }
+    }
 
-1. **Identify components** - What are your pages/sections?
+    fn handle(&mut self, focus: &Self::Focus, action: Self::Action) 
-2. **Implement Component trait** - `targets()`, `handle()`, optional hooks
+        -> Result<Option<Self::Event>, ComponentError> 
-3. **Remove manual orchestration** - Delete manual focus/binding/router setup
+    {
-4. **Use Orchestrator** - Register pages and run
+        // Handle actions...
-5. **Add extensions if needed** - ModeResolver, OverlayManager, EventHandler
+        Ok(None)
+    }
+}
 
-The library handles everything else.
+// Create orchestrator with single generic
+let mut app: Orchestrator<MyPage> = Orchestrator::new();
 
----
+// Register pages
+app.register(MyPage::Home { counter: 0 });
+app.register(MyPage::Settings { dark_mode: false });
 
-## Examples
+// Navigate (associated data is ignored for lookup)
+app.navigate_to(MyPage::Home { counter: 999 }).unwrap();
+```
 
-See `examples/` directory for complete working applications:
+## Capacity Configuration (no_std)
-- `simple_app.rs` - Basic multi-page TUI
-- `form_app.rs` - Form with text input
-- `extended_app.rs` - Using extension points
 
----
+In `no_std` mode without `alloc`, configure capacities via const generics:
 
-## Documentation
+```rust
+// Orchestrator<Page, PAGES, HISTORY, FOCUS, BINDINGS, MODES, EVENTS>
+let mut app: Orchestrator<MyPage, 8, 16, 16, 32, 8, 8> = Orchestrator::new();
+```
 
-- [PLAN.md](PLAN.md) - Complete implementation plan
+| Generic | Default | Description |
-- [REDESIGN.md](REDESIGN.md) - Framework architecture deep dive
+|---------|---------|-------------|
-- [INTEGRATION_GUIDE.md](INTEGRATION_GUIDE.md) - Integration examples and patterns
+| `PAGES` | 8 | Maximum registered pages |
+| `HISTORY` | 16 | Navigation history depth |
+| `FOCUS` | 16 | Focus targets per page |
+| `BINDINGS` | 32 | Key bindings |
+| `MODES` | 8 | Mode stack depth |
+| `EVENTS` | 8 | Pending event buffer |
 
----
+With `alloc`, these limits don't apply.
+
+## API Differences
+
+### `process_frame` Return Type
+
+```rust
+// With alloc: returns Vec<Event>
+let events: Vec<MyEvent> = app.process_frame(key)?;
+
+// Without alloc: returns Option<Event>
+let event: Option<MyEvent> = app.process_frame(key)?;
+```
+
+### EventBus
+
+```rust
+// With alloc: register handlers via Box<dyn EventHandler>
+app.event_bus_mut().register(Box::new(my_handler));
+
+// Without alloc: poll pending events
+for event in app.event_bus_mut().drain() {
+    // handle event
+}
+```
+
+### Custom Handlers (alloc only)
+
+```rust
+#[cfg(feature = "alloc")]
+{
+    app.set_action_resolver(MyResolver);
+    app.set_command_handler(MyHandler);
+    app.set_state_coordinator(MyCoordinator);
+}
+```
 
 ## License
 

examples/simple.rs

@@ -0,0 +1,132 @@
+// path_from_the_root: examples/simple.rs
+//
+// Simple example that works with any feature configuration.
+// 
+// Run with alloc:    cargo run --example simple --features alloc
+// Run without alloc: cargo run --example simple
+
+use pages_tui::prelude::*;
+
+// =============================================================================
+// Types
+// =============================================================================
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum Focus {
+    Item(usize),
+}
+
+impl FocusId for Focus {}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Act {
+    Select,
+    Up,
+    Down,
+}
+
+impl Action for Act {}
+
+#[derive(Debug, Clone)]
+pub enum Evt {
+    Selected(usize),
+}
+
+// =============================================================================
+// Pages
+// =============================================================================
+
+#[derive(Debug, Clone)]
+pub enum AppPage {
+    List { cursor: usize },
+    Detail { item_id: usize },
+}
+
+// Static focus targets
+const LIST_FOCUS: &[Focus] = &[Focus::Item(0), Focus::Item(1), Focus::Item(2)];
+const DETAIL_FOCUS: &[Focus] = &[Focus::Item(0)];
+
+impl Page for AppPage {
+    type Focus = Focus;
+    type Action = Act;
+    type Event = Evt;
+
+    fn targets(&self) -> &[Self::Focus] {
+        match self {
+            AppPage::List { .. } => LIST_FOCUS,
+            AppPage::Detail { .. } => DETAIL_FOCUS,
+        }
+    }
+
+    fn handle(
+        &mut self,
+        focus: &Self::Focus,
+        action: Self::Action,
+    ) -> Result<Option<Self::Event>, ComponentError> {
+        match (self, action) {
+            (AppPage::List { cursor }, Act::Select) => {
+                if let Focus::Item(idx) = focus {
+                    *cursor = *idx;
+                    return Ok(Some(Evt::Selected(*idx)));
+                }
+            }
+            _ => {}
+        }
+        Ok(None)
+    }
+}
+
+// =============================================================================
+// Main
+// =============================================================================
+
+fn main() {
+    // Works with both alloc and no_std!
+    // Default capacities are used, override with const generics if needed:
+    // Orchestrator::<AppPage, 4, 8, 8, 16, 4, 4>::new()
+    let mut app: Orchestrator<AppPage> = Orchestrator::new();
+
+    // Register pages
+    app.register(AppPage::List { cursor: 0 });
+    app.register(AppPage::Detail { item_id: 0 });
+
+    // Bind keys
+    app.bind(Key::enter(), Act::Select);
+    app.bind(Key::up(), Act::Up);
+    app.bind(Key::down(), Act::Down);
+
+    // Navigate to list
+    app.navigate_to(AppPage::List { cursor: 0 }).unwrap();
+
+    // Process a key
+    #[cfg(feature = "alloc")]
+    {
+        let events = app.process_frame(Key::enter()).unwrap();
+        for e in events {
+            println!("Event: {:?}", e);
+        }
+    }
+    
+    #[cfg(not(feature = "alloc"))]
+    {
+        if let Ok(Some(e)) = app.process_frame(Key::enter()) {
+            // In no_std, you'd handle this differently
+            let _ = e;
+        }
+    }
+
+    // Check current page
+    match app.current() {
+        Some(AppPage::List { cursor }) => {
+            println!("On list page, cursor at {}", cursor);
+        }
+        Some(AppPage::Detail { item_id }) => {
+            println!("On detail page for item {}", item_id);
+        }
+        None => {
+            println!("No page");
+        }
+    }
+
+    println!("✅ Simple example complete");
+}

flake.lock

@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,49 @@
+{
+  description = "Komp AC - Kompress Accounting";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            mermaid-cli
+            # Rust toolchain
+            rustc
+            cargo
+            rustfmt
+            clippy
+            cargo-watch
+	    rust-analyzer
+	    cargo-tarpaulin
+	    cargo-flamegraph
+	    rust-code-analysis
+
+            # C build tools (for your linker issue)
+            gcc
+            binutils
+            pkg-config
+            
+            # OpenSSL for crypto dependencies
+            openssl
+            openssl.dev
+          ];
+
+          shellHook = ''
+            export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
+            export OPENSSL_DIR="${pkgs.openssl.dev}"
+            export OPENSSL_LIB_DIR="${pkgs.openssl.out}/lib"
+            export OPENSSL_INCLUDE_DIR="${pkgs.openssl.dev}/include"
+            echo "🦀 Rust development environment loaded"
+          '';
+        };
+      }
+    );
+}

src/focus/manager.rs

@@ -1,39 +1,76 @@
-// path_from_the_root: src/focus/manager.rs
+// src/focus/manager.rs
 
 use super::error::FocusError;
 use super::id::FocusId;
 use super::query::FocusQuery;
 
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[cfg(feature = "alloc")]
+type Targets<F, const N: usize> = alloc::vec::Vec<F>;
+
+#[cfg(not(feature = "alloc"))]
+type Targets<F, const N: usize> = heapless::Vec<F, N>;
+
 #[derive(Debug, Clone)]
-pub struct FocusManager<F: FocusId> {
+pub struct FocusManager<F: FocusId, const N: usize = 16> {
-    targets: alloc::vec::Vec<F>,
+    targets: Targets<F, N>,
     index: usize,
     overlay: Option<F>,
 }
 
-impl<F: FocusId> Default for FocusManager<F> {
+impl<F: FocusId, const N: usize> Default for FocusManager<F, N> {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl<F: FocusId> FocusManager<F> {
+impl<F: FocusId, const N: usize> FocusManager<F, N> {
     pub fn new() -> Self {
         Self {
-            targets: alloc::vec::Vec::new(),
+            targets: Targets::new(),
             index: 0,
             overlay: None,
         }
     }
 
+    /// No-alloc friendly: replace targets from a slice.
+    pub fn set_targets_from_slice(&mut self, targets: &[F]) {
+        self.targets.clear();
+        self.index = 0;
+        self.overlay = None;
+
+        for t in targets {
+            #[cfg(feature = "alloc")]
+            {
+                self.targets.push(t.clone());
+            }
+            #[cfg(not(feature = "alloc"))]
+            {
+                let _ = self.targets.push(t.clone());
+            }
+        }
+    }
+
+    /// Alloc-only convenience API (keeps your older call sites viable).
+    #[cfg(feature = "alloc")]
     pub fn set_targets(&mut self, targets: alloc::vec::Vec<F>) {
         self.targets = targets;
         self.index = 0;
+        self.overlay = None;
     }
 
     pub fn add_target(&mut self, id: F) {
         if !self.targets.contains(&id) {
-            self.targets.push(id);
+            #[cfg(feature = "alloc")]
+            {
+                self.targets.push(id);
+            }
+            #[cfg(not(feature = "alloc"))]
+            {
+                let _ = self.targets.push(id);
+            }
         }
     }
 
@@ -50,14 +87,11 @@ impl<F: FocusId> FocusManager<F> {
         if let Some(overlay) = &self.overlay {
             return Some(overlay);
         }
-
         self.targets.get(self.index)
     }
 
     pub fn query(&self) -> FocusQuery<'_, F> {
-        FocusQuery {
+        FocusQuery { current: self.current() }
-            current: self.current(),
-        }
     }
 
     pub fn is_focused(&self, id: &F) -> bool {
@@ -72,7 +106,6 @@ impl<F: FocusId> FocusManager<F> {
         if self.targets.is_empty() {
             return Err(FocusError::EmptyTargets);
         }
-
         if let Some(pos) = self.targets.iter().position(|t| t == &id) {
             self.index = pos;
             self.overlay = None;
@@ -94,7 +127,6 @@ impl<F: FocusId> FocusManager<F> {
         if self.overlay.is_some() {
             return;
         }
-
         if !self.targets.is_empty() && self.index < self.targets.len() - 1 {
             self.index += 1;
         }
@@ -104,7 +136,6 @@ impl<F: FocusId> FocusManager<F> {
         if self.overlay.is_some() {
             return;
         }
-
         if !self.targets.is_empty() && self.index > 0 {
             self.index -= 1;
         }
@@ -125,47 +156,5 @@ impl<F: FocusId> FocusManager<F> {
     pub fn targets(&self) -> &[F] {
         &self.targets
     }
-
-    pub fn len(&self) -> usize {
-        self.targets.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.targets.is_empty()
-    }
-
-    pub fn current_index(&self) -> Option<usize> {
-        if self.targets.is_empty() {
-            None
-        } else {
-            Some(self.index)
-        }
-    }
-
-    pub fn wrap_next(&mut self) {
-        if !self.targets.is_empty() {
-            self.index = (self.index + 1) % self.targets.len();
-        }
-    }
-
-    pub fn wrap_prev(&mut self) {
-        if !self.targets.is_empty() {
-            self.index = if self.index == 0 {
-                self.targets.len() - 1
-            } else {
-                self.index - 1
-            };
-        }
-    }
-
-    pub fn is_first(&self) -> bool {
-        self.current_index() == Some(0)
-    }
-
-    pub fn is_last(&self) -> bool {
-        match self.current_index() {
-            Some(idx) => idx == self.targets.len().saturating_sub(1),
-            None => false,
-        }
-    }
 }
+

src/focus/traits.rs

@@ -1,12 +1,13 @@
-// path_from_the_root: src/focus/traits.rs
+// src/focus/traits.rs
 
 use super::error::FocusError;
 use super::id::FocusId;
 
 pub trait Focusable<F: FocusId> {
-    fn focus_targets(&self) -> alloc::vec::Vec<F>;
+    fn focus_targets(&self) -> &[F];
 
     fn on_focus_change(&mut self, _id: &F) -> Result<(), FocusError> {
         Ok(())
     }
 }
+

src/input/key.rs

@@ -1,3 +1,9 @@
+// src/input/key.rs
+use core::fmt;
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
 /// Represents a key code without modifiers.
 ///
 /// This includes character keys, special keys (Enter, Tab, Esc, etc.),
@@ -207,41 +213,6 @@ impl Key {
             modifiers: KeyModifiers::new(),
         }
     }
-
-    pub fn display_string(&self) -> alloc::string::String {
-        let mut out = alloc::string::String::new();
-        if self.modifiers.control {
-            out.push_str("Ctrl+");
-        }
-        if self.modifiers.alt {
-            out.push_str("Alt+");
-        }
-        if self.modifiers.shift {
-            out.push_str("Shift+");
-        }
-        match self.code {
-            KeyCode::Char(c) => out.push(c),
-            KeyCode::Enter => out.push_str("Enter"),
-            KeyCode::Tab => out.push_str("Tab"),
-            KeyCode::Esc => out.push_str("Esc"),
-            KeyCode::Backspace => out.push_str("Backspace"),
-            KeyCode::Delete => out.push_str("Delete"),
-            KeyCode::Up => out.push_str("Up"),
-            KeyCode::Down => out.push_str("Down"),
-            KeyCode::Left => out.push_str("Left"),
-            KeyCode::Right => out.push_str("Right"),
-            KeyCode::F(n) => {
-                out.push('F');
-                out.push(char::from_digit(n as u32, 10).unwrap_or('0'));
-            }
-            KeyCode::Home => out.push_str("Home"),
-            KeyCode::End => out.push_str("End"),
-            KeyCode::PageUp => out.push_str("PageUp"),
-            KeyCode::PageDown => out.push_str("PageDown"),
-            KeyCode::Null => out.push_str("Null"),
-        }
-        out
-    }
 }
 
 impl From<KeyCode> for Key {
@@ -252,3 +223,51 @@ impl From<KeyCode> for Key {
         }
     }
 }
+
+impl fmt::Display for Key {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.modifiers.control {
+            f.write_str("Ctrl+")?;
+        }
+        if self.modifiers.alt {
+            f.write_str("Alt+")?;
+        }
+        if self.modifiers.shift {
+            f.write_str("Shift+")?;
+        }
+        match self.code {
+            KeyCode::Char(c) => write!(f, "{c}"),
+            KeyCode::Enter => f.write_str("Enter"),
+            KeyCode::Tab => f.write_str("Tab"),
+            KeyCode::Esc => f.write_str("Esc"),
+            KeyCode::Backspace => f.write_str("Backspace"),
+            KeyCode::Delete => f.write_str("Delete"),
+            KeyCode::Up => f.write_str("Up"),
+            KeyCode::Down => f.write_str("Down"),
+            KeyCode::Left => f.write_str("Left"),
+            KeyCode::Right => f.write_str("Right"),
+            KeyCode::Home => f.write_str("Home"),
+            KeyCode::End => f.write_str("End"),
+            KeyCode::PageUp => f.write_str("PageUp"),
+            KeyCode::PageDown => f.write_str("PageDown"),
+            KeyCode::Null => f.write_str("Null"),
+            KeyCode::F(n) => write!(f, "F{n}"),
+        }
+    }
+}
+
+impl Key {
+    #[cfg(feature = "alloc")]
+    pub fn display_string(&self) -> alloc::string::String {
+        alloc::format!("{self}")
+    }
+
+    #[cfg(not(feature = "alloc"))]
+    pub fn display_string(&self) -> heapless::String<32> {
+        use core::fmt::Write;
+        let mut s = heapless::String::<32>::new();
+        let _ = write!(&mut s, "{self}");
+        s
+    }
+}
+

src/lib.rs

@@ -1,19 +1,19 @@
+// src/lib.rs
+
 #![no_std]
 
+#[cfg(feature = "alloc")]
 extern crate alloc;
 
 pub mod component;
 pub mod focus;
 pub mod input;
 pub mod orchestrator;
+pub mod page;
+pub mod prelude;
 
-pub mod prelude {
+pub use component::{Component, ComponentAction, ComponentError};
-    pub use crate::component::{Component, ComponentAction, ComponentError};
+pub use focus::{FocusError, FocusId, FocusManager, FocusQuery, Focusable};
-    pub use crate::focus::{FocusError, FocusId, FocusManager, FocusQuery, Focusable};
+pub use input::{Action, Bindings, Key, KeyCode, KeyModifiers};
-    pub use crate::input::{Action, Bindings, Key, KeyCode, KeyModifiers, MatchResult};
+pub use orchestrator::{Orchestrator, Router, RouterEvent};
-    pub use crate::orchestrator::{
+pub use page::Page;
-        ActionResolver, CommandHandler, CommandResult, DefaultActionResolver,
-        DefaultCommandHandler, DefaultStateCoordinator, EventBus, EventHandler, ModeName,
-        ModeStack, Orchestrator, Router, RouterEvent, StateCoordinator, StateSync,
-    };
-}

src/orchestrator/action_resolver.rs

@@ -1,21 +1,22 @@
-// path_from_the_root: src/orchestrator/action_resolver.rs
+// src/orchestrator/action_resolver.rs
 
-use crate::component::Component;
+use crate::page::Page;
 
-pub struct ResolveContext<'a, C: Component> {
+pub struct ResolveContext<'a, P: Page> {
-    pub component: &'a C,
+    pub page: &'a P,
-    pub focus: &'a C::Focus,
+    pub focus: &'a P::Focus,
-    pub action: C::Action,
+    pub action: P::Action,
 }
 
-pub trait ActionResolver<C: Component> {
+pub trait ActionResolver<P: Page> {
-    fn resolve(&mut self, ctx: ResolveContext<C>) -> C::Action;
+    fn resolve(&mut self, ctx: ResolveContext<P>) -> P::Action;
 }
 
 pub struct DefaultActionResolver;
 
-impl<C: Component> ActionResolver<C> for DefaultActionResolver {
+impl<P: Page> ActionResolver<P> for DefaultActionResolver {
-    fn resolve(&mut self, ctx: ResolveContext<C>) -> C::Action {
+    fn resolve(&mut self, ctx: ResolveContext<P>) -> P::Action {
         ctx.action
     }
 }
+

src/orchestrator/core.rs

@@ -1,65 +1,133 @@
-// path_from_the_root: src/orchestrator/core.rs
+// src/orchestrator/core.rs
-
-extern crate alloc;
 
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
-use alloc::string::String;
+#[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 
-use crate::component::{Component, ComponentError};
+use crate::component::ComponentError;
+use crate::focus::FocusManager;
 use crate::input::{Bindings, Key};
 use crate::orchestrator::{
     ActionResolver, CommandHandler, CommandResult, DefaultActionResolver, DefaultCommandHandler,
     DefaultStateCoordinator, EventBus, ModeName, ModeStack, ResolveContext, Router, RouterEvent,
     StateCoordinator,
 };
+use crate::page::Page;
 
-pub struct Orchestrator<C: Component> {
+/// Main orchestrator with configurable capacity.
-    router: Router<C>,
+/// 
-    bindings: Bindings<C::Action>,
+/// # Const Generics (for `no_std` without `alloc`)
-    action_resolver: Box<dyn ActionResolver<C>>,
+/// - `PAGES`: Maximum registered pages (default: 8)
-    command_handler: Box<dyn CommandHandler<C::Action>>,
+/// - `HISTORY`: Maximum navigation history (default: 16)
-    state_coordinator: Box<dyn StateCoordinator<C>>,
+/// - `FOCUS`: Maximum focus targets per page (default: 16)
-    modes: ModeStack,
+/// - `BINDINGS`: Maximum key bindings (default: 32)
-    event_bus: EventBus<C::Event>,
+/// - `MODES`: Maximum mode stack depth (default: 8)
+/// - `EVENTS`: Maximum pending events (default: 8)
+/// 
+/// With `alloc` feature, these limits don't apply and trait objects are used
+/// for extensibility (ActionResolver, CommandHandler, StateCoordinator).
+/// 
+/// Without `alloc`, concrete default implementations are used.
+pub struct Orchestrator<
+    P: Page,
+    const PAGES: usize = 8,
+    const HISTORY: usize = 16,
+    const FOCUS: usize = 16,
+    const BINDINGS: usize = 32,
+    const MODES: usize = 8,
+    const EVENTS: usize = 8,
+> {
+    router: Router<P, PAGES, HISTORY, FOCUS>,
+    bindings: Bindings<P::Action, BINDINGS>,
+    
+    #[cfg(feature = "alloc")]
+    action_resolver: Box<dyn ActionResolver<P>>,
+    #[cfg(not(feature = "alloc"))]
+    action_resolver: DefaultActionResolver,
+    
+    #[cfg(feature = "alloc")]
+    command_handler: Box<dyn CommandHandler<P::Action>>,
+    #[cfg(not(feature = "alloc"))]
+    command_handler: DefaultCommandHandler<P::Action>,
+    
+    #[cfg(feature = "alloc")]
+    state_coordinator: Box<dyn StateCoordinator<P>>,
+    #[cfg(not(feature = "alloc"))]
+    state_coordinator: DefaultStateCoordinator<P>,
+    
+    modes: ModeStack<MODES>,
+    
+    #[cfg(feature = "alloc")]
+    event_bus: EventBus<P::Event>,
+    #[cfg(not(feature = "alloc"))]
+    event_bus: EventBus<P::Event, EVENTS>,
+    
     running: bool,
 }
 
-impl<C: Component> Default for Orchestrator<C>
+impl<
+    P: Page + 'static,
+    const PAGES: usize,
+    const HISTORY: usize,
+    const FOCUS: usize,
+    const BINDINGS: usize,
+    const MODES: usize,
+    const EVENTS: usize,
+> Default for Orchestrator<P, PAGES, HISTORY, FOCUS, BINDINGS, MODES, EVENTS>
 where
-    C::Action: Clone + 'static,
+    P::Action: Clone + 'static,
 {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl<C: Component> Orchestrator<C>
+impl<
+    P: Page + 'static,
+    const PAGES: usize,
+    const HISTORY: usize,
+    const FOCUS: usize,
+    const BINDINGS: usize,
+    const MODES: usize,
+    const EVENTS: usize,
+> Orchestrator<P, PAGES, HISTORY, FOCUS, BINDINGS, MODES, EVENTS>
 where
-    C::Action: Clone + 'static,
+    P::Action: Clone + 'static,
-    C::Event: Clone,
+    P::Event: Clone,
 {
     pub fn new() -> Self {
         Self {
             router: Router::new(),
             bindings: Bindings::new(),
+            #[cfg(feature = "alloc")]
             action_resolver: Box::new(DefaultActionResolver),
+            #[cfg(not(feature = "alloc"))]
+            action_resolver: DefaultActionResolver,
+            #[cfg(feature = "alloc")]
             command_handler: Box::new(DefaultCommandHandler::default()),
+            #[cfg(not(feature = "alloc"))]
+            command_handler: DefaultCommandHandler::default(),
+            #[cfg(feature = "alloc")]
             state_coordinator: Box::new(DefaultStateCoordinator),
+            #[cfg(not(feature = "alloc"))]
+            state_coordinator: DefaultStateCoordinator::default(),
             modes: ModeStack::new(),
             event_bus: EventBus::new(),
             running: true,
         }
     }
 
-    pub fn register_page(&mut self, id: String, page: C) {
+    /// Register a page. Returns false if capacity exceeded (no_std only).
-        self.router.register(id, page);
+    pub fn register(&mut self, page: P) -> bool {
+        self.router.register(page)
     }
 
-    pub fn navigate_to(&mut self, id: String) -> Result<(), ComponentError> {
+    /// Navigate to a page variant. The associated data is ignored for lookup.
+    pub fn navigate_to(&mut self, target: P) -> Result<(), ComponentError> {
         if let Some(RouterEvent::Navigated { from, to }) = self
             .router
-            .navigate(id.clone())
+            .navigate(target)
             .map_err(|_| ComponentError::InvalidFocus)?
         {
             let _ = self.state_coordinator.on_navigate(from, to);
@@ -67,6 +135,19 @@ where
         Ok(())
     }
 
+    /// Navigate to a page, registering it first if not already registered.
+    pub fn navigate_or_register(&mut self, page: P) -> Result<(), ComponentError> {
+        if let Some(RouterEvent::Navigated { from, to }) = self
+            .router
+            .navigate_or_register(page)
+            .map_err(|_| ComponentError::InvalidFocus)?
+        {
+            let _ = self.state_coordinator.on_navigate(from, to);
+        }
+        Ok(())
+    }
+
+    /// Go back in navigation history.
     pub fn back(&mut self) -> Result<(), ComponentError> {
         if let Some(RouterEvent::Back { to }) = self
             .router
@@ -78,6 +159,7 @@ where
         Ok(())
     }
 
+    /// Go forward in navigation history.
     pub fn forward(&mut self) -> Result<(), ComponentError> {
         if let Some(RouterEvent::Forward { to }) = self
             .router
@@ -89,11 +171,14 @@ where
         Ok(())
     }
 
-    pub fn bind(&mut self, key: Key, action: C::Action) {
+    /// Bind a key to an action.
+    pub fn bind(&mut self, key: Key, action: P::Action) {
         self.bindings.bind(key, action);
     }
 
-    pub fn process_frame(&mut self, key: Key) -> Result<Vec<C::Event>, ComponentError> {
+    /// Process a frame with a key input.
+    #[cfg(feature = "alloc")]
+    pub fn process_frame(&mut self, key: Key) -> Result<Vec<P::Event>, ComponentError> {
         if !self.running {
             return Ok(Vec::new());
         }
@@ -115,12 +200,12 @@ where
         } else if let Some(action) = self.bindings.get(&key) {
             let action = action.clone();
 
-            if let Some(_) = self.router.current_id() {
+            if self.router.current().is_some() {
-                let component = self.router.current().ok_or(ComponentError::NoComponent)?;
+                let page = self.router.current().ok_or(ComponentError::NoComponent)?;
                 let focus = self.router.focus_manager().current().ok_or(ComponentError::NoComponent)?;
 
                 let ctx = ResolveContext {
-                    component,
+                    page,
                     focus,
                     action,
                 };
@@ -139,15 +224,61 @@ where
         Ok(events)
     }
 
-    fn handle_action(&mut self, action: C::Action) -> Result<Option<C::Event>, ComponentError> {
+    /// Process a frame with a key input (no_std version).
+    #[cfg(not(feature = "alloc"))]
+    pub fn process_frame(&mut self, key: Key) -> Result<Option<P::Event>, ComponentError> {
+        if !self.running {
+            return Ok(None);
+        }
+
+        if self.command_handler.is_active() {
+            match self.command_handler.handle(key) {
+                CommandResult::Resolved(action) => {
+                    let event = self.handle_action(action)?;
+                    if let Some(ref e) = event {
+                        self.event_bus.emit(e.clone());
+                    }
+                    return Ok(event);
+                }
+                CommandResult::Incomplete | CommandResult::Unknown => {}
+                CommandResult::Exit => {
+                    self.command_handler.exit();
+                }
+            }
+        } else if let Some(action) = self.bindings.get(&key) {
+            let action = action.clone();
+
+            if self.router.current().is_some() {
+                let page = self.router.current().ok_or(ComponentError::NoComponent)?;
+                let focus = self.router.focus_manager().current().ok_or(ComponentError::NoComponent)?;
+
+                let ctx = ResolveContext {
+                    page,
+                    focus,
+                    action,
+                };
+                let resolved_action = self.action_resolver.resolve(ctx);
+
+                let event = self.handle_action(resolved_action)?;
+                if let Some(ref e) = event {
+                    self.event_bus.emit(e.clone());
+                }
+                return Ok(event);
+            }
+        }
+
+        Ok(None)
+    }
+
+    fn handle_action(&mut self, action: P::Action) -> Result<Option<P::Event>, ComponentError> {
         let focus = self.router.focus_manager().current().cloned();
 
         if let Some(focus) = focus {
             let old_focus = self.router.focus_manager().current().cloned();
 
             let result = {
-                let component = self.router.current_mut().ok_or(ComponentError::NoComponent)?;
+                let page = self.router.current_mut().ok_or(ComponentError::NoComponent)?;
-                component.handle(&focus, action)?
+                page.handle(&focus, action)?
             };
 
             let new_focus = self.router.focus_manager().current().cloned();
@@ -162,58 +293,83 @@ where
         }
     }
 
-    pub fn current(&self) -> Option<&C> {
+    /// Get current page reference.
+    pub fn current(&self) -> Option<&P> {
         self.router.current()
     }
 
-    pub fn current_mut(&mut self) -> Option<&mut C> {
+    /// Get current page mutable reference.
+    pub fn current_mut(&mut self) -> Option<&mut P> {
         self.router.current_mut()
     }
 
-    pub fn focus_manager(&self) -> &crate::focus::FocusManager<C::Focus> {
+    /// Check if currently on a specific page variant.
+    pub fn is_on<F>(&self, check: F) -> bool 
+    where
+        F: Fn(&P) -> bool,
+    {
+        self.router.is_on(check)
+    }
+
+    pub fn focus_manager(&self) -> &FocusManager<P::Focus, FOCUS> {
         self.router.focus_manager()
     }
 
-    pub fn focus_manager_mut(&mut self) -> &mut crate::focus::FocusManager<C::Focus> {
+    pub fn focus_manager_mut(&mut self) -> &mut FocusManager<P::Focus, FOCUS> {
         self.router.focus_manager_mut()
     }
 
-    pub fn modes(&self) -> &ModeStack {
+    pub fn modes(&self) -> &ModeStack<MODES> {
         &self.modes
     }
 
-    pub fn modes_mut(&mut self) -> &mut ModeStack {
+    pub fn modes_mut(&mut self) -> &mut ModeStack<MODES> {
         &mut self.modes
     }
 
-    pub fn push_mode(&mut self, mode: ModeName) {
+    pub fn push_mode(&mut self, mode: ModeName) -> bool {
-        self.modes.push(mode);
+        self.modes.push(mode)
     }
 
     pub fn pop_mode(&mut self) -> Option<ModeName> {
         self.modes.pop()
     }
 
-    pub fn event_bus(&self) -> &EventBus<C::Event> {
+    #[cfg(feature = "alloc")]
+    pub fn event_bus(&self) -> &EventBus<P::Event> {
         &self.event_bus
     }
 
-    pub fn event_bus_mut(&mut self) -> &mut EventBus<C::Event> {
+    #[cfg(feature = "alloc")]
+    pub fn event_bus_mut(&mut self) -> &mut EventBus<P::Event> {
         &mut self.event_bus
     }
 
-    pub fn set_action_resolver<R: ActionResolver<C> + 'static>(&mut self, resolver: R) {
+    #[cfg(not(feature = "alloc"))]
+    pub fn event_bus(&self) -> &EventBus<P::Event, EVENTS> {
+        &self.event_bus
+    }
+
+    #[cfg(not(feature = "alloc"))]
+    pub fn event_bus_mut(&mut self) -> &mut EventBus<P::Event, EVENTS> {
+        &mut self.event_bus
+    }
+
+    /// Set custom action resolver (alloc only).
+    #[cfg(feature = "alloc")]
+    pub fn set_action_resolver<R: ActionResolver<P> + 'static>(&mut self, resolver: R) {
         self.action_resolver = Box::new(resolver);
     }
 
-    pub fn set_command_handler<H: CommandHandler<C::Action> + 'static>(
+    /// Set custom command handler (alloc only).
-        &mut self,
+    #[cfg(feature = "alloc")]
-        handler: H,
+    pub fn set_command_handler<H: CommandHandler<P::Action> + 'static>(&mut self, handler: H) {
-    ) {
         self.command_handler = Box::new(handler);
     }
 
-    pub fn set_state_coordinator<S: StateCoordinator<C> + 'static>(&mut self, coordinator: S) {
+    /// Set custom state coordinator (alloc only).
+    #[cfg(feature = "alloc")]
+    pub fn set_state_coordinator<S: StateCoordinator<P> + 'static>(&mut self, coordinator: S) {
         self.state_coordinator = Box::new(coordinator);
     }
 
@@ -229,7 +385,27 @@ where
         self.running = true;
     }
 
-    pub fn current_id(&self) -> Option<&String> {
+    pub fn router(&self) -> &Router<P, PAGES, HISTORY, FOCUS> {
-        self.router.current_id()
+        &self.router
+    }
+
+    pub fn router_mut(&mut self) -> &mut Router<P, PAGES, HISTORY, FOCUS> {
+        &mut self.router
+    }
+
+    pub fn can_go_back(&self) -> bool {
+        self.router.can_go_back()
+    }
+
+    pub fn can_go_forward(&self) -> bool {
+        self.router.can_go_forward()
+    }
+
+    pub fn bindings(&self) -> &Bindings<P::Action, BINDINGS> {
+        &self.bindings
+    }
+
+    pub fn bindings_mut(&mut self) -> &mut Bindings<P::Action, BINDINGS> {
+        &mut self.bindings
     }
 }

src/orchestrator/event_bus.rs

@@ -1,46 +1,80 @@
-// path_from_the_root: src/orchestrator/event_bus.rs
+// src/orchestrator/event_bus.rs
 
+#[cfg(feature = "alloc")]
 extern crate alloc;
 
-use alloc::boxed::Box;
-use alloc::vec::Vec;
-
 pub trait EventHandler<E> {
     fn handle(&mut self, event: E);
 }
 
-pub struct EventBus<E: Clone> {
+#[cfg(feature = "alloc")]
-    handlers: Vec<Box<dyn EventHandler<E>>>,
+pub struct EventBus<E: Clone, const N: usize = 8> {
+    handlers: alloc::vec::Vec<alloc::boxed::Box<dyn EventHandler<E>>>,
 }
 
-impl<E: Clone> Default for EventBus<E> {
+#[cfg(not(feature = "alloc"))]
+pub struct EventBus<E: Clone, const N: usize = 8> {
+    queue: heapless::Deque<E, N>,
+}
+
+impl<E: Clone, const N: usize> Default for EventBus<E, N> {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl<E: Clone> EventBus<E> {
+impl<E: Clone, const N: usize> EventBus<E, N> {
     pub fn new() -> Self {
-        Self {
+        #[cfg(feature = "alloc")]
-            handlers: Vec::new(),
+        {
+            Self { handlers: alloc::vec::Vec::new() }
+        }
+        #[cfg(not(feature = "alloc"))]
+        {
+            Self { queue: heapless::Deque::new() }
         }
     }
 
-    pub fn register(&mut self, handler: Box<dyn EventHandler<E>>) {
+    #[cfg(feature = "alloc")]
+    pub fn register(&mut self, handler: alloc::boxed::Box<dyn EventHandler<E>>) {
         self.handlers.push(handler);
     }
 
     pub fn emit(&mut self, event: E) {
-        for handler in &mut self.handlers {
+        #[cfg(feature = "alloc")]
-            handler.handle(event.clone());
+        {
+            for handler in &mut self.handlers {
+                handler.handle(event.clone());
+            }
+        }
+        #[cfg(not(feature = "alloc"))]
+        {
+            if self.queue.is_full() {
+                let _ = self.queue.pop_front();
+            }
+            let _ = self.queue.push_back(event);
         }
     }
 
+    #[cfg(not(feature = "alloc"))]
+    pub fn pop(&mut self) -> Option<E> {
+        self.queue.pop_front()
+    }
+
+    #[cfg(feature = "alloc")]
     pub fn handler_count(&self) -> usize {
         self.handlers.len()
     }
 
     pub fn is_empty(&self) -> bool {
-        self.handlers.is_empty()
+        #[cfg(feature = "alloc")]
+        {
+            self.handlers.is_empty()
+        }
+        #[cfg(not(feature = "alloc"))]
+        {
+            self.queue.is_empty()
+        }
     }
 }
+

src/orchestrator/mode.rs

@@ -1,8 +1,7 @@
-// path_from_the_root: src/orchestrator/mode.rs
+// src/orchestrator/mode.rs
 
-use alloc::collections::BTreeMap;
+#[cfg(feature = "alloc")]
-use alloc::string::String;
+extern crate alloc;
-use alloc::vec::Vec;
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum ModeName {
@@ -10,21 +9,43 @@ pub enum ModeName {
     Navigation,
     Editing,
     Command,
-    Custom(String),
+    Custom(heapless::String<32>),
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
-pub struct ModeStack {
+pub struct ModeStack<const N: usize = 8> {
-    modes: Vec<ModeName>,
+    #[cfg(feature = "alloc")]
+    modes: alloc::vec::Vec<ModeName>,
+    #[cfg(not(feature = "alloc"))]
+    modes: heapless::Vec<ModeName, N>,
 }
 
-impl ModeStack {
+impl<const N: usize> Default for ModeStack<N> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<const N: usize> ModeStack<N> {
     pub fn new() -> Self {
-        Self { modes: Vec::new() }
+        Self {
+            #[cfg(feature = "alloc")]
+            modes: alloc::vec::Vec::new(),
+            #[cfg(not(feature = "alloc"))]
+            modes: heapless::Vec::new(),
+        }
     }
 
-    pub fn push(&mut self, mode: ModeName) {
+    pub fn push(&mut self, mode: ModeName) -> bool {
-        self.modes.push(mode);
+        #[cfg(feature = "alloc")]
+        {
+            self.modes.push(mode);
+            true
+        }
+        #[cfg(not(feature = "alloc"))]
+        {
+            self.modes.push(mode).is_ok()
+        }
     }
 
     pub fn pop(&mut self) -> Option<ModeName> {
@@ -51,29 +72,29 @@ impl ModeStack {
         self.modes.clear();
     }
 
-    pub fn reset(&mut self, mode: ModeName) {
+    pub fn reset(&mut self, mode: ModeName) -> bool {
         self.modes.clear();
-        self.modes.push(mode);
+        self.push(mode)
     }
 }
 
+#[cfg(feature = "alloc")]
 #[derive(Debug, Clone, Default)]
 pub struct ModeResolver {
-    mappings: BTreeMap<String, Vec<ModeName>>,
+    mappings: alloc::collections::BTreeMap<alloc::string::String, alloc::vec::Vec<ModeName>>,
 }
 
+#[cfg(feature = "alloc")]
 impl ModeResolver {
     pub fn new() -> Self {
-        Self {
+        Self { mappings: alloc::collections::BTreeMap::new() }
-            mappings: BTreeMap::new(),
-        }
     }
 
-    pub fn register(&mut self, key: String, modes: Vec<ModeName>) {
+    pub fn register(&mut self, key: alloc::string::String, modes: alloc::vec::Vec<ModeName>) {
         self.mappings.insert(key, modes);
     }
 
-    pub fn resolve(&self, key: &str) -> Option<&Vec<ModeName>> {
+    pub fn resolve(&self, key: &str) -> Option<&alloc::vec::Vec<ModeName>> {
         self.mappings.get(key)
     }
 
@@ -81,3 +102,4 @@ impl ModeResolver {
         self.mappings.is_empty()
     }
 }
+

src/orchestrator/router.rs

@@ -1,256 +1,362 @@
 // path_from_the_root: src/orchestrator/router.rs
 
-extern crate alloc;
+#[cfg(feature = "alloc")]
-
-use alloc::string::String;
 use alloc::vec::Vec;
 
-#[cfg(feature = "alloc")]
-use hashbrown::HashMap;
-
-use crate::component::Component;
 use crate::focus::{FocusError, FocusManager};
+use crate::page::{same_page, Page};
 
+/// Events emitted by the router during navigation.
 #[derive(Debug, Clone)]
-pub enum RouterEvent {
+pub enum RouterEvent<P: Page> {
-    Navigated { from: Option<String>, to: String },
+    /// Navigated from one page to another.
-    Back { to: String },
+    Navigated { from: Option<P>, to: P },
-    Forward { to: String },
+    /// Went back in history.
+    Back { to: P },
+    /// Went forward in history.
+    Forward { to: P },
 }
 
-pub struct Router<C: Component> {
+/// Page router with configurable capacity.
+/// 
+/// # Const Generics (for `no_std` without `alloc`)
+/// - `PAGES`: Maximum number of registered pages (default: 8)
+/// - `HISTORY`: Maximum history depth (default: 16)
+/// - `FOCUS`: Maximum focus targets per page (default: 16)
+/// 
+/// When `alloc` feature is enabled, these limits don't apply.
+/// 
+/// Pages are identified by their enum discriminant (variant), not by associated data.
+/// This means `Page::Home { count: 0 }` and `Page::Home { count: 5 }` are the same page.
+pub struct Router<P: Page, const PAGES: usize = 8, const HISTORY: usize = 16, const FOCUS: usize = 16> {
     #[cfg(feature = "alloc")]
-    pages: HashMap<String, C>,
+    pages: Vec<P>,
     #[cfg(not(feature = "alloc"))]
-    pages: Vec<(String, C)>,
+    pages: heapless::Vec<P, PAGES>,
-    current: Option<String>,
+
-    history: Vec<String>,
+    current_index: Option<usize>,
-    future: Vec<String>,
+
-    focus: FocusManager<C::Focus>,
+    #[cfg(feature = "alloc")]
+    history: Vec<usize>,
+    #[cfg(not(feature = "alloc"))]
+    history: heapless::Vec<usize, HISTORY>,
+
+    #[cfg(feature = "alloc")]
+    future: Vec<usize>,
+    #[cfg(not(feature = "alloc"))]
+    future: heapless::Vec<usize, HISTORY>,
+
+    focus: FocusManager<P::Focus, FOCUS>,
 }
 
-impl<C: Component> Default for Router<C> {
+impl<P: Page, const PAGES: usize, const HISTORY: usize, const FOCUS: usize> Default 
+    for Router<P, PAGES, HISTORY, FOCUS> 
+{
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl<C: Component> Router<C> {
+impl<P: Page, const PAGES: usize, const HISTORY: usize, const FOCUS: usize> 
+    Router<P, PAGES, HISTORY, FOCUS> 
+{
     pub fn new() -> Self {
         Self {
             #[cfg(feature = "alloc")]
-            pages: HashMap::new(),
-            #[cfg(not(feature = "alloc"))]
             pages: Vec::new(),
-            current: None,
+            #[cfg(not(feature = "alloc"))]
+            pages: heapless::Vec::new(),
+
+            current_index: None,
+
+            #[cfg(feature = "alloc")]
             history: Vec::new(),
+            #[cfg(not(feature = "alloc"))]
+            history: heapless::Vec::new(),
+
+            #[cfg(feature = "alloc")]
             future: Vec::new(),
+            #[cfg(not(feature = "alloc"))]
+            future: heapless::Vec::new(),
+
             focus: FocusManager::new(),
         }
     }
 
-    pub fn register(&mut self, id: String, mut page: C) {
+    /// Find page index by discriminant match.
-        #[cfg(feature = "alloc")]
+    fn find_index(&self, target: &P) -> Option<usize> {
-        {
+        self.pages.iter().position(|p| same_page(p, target))
-            if self.current.as_ref() == Some(&id) {
+    }
-                let _ = page.on_enter();
-                let targets = page.targets();
-                self.focus.set_targets(targets.to_vec());
-            }
-            self.pages.insert(id, page);
-        }
 
-        #[cfg(not(feature = "alloc"))]
+    /// Register a page. If a page with the same variant exists, it's replaced.
-        {
+    /// 
-            if self.current.as_ref() == Some(&id) {
+    /// Returns `true` if successful, `false` if capacity exceeded (no_std only).
-                let _ = page.on_enter();
+    pub fn register(&mut self, page: P) -> bool {
-                let targets = page.targets();
+        if let Some(idx) = self.find_index(&page) {
-                self.focus.set_targets(targets.to_vec());
+            // Replace existing page
+            self.pages[idx] = page;
+            
+            // If this is the current page, update focus targets
+            if self.current_index == Some(idx) {
+                self.focus.set_targets_from_slice(self.pages[idx].targets());
             }
-            self.pages.push((id, page));
+            true
+        } else {
+            // Check if this should be the current page (first registration)
+            let is_first = self.current_index.is_none() && self.pages.is_empty();
+            
+            #[cfg(feature = "alloc")]
+            {
+                self.pages.push(page);
+            }
+            #[cfg(not(feature = "alloc"))]
+            {
+                if self.pages.push(page).is_err() {
+                    return false;
+                }
+            }
+
+            if is_first {
+                let idx = self.pages.len() - 1;
+                let _ = self.pages[idx].on_enter();
+                self.focus.set_targets_from_slice(self.pages[idx].targets());
+                self.current_index = Some(idx);
+            }
+            
+            true
         }
     }
 
-    fn get_page_mut(&mut self, id: &str) -> Option<&mut C> {
+    /// Navigate to a page. The page must be registered first.
-        #[cfg(feature = "alloc")]
+    /// 
-        {
+    /// Pass any instance of the variant you want to navigate to.
-            self.pages.get_mut(id)
+    /// The associated data is ignored - only the variant matters.
+    pub fn navigate(&mut self, target: P) -> Result<Option<RouterEvent<P>>, FocusError> {
+        let target_idx = match self.find_index(&target) {
+            Some(idx) => idx,
+            None => return Ok(None), // Page not registered
+        };
+
+        // If already on this page, no-op
+        if self.current_index == Some(target_idx) {
+            return Ok(None);
         }
 
-        #[cfg(not(feature = "alloc"))]
+        let event = if let Some(current_idx) = self.current_index.take() {
-        {
+            // Exit current page
-            self.pages
+            let _ = self.pages[current_idx].on_exit();
-                .iter_mut()
+            
-                .find(|(page_id, _)| page_id == id)
+            #[cfg(feature = "alloc")]
-                .map(|(_, page)| page)
+            {
-        }
+                self.history.push(current_idx);
-    }
-
-    fn get_page(&self, id: &str) -> Option<&C> {
-        #[cfg(feature = "alloc")]
-        {
-            self.pages.get(id)
-        }
-
-        #[cfg(not(feature = "alloc"))]
-        {
-            self.pages
-                .iter()
-                .find(|(page_id, _)| page_id == id)
-                .map(|(_, page)| page)
-        }
-    }
-
-    pub fn navigate(&mut self, id: String) -> Result<Option<RouterEvent>, FocusError> {
-        let result = if let Some(current_id) = self.current.take() {
-            if let Some(current_page) = self.get_page_mut(&current_id) {
-                let _ = current_page.on_exit();
             }
-            self.history.push(current_id.clone());
+            #[cfg(not(feature = "alloc"))]
+            {
+                // In heapless mode, drop oldest if full
+                if self.history.is_full() {
+                    self.history.remove(0);
+                }
+                let _ = self.history.push(current_idx);
+            }
+            
             self.future.clear();
+
             Some(RouterEvent::Navigated {
-                from: Some(current_id),
+                from: Some(self.pages[current_idx].clone()),
-                to: id.clone(),
+                to: self.pages[target_idx].clone(),
             })
         } else {
             Some(RouterEvent::Navigated {
                 from: None,
-                to: id.clone(),
+                to: self.pages[target_idx].clone(),
             })
         };
 
-        let targets = if let Some(page) = self.get_page_mut(&id) {
+        // Enter new page
-            let _ = page.on_enter();
+        self.current_index = Some(target_idx);
-            Some(page.targets().to_vec())
+        let _ = self.pages[target_idx].on_enter();
-        } else {
+        self.focus.set_targets_from_slice(self.pages[target_idx].targets());
-            None
+
+        Ok(event)
+    }
+
+    /// Navigate to a page, registering it first if needed.
+    /// 
+    /// Returns `Err` if registration failed (capacity exceeded in no_std).
+    pub fn navigate_or_register(&mut self, page: P) -> Result<Option<RouterEvent<P>>, FocusError> {
+        if self.find_index(&page).is_none() {
+            if !self.register(page.clone()) {
+                return Err(FocusError::EmptyTargets); // Capacity error
+            }
+        }
+        self.navigate(page)
+    }
+
+    /// Go back in history.
+    pub fn back(&mut self) -> Result<Option<RouterEvent<P>>, FocusError> {
+        let current_idx = match self.current_index {
+            Some(idx) => idx,
+            None => return Ok(None),
         };
 
-        if let Some(targets) = targets {
+        let prev_idx = match self.history.pop() {
-            self.focus.set_targets(targets);
+            Some(idx) => idx,
+            None => return Ok(None),
+        };
+
+        // Exit current, push to future
+        let _ = self.pages[current_idx].on_exit();
+        
+        #[cfg(feature = "alloc")]
+        {
+            self.future.push(current_idx);
         }
-
+        #[cfg(not(feature = "alloc"))]
-        self.current = Some(id);
+        {
-        Ok(result)
+            if self.future.is_full() {
-    }
+                self.future.remove(0);
-
-    pub fn back(&mut self) -> Result<Option<RouterEvent>, FocusError> {
-        if let Some(current) = self.current.take() {
-            if let Some(from) = self.history.pop() {
-                self.future.push(current.clone());
-                let to = from.clone();
-
-                if let Some(current_page) = self.get_page_mut(&current) {
-                    let _ = current_page.on_exit();
-                }
-
-                self.current = Some(to.clone());
-
-                let targets = if let Some(page) = self.get_page_mut(&to) {
-                    let _ = page.on_enter();
-                    Some(page.targets().to_vec())
-                } else {
-                    None
-                };
-
-                if let Some(targets) = targets {
-                    self.focus.set_targets(targets);
-                }
-
-                Ok(Some(RouterEvent::Back { to }))
-            } else {
-                self.current = Some(current);
-                Ok(None)
             }
-        } else {
+            let _ = self.future.push(current_idx);
-            Ok(None)
         }
+
+        // Enter previous
+        self.current_index = Some(prev_idx);
+        let _ = self.pages[prev_idx].on_enter();
+        self.focus.set_targets_from_slice(self.pages[prev_idx].targets());
+
+        Ok(Some(RouterEvent::Back {
+            to: self.pages[prev_idx].clone(),
+        }))
     }
 
-    pub fn forward(&mut self) -> Result<Option<RouterEvent>, FocusError> {
+    /// Go forward in history.
-        if let Some(current) = self.current.take() {
+    pub fn forward(&mut self) -> Result<Option<RouterEvent<P>>, FocusError> {
-            if let Some(from) = self.future.pop() {
+        let current_idx = match self.current_index {
-                self.history.push(current.clone());
+            Some(idx) => idx,
-                let to = from.clone();
+            None => return Ok(None),
+        };
 
-                if let Some(current_page) = self.get_page_mut(&current) {
+        let next_idx = match self.future.pop() {
-                    let _ = current_page.on_exit();
+            Some(idx) => idx,
-                }
+            None => return Ok(None),
+        };
 
-                self.current = Some(to.clone());
+        // Exit current, push to history
-
+        let _ = self.pages[current_idx].on_exit();
-                let targets = if let Some(page) = self.get_page_mut(&to) {
+        
-                    let _ = page.on_enter();
+        #[cfg(feature = "alloc")]
-                    Some(page.targets().to_vec())
+        {
-                } else {
+            self.history.push(current_idx);
-                    None
+        }
-                };
+        #[cfg(not(feature = "alloc"))]
-
+        {
-                if let Some(targets) = targets {
+            if self.history.is_full() {
-                    self.focus.set_targets(targets);
+                self.history.remove(0);
-                }
-
-                Ok(Some(RouterEvent::Forward { to }))
-            } else {
-                self.current = Some(current);
-                Ok(None)
             }
-        } else {
+            let _ = self.history.push(current_idx);
-            Ok(None)
         }
+
+        // Enter next
+        self.current_index = Some(next_idx);
+        let _ = self.pages[next_idx].on_enter();
+        self.focus.set_targets_from_slice(self.pages[next_idx].targets());
+
+        Ok(Some(RouterEvent::Forward {
+            to: self.pages[next_idx].clone(),
+        }))
     }
 
-    pub fn current(&self) -> Option<&C> {
+    /// Get current page reference.
-        self.current.as_ref().and_then(|id| self.get_page(id))
+    pub fn current(&self) -> Option<&P> {
+        self.current_index.map(|idx| &self.pages[idx])
     }
 
-    pub fn current_mut(&mut self) -> Option<&mut C> {
+    /// Get current page mutable reference.
-        if let Some(id) = self.current.clone() {
+    pub fn current_mut(&mut self) -> Option<&mut P> {
-            self.get_page_mut(&id)
+        self.current_index.map(|idx| &mut self.pages[idx])
-        } else {
-            None
-        }
     }
 
-    pub fn current_id(&self) -> Option<&String> {
+    /// Get a clone of the current page (useful for matching variants).
-        self.current.as_ref()
+    pub fn current_page(&self) -> Option<P> {
+        self.current().cloned()
     }
 
-    pub fn focus_manager(&self) -> &FocusManager<C::Focus> {
+    pub fn focus_manager(&self) -> &FocusManager<P::Focus, FOCUS> {
         &self.focus
     }
 
-    pub fn focus_manager_mut(&mut self) -> &mut FocusManager<C::Focus> {
+    pub fn focus_manager_mut(&mut self) -> &mut FocusManager<P::Focus, FOCUS> {
         &mut self.focus
     }
 
-    pub fn history(&self) -> &[String] {
+    /// Check if on a specific page variant.
-        &self.history
+    pub fn is_on<F>(&self, check: F) -> bool 
+    where
+        F: Fn(&P) -> bool,
+    {
+        self.current().map(|p| check(p)).unwrap_or(false)
     }
 
-    pub fn future(&self) -> &[String] {
+    /// Get page by variant (ignoring associated data).
-        &self.future
+    pub fn get_page(&self, target: &P) -> Option<&P> {
+        self.find_index(target).map(|idx| &self.pages[idx])
+    }
+
+    /// Get mutable page by variant.
+    pub fn get_page_mut(&mut self, target: &P) -> Option<&mut P> {
+        self.find_index(target).map(|idx| &mut self.pages[idx])
+    }
+
+    pub fn history_len(&self) -> usize {
+        self.history.len()
+    }
+
+    pub fn can_go_back(&self) -> bool {
+        !self.history.is_empty()
+    }
+
+    pub fn can_go_forward(&self) -> bool {
+        !self.future.is_empty()
     }
 
     pub fn page_count(&self) -> usize {
+        self.pages.len()
+    }
+
+    pub fn has_page(&self, target: &P) -> bool {
+        self.find_index(target).is_some()
+    }
+
+    /// Iterate over all registered pages.
+    pub fn pages(&self) -> impl Iterator<Item = &P> {
+        self.pages.iter()
+    }
+
+    /// Iterate mutably over all registered pages.
+    pub fn pages_mut(&mut self) -> impl Iterator<Item = &mut P> {
+        self.pages.iter_mut()
+    }
+
+    /// Capacity info (only meaningful in no_std mode).
+    pub fn pages_capacity(&self) -> usize {
         #[cfg(feature = "alloc")]
         {
-            self.pages.len()
+            self.pages.capacity()
         }
         #[cfg(not(feature = "alloc"))]
         {
-            self.pages.len()
+            PAGES
         }
     }
 
-    pub fn has_page(&self, id: &str) -> bool {
+    pub fn history_capacity(&self) -> usize {
         #[cfg(feature = "alloc")]
         {
-            self.pages.contains_key(id)
+            self.history.capacity()
         }
         #[cfg(not(feature = "alloc"))]
         {
-            self.pages.iter().any(|(page_id, _)| page_id == id)
+            HISTORY
         }
     }
 }

src/orchestrator/state_coordinator.rs

@@ -1,48 +1,63 @@
-// path_from_the_root: src/orchestrator/state_coordinator.rs
+// src/orchestrator/state_coordinator.rs
 
-use alloc::string::String;
+use crate::orchestrator::ModeName;
-use alloc::vec::Vec;
+use crate::page::Page;
 
-use crate::component::Component;
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[cfg(feature = "alloc")]
+pub type StateError = alloc::string::String;
+
+#[cfg(not(feature = "alloc"))]
+pub type StateError = &'static str;
 
 pub enum StateSync {
     Synced,
-    Conflict { details: String },
+    Conflict { details: StateError },
 }
 
-pub trait StateCoordinator<C: Component> {
+pub trait StateCoordinator<P: Page> {
-    fn on_navigate(&mut self, from: Option<String>, to: String) -> Result<StateSync, String>;
+    fn on_navigate(&mut self, from: Option<P>, to: P) -> Result<StateSync, StateError>;
 
     fn on_focus_change(
         &mut self,
-        old: Option<C::Focus>,
+        old: Option<P::Focus>,
-        new: Option<C::Focus>,
+        new: Option<P::Focus>,
-    ) -> Result<StateSync, String>;
+    ) -> Result<StateSync, StateError>;
 
-    fn on_mode_change(&mut self, _old: Vec<String>, _new: Vec<String>)
+    fn on_mode_change(&mut self, _old: &[ModeName], _new: &[ModeName])
-        -> Result<StateSync, String>;
+        -> Result<StateSync, StateError>;
 }
 
-pub struct DefaultStateCoordinator;
+pub struct DefaultStateCoordinator<P: Page> {
+    _p: core::marker::PhantomData<P>,
+}
 
-impl<C: Component> StateCoordinator<C> for DefaultStateCoordinator {
+impl<P: Page> Default for DefaultStateCoordinator<P> {
-    fn on_navigate(&mut self, _from: Option<String>, _to: String) -> Result<StateSync, String> {
+    fn default() -> Self {
+        Self { _p: core::marker::PhantomData }
+    }
+}
+
+impl<P: Page> StateCoordinator<P> for DefaultStateCoordinator<P> {
+    fn on_navigate(&mut self, _from: Option<P>, _to: P) -> Result<StateSync, StateError> {
         Ok(StateSync::Synced)
     }
 
     fn on_focus_change(
         &mut self,
-        _old: Option<C::Focus>,
+        _old: Option<P::Focus>,
-        _new: Option<C::Focus>,
+        _new: Option<P::Focus>,
-    ) -> Result<StateSync, String> {
+    ) -> Result<StateSync, StateError> {
         Ok(StateSync::Synced)
     }
 
     fn on_mode_change(
         &mut self,
-        _old: Vec<String>,
+        _old: &[ModeName],
-        _new: Vec<String>,
+        _new: &[ModeName],
-    ) -> Result<StateSync, String> {
+    ) -> Result<StateSync, StateError> {
         Ok(StateSync::Synced)
     }
 }

src/page/mod.rs

@@ -0,0 +1,17 @@
+// src/page/mod.rs
+
+use crate::component::Component;
+
+/// A "page" is just a component that is cloneable and debuggable.
+///
+/// The router identifies pages by enum discriminant (variant),
+/// so pages should typically be enums.
+pub trait Page: Component + Clone + core::fmt::Debug {}
+impl<T> Page for T where T: Component + Clone + core::fmt::Debug {}
+
+/// Compare pages by discriminant (variant), ignoring associated data.
+#[inline]
+pub fn same_page<P: Page>(a: &P, b: &P) -> bool {
+    core::mem::discriminant(a) == core::mem::discriminant(b)
+}
+

src/prelude.rs

@@ -5,3 +5,6 @@ pub use crate::component::error::ComponentError;
 pub use crate::component::Component;
 pub use crate::focus::*;
 pub use crate::input::*;
+pub use crate::page::Page;
+pub use crate::orchestrator::{Orchestrator, Router, RouterEvent};
+