@@ -839,6 +839,8 @@ def _reload_runtime_env_preserving_config_authority() -> None:
839839 if _display_cfg and isinstance(_display_cfg, dict):
840840 if "busy_input_mode" in _display_cfg:
841841 os.environ["HERMES_GATEWAY_BUSY_INPUT_MODE"] = str(_display_cfg["busy_input_mode"])
842+ if "busy_text_mode" in _display_cfg:
843+ os.environ["HERMES_GATEWAY_BUSY_TEXT_MODE"] = str(_display_cfg["busy_text_mode"])
842844 if "busy_ack_enabled" in _display_cfg:
843845 os.environ["HERMES_GATEWAY_BUSY_ACK_ENABLED"] = str(_display_cfg["busy_ack_enabled"])
844846 # Timezone: bridge config.yaml → HERMES_TIMEZONE env var.
@@ -1554,6 +1556,7 @@ class GatewayRunner:
15541556 # blow up on attribute access.
15551557 _running_agents_ts: Dict[str, float] = {}
15561558 _busy_input_mode: str = "interrupt"
1559+ _busy_text_mode: str = "interrupt"
15571560 _restart_drain_timeout: float = DEFAULT_GATEWAY_RESTART_DRAIN_TIMEOUT
15581561 _exit_code: Optional[int] = None
15591562 _draining: bool = False
@@ -1580,6 +1583,7 @@ def __init__(self, config: Optional[GatewayConfig] = None):
15801583 self._service_tier = self._load_service_tier()
15811584 self._show_reasoning = self._load_show_reasoning()
15821585 self._busy_input_mode = self._load_busy_input_mode()
1586+ self._busy_text_mode = self._load_busy_text_mode()
15831587 self._restart_drain_timeout = self._load_restart_drain_timeout()
15841588 self._provider_routing = self._load_provider_routing()
15851589 self._fallback_model = self._load_fallback_model()
@@ -2826,6 +2830,17 @@ def _load_busy_input_mode() -> str:
28262830 return "steer"
28272831 return "interrupt"
28282832
2833+ @staticmethod
2834+ def _load_busy_text_mode() -> str:
2835+ """Load normal busy TEXT follow-up behavior from config/env."""
2836+ mode = os.getenv("HERMES_GATEWAY_BUSY_TEXT_MODE", "").strip().lower()
2837+ if not mode:
2838+ cfg = _load_gateway_runtime_config()
2839+ mode = str(cfg_get(cfg, "display", "busy_text_mode", default="") or "").strip().lower()
2840+ if mode == "interrupt":
2841+ return "interrupt"
2842+ return "queue"
2843+
28292844 @staticmethod
28302845 def _load_restart_drain_timeout() -> float:
28312846 """Load graceful gateway restart/stop drain timeout in seconds."""
@@ -2973,11 +2988,19 @@ async def _handle_active_session_busy_message(self, event: MessageEvent, session
29732988
29742989 running_agent = self._running_agents.get(session_key)
29752990
2991+ effective_mode = self._busy_input_mode
2992+ busy_text_mode = getattr(self, "_busy_text_mode", "queue")
2993+ if (
2994+ event.message_type == MessageType.TEXT
2995+ and busy_text_mode == "queue"
2996+ and effective_mode != "steer"
2997+ ):
2998+ return False
2999+
29763000 # Steer mode: inject mid-run via running_agent.steer() instead of
29773001 # queueing + interrupting. If the agent isn't running yet
29783002 # (sentinel) or lacks steer(), or the payload is empty, fall back
29793003 # to queue semantics so nothing is lost.
2980- effective_mode = self._busy_input_mode
29813004 steered = False
29823005 if effective_mode == "steer":
29833006 steer_text = (event.text or "").strip()
@@ -3002,7 +3025,12 @@ async def _handle_active_session_busy_message(self, event: MessageEvent, session
30023025 # successful steer — the text already landed inside the run and
30033026 # must NOT also be replayed as a next-turn user message.
30043027 if not steered:
3005- merge_pending_message_event(adapter._pending_messages, session_key, event)
3028+ merge_pending_message_event(
3029+ adapter._pending_messages,
3030+ session_key,
3031+ event,
3032+ merge_text=event.message_type == MessageType.TEXT,
3033+ )
30063034
30073035 is_queue_mode = effective_mode == "queue"
30083036 is_steer_mode = effective_mode == "steer"
@@ -3934,6 +3962,7 @@ async def start(self) -> bool:
39343962 adapter.set_fatal_error_handler(self._handle_adapter_fatal_error)
39353963 adapter.set_session_store(self.session_store)
39363964 adapter.set_busy_session_handler(self._handle_active_session_busy_message)
3965+ adapter._busy_text_mode = self._busy_text_mode
39373966
39383967 # Try to connect
39393968 logger.info("Connecting to %s...", platform.value)
@@ -5546,6 +5575,7 @@ async def _platform_reconnect_watcher(self) -> None:
55465575 adapter.set_fatal_error_handler(self._handle_adapter_fatal_error)
55475576 adapter.set_session_store(self.session_store)
55485577 adapter.set_busy_session_handler(self._handle_active_session_busy_message)
5578+ adapter._busy_text_mode = self._busy_text_mode
55495579
55505580 success = await self._connect_adapter_with_timeout(adapter, platform)
55515581 if success:
0 commit comments