mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-05-20 00:22:31 +00:00
352aaf0627
Reasoning surfacing was split across three branches in runner.py plus two separate streaming buffers (loop hook and runner progress stream), with three independent display-side gates in the CLI. This collapsed the policy into one source of truth and fixed two real bugs: - Structured `reasoning_content` was suppressed whenever the answer was streamed, because the runner gated emission on `streamed_content`. Providers don't stream `reasoning_content`; it only arrives on the final response, so the answer stream and the reasoning channel are independent. Added `streamed_reasoning` to `AgentHookContext` to track the right bit. - `channels.showReasoning` was subordinated to `sendProgress`. They are orthogonal — turning off progress streaming shouldn't silence reasoning. Reworked the CLI gates accordingly. Single-helper consolidation: - `extract_reasoning(reasoning_content, thinking_blocks, content)` returns `(reasoning_text, cleaned_content)` with a defined fallback order: dedicated field → Anthropic thinking_blocks → inline `<think>`/`<thought>` tags. Models that expose none of these short-circuit to `(None, content)` — zero overhead. - `IncrementalThinkExtractor` replaces the ad-hoc `emit_incremental_think` function and its hand-rolled "emitted cursor" state in both the loop hook and the runner progress stream. Also documented the new `showReasoning` channel option in docs/configuration.md and noted its independence from sendProgress. Co-authored-by: Cursor <cursoragent@cursor.com>
114 lines
4.0 KiB
Python
114 lines
4.0 KiB
Python
from types import SimpleNamespace
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from nanobot.cli import commands
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_interactive_retry_wait_is_rendered_as_progress_even_when_progress_disabled():
|
|
"""Provider retry waits should not fall through as assistant responses."""
|
|
calls: list[tuple[str, object | None]] = []
|
|
thinking = None
|
|
channels_config = SimpleNamespace(send_progress=False, send_tool_hints=False)
|
|
msg = SimpleNamespace(
|
|
content="Model request failed, retry in 2s (attempt 1).",
|
|
metadata={"_retry_wait": True},
|
|
)
|
|
|
|
async def fake_print(text: str, active_thinking: object | None, renderer=None) -> None:
|
|
calls.append((text, active_thinking))
|
|
|
|
with patch("nanobot.cli.commands._print_interactive_progress_line", side_effect=fake_print):
|
|
handled = await commands._maybe_print_interactive_progress(
|
|
msg,
|
|
thinking,
|
|
channels_config,
|
|
)
|
|
|
|
assert handled is True
|
|
assert calls == [("Model request failed, retry in 2s (attempt 1).", thinking)]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reasoning_displayed_when_show_reasoning_enabled():
|
|
"""Reasoning content should be displayed when show_reasoning is True."""
|
|
calls: list[str] = []
|
|
channels_config = SimpleNamespace(
|
|
send_progress=True, send_tool_hints=False, show_reasoning=True,
|
|
)
|
|
msg = SimpleNamespace(
|
|
content="Let me think about this...",
|
|
metadata={"_progress": True, "_reasoning": True},
|
|
)
|
|
|
|
with patch("nanobot.cli.commands._print_cli_reasoning", side_effect=lambda t, th, r=None: calls.append(t)):
|
|
handled = await commands._maybe_print_interactive_progress(msg, None, channels_config)
|
|
|
|
assert handled is True
|
|
assert calls == ["Let me think about this..."]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reasoning_hidden_when_show_reasoning_disabled():
|
|
"""Reasoning content should be suppressed when show_reasoning is False."""
|
|
channels_config = SimpleNamespace(
|
|
send_progress=True, send_tool_hints=False, show_reasoning=False,
|
|
)
|
|
msg = SimpleNamespace(
|
|
content="Let me think about this...",
|
|
metadata={"_progress": True, "_reasoning": True},
|
|
)
|
|
|
|
with patch("nanobot.cli.commands._print_cli_reasoning") as mock_reasoning:
|
|
handled = await commands._maybe_print_interactive_progress(msg, None, channels_config)
|
|
|
|
assert handled is True
|
|
mock_reasoning.assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_non_reasoning_progress_not_affected_by_show_reasoning():
|
|
"""Regular progress lines should display regardless of show_reasoning."""
|
|
calls: list[str] = []
|
|
channels_config = SimpleNamespace(
|
|
send_progress=True, send_tool_hints=False, show_reasoning=False,
|
|
)
|
|
msg = SimpleNamespace(
|
|
content="working on it...",
|
|
metadata={"_progress": True},
|
|
)
|
|
|
|
async def fake_print(text: str, thinking=None, renderer=None):
|
|
calls.append(text)
|
|
|
|
with patch("nanobot.cli.commands._print_interactive_progress_line", side_effect=fake_print):
|
|
handled = await commands._maybe_print_interactive_progress(msg, None, channels_config)
|
|
|
|
assert handled is True
|
|
assert calls == ["working on it..."]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reasoning_shown_when_send_progress_disabled():
|
|
"""Reasoning display is governed by `show_reasoning` alone, independent
|
|
of `send_progress` — the two knobs are orthogonal."""
|
|
calls: list[str] = []
|
|
channels_config = SimpleNamespace(
|
|
send_progress=False, send_tool_hints=False, show_reasoning=True,
|
|
)
|
|
msg = SimpleNamespace(
|
|
content="Let me think about this...",
|
|
metadata={"_progress": True, "_reasoning": True},
|
|
)
|
|
|
|
with patch(
|
|
"nanobot.cli.commands._print_cli_reasoning",
|
|
side_effect=lambda t, th, r=None: calls.append(t),
|
|
):
|
|
handled = await commands._maybe_print_interactive_progress(msg, None, channels_config)
|
|
|
|
assert handled is True
|
|
assert calls == ["Let me think about this..."]
|