fix: keep classic subagent dock compact and skin-colored
This commit is contained in:
@@ -78,6 +78,7 @@ class SubagentMonitor:
|
||||
def dock_text(self, *, columns, rows):
|
||||
if not self.entries:
|
||||
return ''
|
||||
columns = max(0, columns - 2)
|
||||
count = min(len(self.entries), max(1, min(4, (rows - 10) // 3)))
|
||||
hidden = len(self.entries) - count
|
||||
heading = f' Subagents · {len(self.entries)} live · F6 expand'
|
||||
@@ -89,7 +90,7 @@ class SubagentMonitor:
|
||||
lines.append(_clip(f" ● {_clip(row.get('goal'), goal_width)} · {activity}", columns))
|
||||
if hidden:
|
||||
lines.append(_clip(f' +{hidden} more · F6 all subagents', columns))
|
||||
return '\n'.join(lines)
|
||||
return '\n'.join(' ' + line for line in lines)
|
||||
|
||||
|
||||
def read_tail(path):
|
||||
@@ -132,7 +133,7 @@ def build_monitor_application(monitor, **kwargs):
|
||||
text = f"{'❯' if selected else ' '} {row['elapsed']}s · {row.get('status') or 'starting'} · {row.get('goal') or row['subagent_id']}"
|
||||
if row.get('last_tool'):
|
||||
text += f" · last: {row['last_tool']}"
|
||||
rows.append(('reverse' if selected else '', _clip(text, size.columns) + '\n'))
|
||||
rows.append(('class:subagent-dock.selected' if selected else '', _clip(text, size.columns) + '\n'))
|
||||
return rows or [('', 'No live subagents. Results arrive in the conversation.')]
|
||||
|
||||
def cursor():
|
||||
@@ -155,7 +156,7 @@ def build_monitor_application(monitor, **kwargs):
|
||||
title = f"Subagents · {len(monitor.entries)} live"
|
||||
if state['detail'] and row:
|
||||
title += f" · {row['subagent_id']} · {row.get('goal') or ''}"
|
||||
return [('bold', _clip(title, app.output.get_size().columns))]
|
||||
return [('class:subagent-dock.heading', _clip(title, app.output.get_size().columns))]
|
||||
|
||||
def footer():
|
||||
narrow = app.output.get_size().columns < 60
|
||||
@@ -240,7 +241,7 @@ def build_monitor_application(monitor, **kwargs):
|
||||
ConditionalContainer(steer, filter=Condition(lambda: state['steering'])),
|
||||
Window(FormattedTextControl(lambda: _clip(state['notice'], app.output.get_size().columns)), height=1),
|
||||
Window(FormattedTextControl(footer), height=1),
|
||||
]), focused_element=roster)
|
||||
], style='class:subagent-dock'), focused_element=roster)
|
||||
def before_render(app):
|
||||
# Prompts arrive on worker threads; exit on the UI loop, including the
|
||||
# first frame if a prompt won the race with in_terminal() acquisition.
|
||||
@@ -249,6 +250,9 @@ def build_monitor_application(monitor, **kwargs):
|
||||
elif state['detail']:
|
||||
update_tail()
|
||||
|
||||
from prompt_toolkit.styles import Style
|
||||
from hermes_cli.skin_engine import get_prompt_toolkit_style_overrides
|
||||
kwargs.setdefault('style', Style.from_dict(get_prompt_toolkit_style_overrides()))
|
||||
app = Application(layout=layout, key_bindings=kb, full_screen=True, mouse_support=False,
|
||||
before_render=before_render, **kwargs)
|
||||
return app
|
||||
@@ -287,9 +291,13 @@ def install_dock(cli):
|
||||
|
||||
def text():
|
||||
size = get_app().output.get_size()
|
||||
return [('class:subagent-border', monitor.dock_text(columns=size.columns, rows=size.rows))]
|
||||
lines = monitor.dock_text(columns=size.columns, rows=size.rows).splitlines()
|
||||
return [('class:subagent-dock.heading' if i == 0 else '',
|
||||
line + ('\n' if i < len(lines) - 1 else ''))
|
||||
for i, line in enumerate(lines)]
|
||||
|
||||
cli._subagent_dock_widget = ConditionalContainer(
|
||||
Window(FormattedTextControl(text), wrap_lines=False),
|
||||
Window(FormattedTextControl(text), wrap_lines=False, dont_extend_height=True,
|
||||
style='class:subagent-dock'),
|
||||
filter=Condition(lambda: bool(monitor.entries) and not modal_prompt_active(cli)),
|
||||
)
|
||||
|
||||
@@ -485,6 +485,9 @@ _STYLE_TEMPLATES = {
|
||||
"status-bar-dim": "bg:{status_bg} {status_dim}", "status-bar-good": "bg:{status_bg} {status_good} bold",
|
||||
"status-bar-warn": "bg:{status_bg} {status_warn} bold", "status-bar-bad": "bg:{status_bg} {status_bad} bold",
|
||||
"status-bar-critical": "bg:{status_bg} {status_critical} bold",
|
||||
"subagent-dock": "bg:{status_bg} {status_text}",
|
||||
"subagent-dock.heading": "bg:{status_bg} {status_strong} bold",
|
||||
"subagent-dock.selected": "bg:{menu_current_bg} {text} bold",
|
||||
"input-rule": "{input_rule}", "image-badge": "{label} bold",
|
||||
"completion-menu": "bg:{menu_bg} {text}", "completion-menu.completion": "bg:{menu_bg} {text}",
|
||||
"completion-menu.completion.current": "bg:{menu_current_bg} {title}",
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
"""A passive dock paints a bounded surface without acquiring the editor."""
|
||||
import asyncio
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@pytest.mark.parametrize('columns,rows,skin', [(100, 30, 'default'), (80, 20, 'daylight')])
|
||||
def test_passive_dock_fills_rows_but_keeps_input_live(monkeypatch, columns, rows, skin):
|
||||
from prompt_toolkit.application import Application
|
||||
from prompt_toolkit.data_structures import Size
|
||||
from prompt_toolkit.input import create_pipe_input
|
||||
from prompt_toolkit.layout import HSplit, Layout
|
||||
from prompt_toolkit.output import DummyOutput
|
||||
from prompt_toolkit.styles import Style
|
||||
from prompt_toolkit.widgets import TextArea
|
||||
from hermes_cli.cli_subagent_monitor import install_dock
|
||||
from hermes_cli import skin_engine
|
||||
|
||||
monkeypatch.setattr(skin_engine, '_active_skin', skin_engine.load_skin(skin))
|
||||
cli = SimpleNamespace(agent=None)
|
||||
install_dock(cli)
|
||||
cli._subagent_monitor.entries = [dict(goal=f'Worker {i}', elapsed=12,
|
||||
last_tool='terminal', status='running') for i in range(6)]
|
||||
submitted = []
|
||||
editor = TextArea(height=1, multiline=False,
|
||||
accept_handler=lambda buffer: submitted.append(buffer.text))
|
||||
output = DummyOutput()
|
||||
output.get_size = lambda: Size(rows=rows, columns=columns)
|
||||
|
||||
async def run():
|
||||
with create_pipe_input() as pipe:
|
||||
app = Application(layout=Layout(HSplit([cli._subagent_dock_widget, editor]),
|
||||
focused_element=editor), input=pipe, output=output,
|
||||
style=Style.from_dict(skin_engine.get_prompt_toolkit_style_overrides()))
|
||||
painted = asyncio.Event()
|
||||
app.after_render += lambda _: painted.set()
|
||||
task = asyncio.create_task(app.run_async())
|
||||
await asyncio.wait_for(painted.wait(), 3)
|
||||
try:
|
||||
screen = app.renderer._last_screen
|
||||
dock_height = screen.visible_windows_to_write_positions[editor.window].ypos
|
||||
assert 2 <= dock_height <= 6
|
||||
for y in range(dock_height):
|
||||
assert screen.data_buffer[y][0].char == ' '
|
||||
for x in (0, columns // 2, columns - 1):
|
||||
attrs = app._merged_style.get_attrs_for_style_str(screen.data_buffer[y][x].style)
|
||||
assert attrs.bgcolor, 'the entire dock row needs a background'
|
||||
assert attrs.color != attrs.bgcolor
|
||||
painted.clear()
|
||||
pipe.send_text('Follow up while workers run\r')
|
||||
await asyncio.wait_for(painted.wait(), 3)
|
||||
assert submitted == ['Follow up while workers run']
|
||||
assert app.layout.has_focus(editor)
|
||||
finally:
|
||||
app.exit()
|
||||
await task
|
||||
asyncio.run(run())
|
||||
Reference in New Issue
Block a user