Skip to content

The agent that grows with you

fix(gateway): any local viewer that declares clarify_batch gets the batch panel

Tekniuma011d11d8c09
diff --git a/gateway/run_turn_runner.py b/gateway/run_turn_runner.py
index 8e766a570fc..d69cf72c24a 100644
--- a/gateway/run_turn_runner.py
+++ b/gateway/run_turn_runner.py
@@ -549,7 +549,7 @@ class TurnRunner(GatewayTurnProgressMixin, GatewaySessionAgentMixin):
return finite_clarify_reply()
from gateway.session_cli_turn import clarify_batch_turn
if clarify_batch_turn(self):
- # Main's classic CLI shows every question at once in its batch panel: one request.
+ # Main's batch panel (classic CLI, Ink TUI) shows every question at once: one request.
from gateway.session_clarify_batch import ask_clarify_batch
return ask_clarify_batch(self, questions)
answers: dict[str, Any] = {}
diff --git a/gateway/session_cli_turn.py b/gateway/session_cli_turn.py
index ddeb10cc3d7..8e210e60e67 100644
--- a/gateway/session_cli_turn.py
+++ b/gateway/session_cli_turn.py
@@ -49,9 +49,9 @@ def admit_cli_turn(params):
if batch is not None and type(batch) is not bool:
raise RuntimeStoreError('invalid_params')
if batch:
- # The submitting viewer is main's HermesCLI, which answers the clarify tool's whole batch
- # in one ``clarify`` server request (its batch panel). Other viewers of a ``cli``-source
- # session (an ACP editor, a raw WebSocket client) answer per-question cards.
+ # The submitting viewer answers the clarify tool's whole batch in one ``clarify`` server
+ # request (main's batch panel: classic CLI, Ink TUI). Viewers that never set it (an ACP
+ # editor, a raw WebSocket client) answer per-question cards.
committed['clarify_batch'] = True
return {'cli_turn_v1': committed} if committed else {}
@@ -132,9 +132,13 @@ def classic_cli_turn(turn):
def clarify_batch_turn(turn):
- """The clarify tool's batch goes to main's batch panel as one request: a classic-CLI turn that
- the classic CLI itself submitted (``clarify_batch`` committed with its admission)."""
- return classic_cli_turn(turn) and bool(cli_turn(getattr(turn._ctx, 'inbound_message_id', None)).get('clarify_batch'))
+ """The clarify tool's batch goes to main's batch panel as one request: a local-viewer turn whose
+ submitter declared it answers the whole set (``clarify_batch`` committed with its admission).
+ Main's classic CLI, Ink TUI and Desktop all showed every question at once (TUI-18); a viewer that
+ never asks (an ACP editor, a raw WebSocket client) keeps one ``clarify.request`` card per question."""
+ from gateway.run_turn_progress import local_viewer_turn
+ return local_viewer_turn(turn) and bool(
+ cli_turn(getattr(turn._ctx, 'inbound_message_id', None)).get('clarify_batch'))
def take_cli_result_fields(result, *, aux_before=None, session_db=None, session_id=None):
diff --git a/tests/gateway/test_local_viewer_clarify_batch.py b/tests/gateway/test_local_viewer_clarify_batch.py
index 003b54bf028..9019109215e 100644
--- a/tests/gateway/test_local_viewer_clarify_batch.py
+++ b/tests/gateway/test_local_viewer_clarify_batch.py
@@ -63,9 +63,9 @@ def test_batch_is_one_request_and_the_panels_answers_return(monkeypatch):
def test_runner_routes_a_classic_cli_turn_to_the_batch(monkeypatch):
- from gateway import run_turn_runner, session_cli_turn
+ from gateway import run_turn_progress, run_turn_runner, session_cli_turn
import gateway.session_clarify_batch as batch
- monkeypatch.setattr(session_cli_turn, 'classic_cli_turn', lambda turn: True)
+ monkeypatch.setattr(run_turn_progress, 'local_viewer_turn', lambda turn: True)
monkeypatch.setattr(run_turn_runner, '_finite_viewer_turn', lambda: False)
monkeypatch.setattr(batch, 'ask_clarify_batch', lambda turn, qs: {'answers': {'q0': 'blue'}, 'outcome': 'submitted'})
runner = run_turn_runner.TurnRunner.__new__(run_turn_runner.TurnRunner)
@@ -79,9 +79,10 @@ def test_a_cli_source_turn_the_classic_cli_did_not_submit_keeps_one_card_per_que
"""A ``cli``-source session is also driven by editors (ACP) and raw WebSocket viewers that answer
``clarify.request`` cards, never the batch ``clarify`` server request: only a turn the classic
CLI submitted with ``clarify_batch`` goes to main's batch panel."""
- from gateway import run_turn_runner, session_cli_turn
+ from gateway import run_turn_progress, run_turn_runner
+ from gateway import session_cli_turn
import gateway.session_clarify_batch as batch
- monkeypatch.setattr(session_cli_turn, 'classic_cli_turn', lambda turn: True)
+ monkeypatch.setattr(run_turn_progress, 'local_viewer_turn', lambda turn: True)
monkeypatch.setattr(run_turn_runner, '_finite_viewer_turn', lambda: False)
monkeypatch.setattr(batch, 'ask_clarify_batch', lambda *a: (_ for _ in ()).throw(AssertionError('batch path used')))
runner = run_turn_runner.TurnRunner.__new__(run_turn_runner.TurnRunner)
@@ -92,3 +93,24 @@ def test_a_cli_source_turn_the_classic_cli_did_not_submit_keeps_one_card_per_que
reply = runner._clarify_callback_sync(QUESTIONS)
assert asked == ['colour?', 'size?']
assert reply == {'answers': {'q0': 'blue', 'q1': 'blue'}, 'outcome': 'submitted'}
+
+
+def test_a_tui_turn_that_asked_for_the_batch_gets_the_batch_panel(monkeypatch):
+ """TUI-18: main's Ink TUI (like its classic CLI and Desktop) showed the clarify tool's whole
+ question set in one batch panel. A turn whose submitting viewer declares ``clarify_batch`` gets
+ the one ``clarify`` request whatever its surface, not one card per question."""
+ from gateway import run_turn_progress, run_turn_runner, session_cli_turn
+ import gateway.session_clarify_batch as batch
+ from gateway.session_policy import SURFACES
+ monkeypatch.setattr(run_turn_progress, 'local_viewer_turn', lambda turn: True)
+ monkeypatch.setattr('gateway.session_policy.policy_for_source',
+ lambda runner, source: SimpleNamespace(platform=SURFACES['tui']))
+ monkeypatch.setattr(run_turn_runner, '_finite_viewer_turn', lambda: False)
+ monkeypatch.setattr(batch, 'ask_clarify_batch', lambda turn, qs: {'answers': {'q0': 'red'}, 'outcome': 'submitted'})
+ runner = run_turn_runner.TurnRunner.__new__(run_turn_runner.TurnRunner)
+ runner._runner = SimpleNamespace()
+ runner._ctx = SimpleNamespace(inbound_message_id='adm-1', source=SimpleNamespace(platform=Platform.LOCAL))
+ runner._ask_clarify_question = lambda *a, **k: (_ for _ in ()).throw(AssertionError('per-card path used'))
+ with session_cli_turn.cli_turn_scope('adm-1', {'clarify_batch': True}):
+ assert runner._clarify_callback_sync(QUESTIONS) == {'answers': {'q0': 'red'}, 'outcome': 'submitted'}
+