Skip to content

emrg: remove TUI selector widgets from chat on confirm/cancel #921

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

Merged
argszero merged 1 commit into from
Aug 21, 2026
Merged

emrg: remove TUI selector widgets from chat on confirm/cancel #921

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
18 changes: 18 additions & 0 deletions emrg/client/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,11 @@ async def _reconnect():
if err:
chat.add("system", f"Error: {err}")
elif tasks:
# Re-trigger guard: a previous TaskSelector may still be
# in the chat (duplicate /trigger) — drop it before
# stacking a new one (rant 2026-08-21T16:47:44).
if task_sel.widget is not None:
chat.remove(task_sel.widget)
task_sel.widget = TaskSelector(tasks)
task_sel.active = True
task_sel.pending = False
Expand Down Expand Up @@ -1233,13 +1238,15 @@ async def handle_key(data: bytes) -> bool:
if data == b"\x1b": # Esc — cancel selection
session_sel.active = False
chat.add("system", "Session selection cancelled.")
chat.remove(session_sel.widget)
session_sel.widget = None
status.update(center=server_id or "emrg")
chat.dirty = True; term.render()
return True
if data == b"\r" or data == b"\n": # Enter — confirm
sid = session_sel.widget.selected_session_id
session_sel.active = False
chat.remove(session_sel.widget)
session_sel.widget = None
if sid:
await conn.send_command("resume_session", session_id=sid, cwd=cwd)
Expand All @@ -1261,13 +1268,15 @@ async def handle_key(data: bytes) -> bool:
if data == b"\x1b": # Esc — cancel
delete_sel.active = False
chat.add("system", "Delete cancelled.")
chat.remove(delete_sel.widget)
delete_sel.widget = None
status.update(center=server_id or "emrg")
chat.dirty = True; term.render()
return True
if data == b"\r" or data == b"\n": # Enter — delete immediately
sid = delete_sel.widget.selected_session_id
delete_sel.active = False
chat.remove(delete_sel.widget)
delete_sel.widget = None
if sid:
await conn.send_command("delete_session", session_id=sid, cwd=cwd)
Expand All @@ -1288,13 +1297,15 @@ async def handle_key(data: bytes) -> bool:
if data == b"\x1b": # Esc — cancel selection
project_sel.active = False
chat.add("system", "Project selection cancelled.")
chat.remove(project_sel.widget)
project_sel.widget = None
status.update(center=server_id or "emrg")
chat.dirty = True; term.render()
return True
if data == b"\r" or data == b"\n": # Enter — confirm
pname = project_sel.widget.selected_project_name
project_sel.active = False
chat.remove(project_sel.widget)
project_sel.widget = None
if pname:
nonlocal _rant_project
Expand All @@ -1317,13 +1328,15 @@ async def handle_key(data: bytes) -> bool:
if data == b"\x1b": # Esc — cancel selection
model_sel.active = False
chat.add("system", "Model selection cancelled.")
chat.remove(model_sel.widget)
model_sel.widget = None
status.update(center=server_id or "emrg")
chat.dirty = True; term.render()
return True
if data == b"\r" or data == b"\n": # Enter — confirm
mname = model_sel.widget.selected_model_name
model_sel.active = False
chat.remove(model_sel.widget)
model_sel.widget = None
if mname:
await conn.send_command("set_model", model=mname)
Expand All @@ -1344,13 +1357,15 @@ async def handle_key(data: bytes) -> bool:
if data == b"\x1b": # Esc — cancel selection
rewind_sel.active = False
chat.add("system", "Rewind cancelled.")
chat.remove(rewind_sel.widget)
rewind_sel.widget = None
status.update(center=server_id or "emrg")
chat.dirty = True; term.render()
return True
if data == b"\r" or data == b"\n": # Enter — confirm
idx = rewind_sel.widget.selected_record_index
rewind_sel.active = False
chat.remove(rewind_sel.widget)
rewind_sel.widget = None
if idx is not None:
await conn.send_command("rewind_session", session_id=session_id,
Expand All @@ -1373,13 +1388,15 @@ async def handle_key(data: bytes) -> bool:
if data == b"\x1b": # Esc — cancel selection
task_sel.active = False
chat.add("system", "Task selection cancelled.")
chat.remove(task_sel.widget)
task_sel.widget = None
status.update(center=server_id or "emrg")
chat.dirty = True; term.render()
return True
if data in (b"\r", b"\n"): # Enter — confirm
task_name = task_sel.widget.selected_task_name
task_sel.active = False
chat.remove(task_sel.widget)
task_sel.widget = None
if task_name:
await conn.send_command("trigger_task", name=task_name,
Expand Down Expand Up @@ -1953,6 +1970,7 @@ def _is_image_token(s, i):
target_sid = parts[1].strip()
# Deactivate selector if active
session_sel.active = False
chat.remove(session_sel.widget)
session_sel.widget = None
session_sel.pending = False
await conn.send_command("resume_session", session_id=target_sid, cwd=cwd)
Expand Down
Loading