8989 allocate_prompt_scene_rows ,
9090)
9191from pythinker_code .ui .shell .prompting .lifecycle import PromptLifecycle
92+ from pythinker_code .ui .shell .prompting .state import (
93+ BufferObserved ,
94+ Invalidate ,
95+ ModalAttached ,
96+ ModalDetached ,
97+ ModalState ,
98+ ModeChanged ,
99+ PromptEffect ,
100+ PromptEvent ,
101+ PromptMode ,
102+ PromptPhase ,
103+ PromptState ,
104+ RestoreDocument ,
105+ RunningDelegateAttached ,
106+ RunningDelegateDetached ,
107+ RunningPromptDelegate ,
108+ SelectCompleter ,
109+ SetEraseWhenDone ,
110+ ShortcutHelpToggled ,
111+ SuspendDocument ,
112+ TurnCleared ,
113+ TurnStarting ,
114+ transition ,
115+ )
92116from pythinker_code .ui .shell .spacing import (
93117 PREAMBLE_EARLIER_OUTPUT_HIDDEN_HINT ,
94118 ensure_prompt_newline ,
@@ -1859,17 +1883,6 @@ def _load_history_entries(history_file: Path) -> list[_HistoryEntry]:
18591883 return entries
18601884
18611885
1862- class PromptMode (Enum ):
1863- AGENT = "agent"
1864- SHELL = "shell"
1865-
1866- def toggle (self ) -> PromptMode :
1867- return PromptMode .SHELL if self == PromptMode .AGENT else PromptMode .AGENT
1868-
1869- def __str__ (self ) -> str :
1870- return self .value
1871-
1872-
18731886class PromptUIState (Enum ):
18741887 NORMAL_INPUT = "normal_input"
18751888 MODAL_HIDDEN_INPUT = "modal_hidden_input"
@@ -2155,26 +2168,6 @@ class _ToastEntry:
21552168 """Optional prompt_toolkit style for the rendered line; "" uses the default toast style."""
21562169
21572170
2158- class RunningPromptDelegate (Protocol ):
2159- """Protocol for components that can take over the bottom prompt area."""
2160-
2161- modal_priority : int
2162-
2163- def render_running_prompt_body (self , columns : int ) -> AnyFormattedText : ...
2164-
2165- def running_prompt_placeholder (self ) -> AnyFormattedText | None : ...
2166-
2167- def running_prompt_allows_text_input (self ) -> bool : ...
2168-
2169- def running_prompt_hides_input_buffer (self ) -> bool : ...
2170-
2171- def running_prompt_accepts_submission (self ) -> bool : ...
2172-
2173- def should_handle_running_prompt_key (self , key : str ) -> bool : ...
2174-
2175- def handle_running_prompt_key (self , key : str , event : KeyPressEvent ) -> None : ...
2176-
2177-
21782171@dataclass (frozen = True , slots = True )
21792172class BgTaskCounts :
21802173 bash : int = 0
@@ -2392,6 +2385,7 @@ def __init__(
23922385 self ._slash_menu_control : SlashCommandMenuControl | None = None
23932386 self ._last_ui_state : PromptUIState = PromptUIState .NORMAL_INPUT
23942387 self ._suspended_buffer_document : Document | None = None
2388+ self ._prompt_state = PromptState (mode = self ._mode )
23952389 clipboard_available = is_clipboard_available ()
23962390 media_clipboard_available = is_media_clipboard_available ()
23972391 self ._tips = _build_toolbar_tips (clipboard_available or media_clipboard_available )
@@ -2522,21 +2516,16 @@ def _(event: KeyPressEvent) -> None:
25222516 if event .current_buffer .text .strip ():
25232517 event .current_buffer .insert_text ("?" )
25242518 return
2525- self ._shortcut_help_open = not self ._shortcut_help_open
2526- event .app .invalidate ()
2519+ self .toggle_shortcut_help ()
25272520
25282521 @_kb .add ("c-x" , eager = True )
25292522 def _ (event : KeyPressEvent ) -> None :
25302523 if self ._active_prompt_delegate () is not None :
25312524 return
2532- self ._mode = self . _mode . toggle ()
2525+ self .toggle_mode ()
25332526 from pythinker_code .telemetry import track
25342527
25352528 track ("shortcut_mode_switch" , to_mode = self ._mode .value )
2536- # Apply mode-specific settings
2537- self ._apply_mode (event )
2538- # Redraw UI
2539- event .app .invalidate ()
25402529
25412530 @_kb .add ("s-tab" , eager = True )
25422531 def _ (event : KeyPressEvent ) -> None :
@@ -2726,8 +2715,7 @@ def _(event: KeyPressEvent) -> None:
27262715 filter = Condition (lambda : self ._shortcut_help_open ),
27272716 )
27282717 def _ (event : KeyPressEvent ) -> None :
2729- self ._shortcut_help_open = False
2730- event .app .invalidate ()
2718+ self .close_shortcut_help ()
27312719
27322720 @_kb .add (
27332721 "1" ,
@@ -2864,6 +2852,7 @@ def _clear_prompt_frame(_app: Application[str]) -> None:
28642852 def _ (buffer : Buffer ) -> None :
28652853 self ._last_input_activity_time = time .monotonic ()
28662854 self ._input_activity_event .set ()
2855+ self ._dispatch (BufferObserved (buffer .document ))
28672856 if buffer .complete_while_typing () and not self ._suppress_auto_completion :
28682857 buffer .start_completion ()
28692858
@@ -3326,33 +3315,7 @@ def invalidate(self) -> None:
33263315 app .invalidate ()
33273316
33283317 def _sync_prompt_ui_state (self ) -> None :
3329- new_state = self ._active_ui_state ()
3330- old_state = getattr (self , "_last_ui_state" , PromptUIState .NORMAL_INPUT )
3331- buffer = self ._session .default_buffer
3332-
3333- if (
3334- old_state != PromptUIState .MODAL_HIDDEN_INPUT
3335- and new_state == PromptUIState .MODAL_HIDDEN_INPUT
3336- ):
3337- if self ._suspended_buffer_document is None and buffer .text :
3338- self ._suspended_buffer_document = buffer .document
3339- buffer .set_document (Document (), bypass_readonly = True )
3340- elif (
3341- old_state == PromptUIState .MODAL_HIDDEN_INPUT
3342- and new_state != PromptUIState .MODAL_HIDDEN_INPUT
3343- and self ._suspended_buffer_document is not None
3344- ):
3345- if not buffer .text :
3346- buffer .set_document (self ._suspended_buffer_document , bypass_readonly = True )
3347- else :
3348- # Buffer was externally modified (e.g. approval inline feedback).
3349- # Don't overwrite the new content, but log that the old input is lost.
3350- logger .debug (
3351- "Dropping suspended buffer document because buffer was modified externally"
3352- )
3353- self ._suspended_buffer_document = None
3354-
3355- self ._last_ui_state = new_state
3318+ self ._last_ui_state = self ._active_ui_state ()
33563319
33573320 def _render_agent_prompt_message (self ) -> FormattedText :
33583321 frame = self ._prompt_frame_for_render ()
@@ -4169,6 +4132,102 @@ async def wait_for_input_activity(self) -> None:
41694132 await self ._input_activity_event .wait ()
41704133 self ._input_activity_event .clear ()
41714134
4135+ def _prompt_reducer_state (self ) -> PromptState :
4136+ """Return the authoritative reducer state, bootstrapping legacy sessions once.
4137+
4138+ A few integrations historically populated these attributes on partially
4139+ constructed sessions. Bootstrap those sessions at this boundary without
4140+ rebuilding reducer-owned state from mutable facade projections on every
4141+ dispatch.
4142+ """
4143+ existing = getattr (self , "_prompt_state" , None )
4144+ if isinstance (existing , PromptState ):
4145+ return existing
4146+
4147+ running = getattr (self , "_running_prompt_delegate" , None )
4148+ turn_starting = getattr (self , "_turn_starting" , False )
4149+ phase = (
4150+ PromptPhase .RUNNING
4151+ if running is not None
4152+ else PromptPhase .TURN_STARTING
4153+ if turn_starting
4154+ else PromptPhase .IDLE
4155+ )
4156+ return PromptState (
4157+ mode = getattr (self , "_mode" , PromptMode .AGENT ),
4158+ phase = phase ,
4159+ running_delegate = running ,
4160+ modal_stack = tuple (
4161+ ModalState (
4162+ delegate = delegate ,
4163+ priority = delegate .modal_priority ,
4164+ hides_input = delegate .running_prompt_hides_input_buffer (),
4165+ )
4166+ for delegate in getattr (self , "_modal_delegates" , ())
4167+ ),
4168+ suspended_document = getattr (self , "_suspended_buffer_document" , None ),
4169+ shortcut_help_open = getattr (self , "_shortcut_help_open" , False ),
4170+ running_previous_mode = getattr (
4171+ self ,
4172+ "_running_prompt_previous_mode" ,
4173+ None ,
4174+ ),
4175+ )
4176+
4177+ def _apply_reducer_state (self , state : PromptState ) -> None :
4178+ self ._prompt_state = state
4179+ self ._mode = state .mode
4180+ self ._turn_starting = state .phase is PromptPhase .TURN_STARTING
4181+ self ._running_prompt_delegate = state .running_delegate
4182+ self ._running_prompt_previous_mode = state .running_previous_mode
4183+ self ._modal_delegates = [modal .delegate for modal in state .modal_stack ]
4184+ self ._suspended_buffer_document = state .suspended_document
4185+ self ._shortcut_help_open = state .shortcut_help_open
4186+
4187+ def _apply_prompt_effect (self , effect : PromptEffect ) -> None :
4188+ session = getattr (self , "_session" , None )
4189+ buffer = getattr (session , "default_buffer" , None )
4190+ if isinstance (effect , SelectCompleter ):
4191+ if buffer is not None :
4192+ attribute = (
4193+ "_shell_mode_completer"
4194+ if effect .mode is PromptMode .SHELL
4195+ else "_agent_mode_completer"
4196+ )
4197+ completer = getattr (self , attribute , None )
4198+ if completer is not None :
4199+ buffer .completer = completer
4200+ elif isinstance (effect , SetEraseWhenDone ):
4201+ app = getattr (session , "app" , None )
4202+ if app is not None :
4203+ app .erase_when_done = effect .erase_when_done
4204+ elif isinstance (effect , SuspendDocument ):
4205+ if buffer is not None and buffer .text :
4206+ buffer .set_document (Document (), bypass_readonly = True )
4207+ elif isinstance (effect , RestoreDocument ) and buffer is not None and not buffer .text :
4208+ buffer .set_document (effect .document , bypass_readonly = True )
4209+
4210+ def _dispatch (self , event : PromptEvent , * , invalidate_noop : bool = False ) -> None :
4211+ result = transition (self ._prompt_reducer_state (), event )
4212+ self ._apply_reducer_state (result .state )
4213+ should_invalidate = invalidate_noop
4214+ for effect in result .effects :
4215+ if isinstance (effect , Invalidate ):
4216+ should_invalidate = True
4217+ else :
4218+ self ._apply_prompt_effect (effect )
4219+ if should_invalidate :
4220+ self .invalidate ()
4221+
4222+ def toggle_mode (self ) -> None :
4223+ self ._dispatch (ModeChanged (self ._prompt_reducer_state ().mode .toggle ()))
4224+
4225+ def toggle_shortcut_help (self ) -> None :
4226+ self ._dispatch (ShortcutHelpToggled ())
4227+
4228+ def close_shortcut_help (self ) -> None :
4229+ self ._dispatch (ShortcutHelpToggled (open = False ))
4230+
41724231 def mark_turn_starting (self ) -> None :
41734232 """Collapse the input card immediately, before the delegate attaches.
41744233
@@ -4178,11 +4237,7 @@ def mark_turn_starting(self) -> None:
41784237 the stream). Superseded by the delegate once :meth:`attach_running_prompt`
41794238 runs; cleared there and on detach.
41804239 """
4181- # Idempotent: a repeat call (e.g. two dispatches before an attach) must
4182- # not cost an extra repaint.
4183- if not self ._turn_starting :
4184- self ._turn_starting = True
4185- self .invalidate ()
4240+ self ._dispatch (TurnStarting ())
41864241
41874242 def clear_turn_starting (self ) -> None :
41884243 """Drop the pre-attach turn-starting hint without an attach/detach.
@@ -4192,52 +4247,30 @@ def clear_turn_starting(self) -> None:
41924247 path that occurred before the running-prompt delegate ever attached —
41934248 without reaching into the private ``_turn_starting`` attribute.
41944249 """
4195- self ._turn_starting = False
4196- self .invalidate ()
4250+ self ._dispatch (TurnCleared (), invalidate_noop = not hasattr (self , "_session" ))
41974251
41984252 def attach_running_prompt (self , delegate : RunningPromptDelegate ) -> None :
4199- current = getattr (self , "_running_prompt_delegate" , None )
4200- if current is delegate :
4201- return
4202- if current is None :
4203- self ._running_prompt_previous_mode = self ._mode
4204- self ._running_prompt_delegate = delegate
4205- # The delegate is the source of truth now; drop the pre-attach hint.
4206- self ._turn_starting = False
4207- self ._mode = PromptMode .AGENT
4208- self ._apply_mode ()
4209- self .invalidate ()
4253+ self ._dispatch (RunningDelegateAttached (delegate ))
42104254
42114255 def detach_running_prompt (self , delegate : RunningPromptDelegate ) -> None :
4212- if getattr (self , "_running_prompt_delegate" , None ) is not delegate :
4213- return
4214- previous_mode = getattr (self , "_running_prompt_previous_mode" , None )
4215- self ._running_prompt_delegate = None
4216- self ._running_prompt_previous_mode = None
4217- self ._turn_starting = False
4218- if previous_mode is not None :
4219- self ._mode = previous_mode
4220- self ._apply_mode ()
4221- self .invalidate ()
4256+ self ._dispatch (RunningDelegateDetached (delegate ))
42224257
42234258 def attach_modal (self , delegate : RunningPromptDelegate ) -> None :
4224- modal_delegates : list [RunningPromptDelegate ] | None = getattr (
4225- self , "_modal_delegates" , None
4259+ buffer = getattr (getattr (self , "_session" , None ), "default_buffer" , None )
4260+ document = buffer .document if buffer is not None else Document ()
4261+ self ._dispatch (
4262+ ModalAttached (
4263+ delegate = delegate ,
4264+ priority = delegate .modal_priority ,
4265+ hides_input = delegate .running_prompt_hides_input_buffer (),
4266+ document = document ,
4267+ )
42264268 )
4227- if modal_delegates is None :
4228- modal_delegates = []
4229- self ._modal_delegates = modal_delegates
4230- if delegate in modal_delegates :
4231- return
4232- modal_delegates .append (delegate )
4233- self .invalidate ()
42344269
42354270 def detach_modal (self , delegate : RunningPromptDelegate ) -> None :
4236- modal_delegates = getattr (self , "_modal_delegates" , None )
4237- if not modal_delegates or delegate not in modal_delegates :
4238- return
4239- modal_delegates .remove (delegate )
4240- self .invalidate ()
4271+ buffer = getattr (getattr (self , "_session" , None ), "default_buffer" , None )
4272+ document = buffer .document if buffer is not None else Document ()
4273+ self ._dispatch (ModalDetached (delegate , document ))
42414274
42424275 def running_prompt_accepts_submission (self ) -> bool :
42434276 delegate = self ._active_prompt_delegate ()
0 commit comments