fix(09): stay on NewSession screen when advancing from name entry

Author: dbachelder

.planning/ROADMAP.md

@@ -22,6 +22,7 @@ None
 - [x] **Phase 6: Help Text Layout** - Two-row help text with logical grouping
 - [x] **Phase 7: Fix Session Naming Bug** - Fix session naming bug
 - [x] **Phase 8: Resurrectable Session Improvements** - Improve resurrectable session handling and display
+- [x] **Phase 9: Fix Session Name Editing** - Fix session name editing during session creation
 
 ## Phase Details
 
@@ -98,10 +99,19 @@ Plans:
 Plans:
 - [x] 08-01: Add Alt+D toggle for resurrectable sessions with pink coloring
 
+### Phase 9: Fix Session Name Editing
+**Goal**: Fix session name editing during session creation so users can modify the auto-generated name
+**Depends on**: Phase 8
+**Research**: Complete (Enter from name entry returns to Main instead of showing layout selection)
+**Plans**: 1
+
+Plans:
+- [x] 09-01: Fix NewSession Enter key after name editing
+
 ## Progress
 
 **Execution Order:**
-Phases execute in numeric order: 1 → 2 → 3 → 4 → 5 → 6 → 7 → 8
+Phases execute in numeric order: 1 → 2 → 3 → 4 → 5 → 6 → 7 → 8 → 9
 
 | Phase | Plans Complete | Status | Completed |
 |-------|----------------|--------|-----------|
@@ -113,3 +123,4 @@ Phases execute in numeric order: 1 → 2 → 3 → 4 → 5 → 6 → 7 → 8
 | 6. Help Text Layout | 1/1 | Complete | 2026-01-13 |
 | 7. Fix Session Naming Bug | 1/1 | Complete | 2026-01-13 |
 | 8. Resurrectable Session Improvements | 1/1 | Complete | 2026-01-14 |
+| 9. Fix Session Name Editing | 1/1 | Complete | 2026-01-15 |

.planning/STATE.md

@@ -5,23 +5,23 @@
 See: .planning/PROJECT.md (updated 2026-01-13)
 
 **Core value:** The session selector should feel instant and intuitive — MRU ordering, clean visual hierarchy, and responsive feedback.
-**Current focus:** Phase 8 — Resurrectable Session Improvements (complete)
+**Current focus:** Milestone complete - all 9 phases finished
 
 ## Current Position
 
-Phase: 8 of 8 (Resurrectable Session Improvements)
+Phase: 9 of 9 (Fix Session Name Editing)
 Plan: 1 of 1 in current phase
-Status: Phase complete
-Last activity: 2026-01-14 — Completed 08-01-PLAN.md
+Status: Complete
+Last activity: 2026-01-15 — Completed 09-01-PLAN.md
 
-Progress: ██████████ 100% (8/8 phases)
+Progress: ██████████ 100% (9/9 phases)
 
 ## Performance Metrics
 
 **Velocity:**
-- Total plans completed: 9
+- Total plans completed: 10
 - Average duration: 7 min
-- Total execution time: 61 min
+- Total execution time: 66 min
 
 **By Phase:**
 
@@ -35,9 +35,10 @@ Progress: ██████████ 100% (8/8 phases)
 | 06 | 1 | 5 min | 5 min |
 | 07 | 1 | 6 min | 6 min |
 | 08 | 1 | 5 min | 5 min |
+| 09 | 1 | 5 min | 5 min |
 
 **Recent Trend:**
-- Last 3 plans: 06-01 (5 min), 07-01 (6 min), 08-01 (5 min)
+- Last 3 plans: 07-01 (6 min), 08-01 (5 min), 09-01 (5 min)
 - Trend: Stable
 
 ## Accumulated Context
@@ -63,6 +64,7 @@ Recent decisions affecting current work:
 | 07-01 | Pre-fill rename buffer with current session name | Enables easy editing vs starting from scratch |
 | 07-01 | Shorten help text items for Ctrl+n | "Quick create" -> "Quick", "Delete" -> "Del" |
 | 08-01 | Runtime toggle over config option for dead sessions | Ephemeral UI state doesn't need config persistence |
+| 09-01 | Check state before handle_selection() | Captures pre-transition state for correct navigation logic |
 
 ### Deferred Issues
 
@@ -72,13 +74,14 @@ None yet.
 
 - Phase 7 added: Fix session naming bug
 - Phase 8 added: Resurrectable session improvements
+- Phase 9 added: Fix session name editing during session creation
 
 ### Blockers/Concerns
 
 None yet.
 
 ## Session Continuity
 
-Last session: 2026-01-14
-Stopped at: Completed 08-01-PLAN.md (Alt+D toggle for resurrectable sessions)
+Last session: 2026-01-15
+Stopped at: Milestone complete - all 9 phases finished
 Resume file: None

.planning/phases/09-fix-session-name-editing/09-01-PLAN.md

