Skip to content

Add text navigation mode #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add text navigation mode #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 70 additions & 22 deletions src/fast_agent/ui/elicitation_form.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from mcp.types import ElicitRequestedSchema
from prompt_toolkit import Application
from prompt_toolkit.buffer import Buffer
from prompt_toolkit.filters import Condition
from prompt_toolkit.formatted_text import FormattedText
from prompt_toolkit.key_binding import KeyBindings
from prompt_toolkit.key_binding.bindings.focus import focus_next, focus_previous
Expand All @@ -25,6 +26,8 @@

from fast_agent.ui.elicitation_style import ELICITATION_STYLE

text_navigation_mode = False


class SimpleNumberValidator(Validator):
"""Simple number validator with real-time feedback."""
Expand Down Expand Up @@ -325,31 +328,49 @@ def focus_next_with_refresh(event):
def focus_previous_with_refresh(event):
focus_previous(event)

# Toggle between text navigation mode and field navigation mode
@kb.add("c-t")
def toggle_text_navigation_mode(event):
global text_navigation_mode
text_navigation_mode = not text_navigation_mode
event.app.invalidate() # Force redraw the app to update toolbar

# Arrow key navigation - let radio lists handle up/down first
@kb.add("down")
@kb.add("down", filter=Condition(lambda: not text_navigation_mode))
def focus_next_arrow(event):
focus_next(event)

@kb.add("up")
@kb.add("up", filter=Condition(lambda: not text_navigation_mode))
def focus_previous_arrow(event):
focus_previous(event)

@kb.add("right", eager=True)
@kb.add("right", eager=True, filter=Condition(lambda: not text_navigation_mode))
def focus_next_right(event):
focus_next(event)

@kb.add("left", eager=True)
@kb.add("left", eager=True, filter=Condition(lambda: not text_navigation_mode))
def focus_previous_left(event):
focus_previous(event)

# Enter always submits
@kb.add("c-m")
def submit(event):
# Enter submits in field navigation mode
@kb.add("c-m", filter=Condition(lambda: not text_navigation_mode))
def submit_enter(event):
self._accept()

# Ctrl+J inserts newlines
@kb.add("c-j")
def insert_newline(event):
# Ctrl+J inserts newlines in field navigation mode
@kb.add("c-j", filter=Condition(lambda: not text_navigation_mode))
def insert_newline_cj(event):
# Insert a newline at the cursor position
event.current_buffer.insert_text("\n")
# Mark this field as multiline when user adds a newline
for field_name, widget in self.field_widgets.items():
if isinstance(widget, Buffer) and widget == event.current_buffer:
self.multiline_fields.add(field_name)
break

# Enter inserts new lines in text navigation mode
@kb.add("c-m", filter=Condition(lambda: text_navigation_mode))
def insert_newline_enter(event):
# Insert a newline at the cursor position
event.current_buffer.insert_text("\n")
# Mark this field as multiline when user adds a newline
Expand All @@ -358,6 +379,11 @@ def insert_newline(event):
self.multiline_fields.add(field_name)
break

# Ctrl+J submits in text navigation mode (equivalent to enter in field navigation mode)
Copy link
Contributor

@chughtapan chughtapan Oct 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can get rid of this completely now? Submit should only work in the field navigation mode?

@kb.add("c-j", filter=Condition(lambda: text_navigation_mode))
def submit_cj(event):
self._accept()

# ESC should ALWAYS cancel immediately, no matter what
@kb.add("escape", eager=True, is_global=True)
def cancel(event):
Expand All @@ -369,18 +395,40 @@ def get_toolbar():
if hasattr(self, "_toolbar_hidden") and self._toolbar_hidden:
return FormattedText([])

return FormattedText(
[
(
"class:bottom-toolbar.text",
" <TAB>/↑↓→← navigate. <ENTER> submit. <Ctrl+J> insert new line. <ESC> cancel. ",
),
(
"class:bottom-toolbar.text",
"<Cancel All> Auto-Cancel further elicitations from this Server.",
),
]
)
if text_navigation_mode:
return FormattedText(
[
(
"class:bottom-toolbar.text",
"<TAB> navigate. <ENTER> insert new line. <CTRL+J> submit. <ESC> cancel. ",
),
(
"class:bottom-toolbar.text",
"<CTRL+T> toggle text navigation mode (active). ",
),
(
"class:bottom-toolbar.text",
"<Cancel All> Auto-Cancel further elicitations from this Server.",
),
]
)
else:
return FormattedText(
[
(
"class:bottom-toolbar.text",
" <TAB>/↑↓→← navigate. <ENTER> submit. <Ctrl+J> insert new line. <ESC> cancel. ",
),
(
"class:bottom-toolbar.text",
"<CTRL+T> toggle text navigation mode. ",
),
(
"class:bottom-toolbar.text",
"<Cancel All> Auto-Cancel further elicitations from this Server.",
),
]
)

# Store toolbar function reference for later control
self._get_toolbar = get_toolbar
Expand Down
Loading