@@ -0,0 +1,77 @@
+# Plan 09-01: Fix NewSession Enter Key After Name Editing
+
+## Problem
+
+When creating a new session:
+1. User selects a directory → enters NewSession screen in `EnteringLayoutSearch` state
+2. User presses Esc to go back and edit the name → now in `EnteringName` state
+3. User edits the name (e.g., "vaultsync_templates")
+4. User presses Enter → **immediately returns to Main screen without creating session**
+
+**Root cause:** In `handle_new_session_key()`, pressing Enter always sets `active_screen = Main` after calling `handle_selection()`, even when `handle_selection()` just advances from `EnteringName` to `EnteringLayoutSearch` (doesn't create the session yet).
+
+```rust
+BareKey::Enter if key.has_no_modifiers() => {
+    self.new_session_info.handle_selection(&self.current_session_name);
+    self.active_screen = ActiveScreen::Main;  // BUG: Always goes to Main!
+    true
+}
+```
+
+In `handle_selection()`:
+- `EnteringName` → just advances to `EnteringLayoutSearch` (no session created)
+- `EnteringLayoutSearch` → creates session, calls `hide_self()`
+
+## Solution
+
+Only set `active_screen = Main` when the user was already in `EnteringLayoutSearch` (meaning `handle_selection()` created the session). If user was in `EnteringName`, stay on NewSession screen to show layout selection.
+
+## Changes
+
+### `src/state.rs` - Fix Enter handler in `handle_new_session_key()`
+
+**Location:** Lines 420-426
+
+**Current code:**
+```rust
+BareKey::Enter if key.has_no_modifiers() => {
+    // Handle session creation
+    self.new_session_info
+        .handle_selection(&self.current_session_name);
+    self.active_screen = ActiveScreen::Main;
+    true
+}
+```
+
+**New code:**
+```rust
+BareKey::Enter if key.has_no_modifiers() => {
+    // Only return to Main if we were in layout selection (session created)
+    // If in name entry, handle_selection just advances to layout selection
+    let was_in_layout_selection = self.new_session_info.entering_layout_search_term();
+    self.new_session_info
+        .handle_selection(&self.current_session_name);
+    if was_in_layout_selection {
+        self.active_screen = ActiveScreen::Main;
+    }
+    true
+}
+```
+
+## Validation
+
+1. Build: `cargo build --target wasm32-wasip1`
+2. Test manually:
+   - Select a directory from main list
+   - Press Esc to go back to name entry
+   - Edit the session name
+   - Press Enter → should show layout selection (not return to main)
+   - Press Enter again → should create session
+
+## Files Changed
+
+- `src/state.rs` - Fix Enter handler in `handle_new_session_key()`
+
+## Estimated Complexity
+
+Trivial - single conditional check.

.planning/phases/09-fix-session-name-editing/09-01-SUMMARY.md

@@ -0,0 +1,86 @@
+---
+phase: 09-fix-session-name-editing
+plan: 01
+subsystem: ui
+tags: [state-machine, new-session, keybinding]
+
+# Dependency graph
+requires:
+  - phase: 08-resurrectable-session-improvements
+    provides: Resurrectable session handling complete
+provides:
+  - Fixed NewSession Enter key state machine flow
+  - Session name editing now works correctly
+affects: []
+
+# Tech tracking
+tech-stack:
+  added: []
+  patterns:
+    - "Check state before calling handler, use result to determine next screen"
+
+key-files:
+  created: []
+  modified:
+    - src/state.rs
+
+key-decisions:
+  - "Check entering_layout_search_term() before handle_selection() to determine correct navigation"
+
+patterns-established:
+  - "State machine transitions should be determined by pre-call state, not post-call state"
+
+# Metrics
+duration: 5 min
+completed: 2026-01-15
+---
+
+# Phase 9 Plan 01: Fix NewSession Enter Key After Name Editing Summary
+
+**Fixed Enter key state machine in NewSession screen so editing session name then pressing Enter advances to layout selection instead of returning to Main**
+
+## Performance
+
+- **Duration:** 5 min
+- **Started:** 2026-01-15
+- **Completed:** 2026-01-15
+- **Tasks:** 1
+- **Files modified:** 1
+
+## Accomplishments
+- Fixed Enter key handler to check state before calling `handle_selection()`
+- Session name editing now correctly advances to layout selection on Enter
+- Only returns to Main screen when layout selection completes (session created)
+
+## Task Commits
+
+Each task was committed atomically:
+
+1. **Task 1: Fix Enter handler** - `8a82e56` (fix)
+
+## Files Created/Modified
+- `src/state.rs` - Added state check before `handle_selection()`, conditional screen transition
+
+## Decisions Made
+- Check `entering_layout_search_term()` before calling `handle_selection()` rather than after - this captures the pre-transition state needed for correct navigation logic
+
+## Deviations from Plan
+
+None - plan executed exactly as written.
+
+## Issues Encountered
+
+None
+
+## User Setup Required
+
+None - no external service configuration required.
+
+## Next Phase Readiness
+- This was the final plan in Phase 9
+- Phase 9 complete - all session name editing bugs fixed
+- Milestone complete - all 9 phases finished
+
+---
+*Phase: 09-fix-session-name-editing*
+*Completed: 2026-01-15*

src/state.rs

@@ -418,10 +418,14 @@ impl PluginState {
     fn handle_new_session_key(&mut self, key: KeyWithModifier) -> bool {
         match key.bare_key {
             BareKey::Enter if key.has_no_modifiers() => {
-                // Handle session creation
+                // Only return to Main if we were in layout selection (session created)
+                // If in name entry, handle_selection just advances to layout selection
+                let was_in_layout_selection = self.new_session_info.entering_layout_search_term();
                 self.new_session_info
                     .handle_selection(&self.current_session_name);
-                self.active_screen = ActiveScreen::Main;
+                if was_in_layout_selection {
+                    self.active_screen = ActiveScreen::Main;
+                }
                 true
             }
             BareKey::Enter if key.has_modifiers(&[KeyModifier::Ctrl]) => {