2 Commits

Author	SHA1	Message	Date
Siddharth Balyan	5eea87882a	Clarify: one question shape and one result shape on every surface (skip, cancel, timeout and undelivered are told apart) (#127760) ... * refactor(desktop): split clarify-tool.tsx into a clarify/ folder Pure moves, no behaviour change. Parsing, the question-card core (shell, choice rows, question block), the delivery watchdog, and each pending/settled card get their own file so the core can be reused. * feat(clarify): one questions[] shape with per-question status and one outcome The clarify tool now takes only questions=[{question, choices?, multi_select?}]. A wrong shape is a tool error that names the right one, so a model that sends the old top-level question/choices corrects itself on the next call. Every result has the same shape on every surface: each response carries status (answered, skipped, unanswered) with user_response null unless answered, and the result carries one outcome (submitted, cancelled, timed_out, undelivered) plus an optional surface-written notice. The timeout and cancel sentences that used to pose as the user's answer are gone, and the compressor reads status instead of matching their prefixes. The callback contract is callback(questions) -> {answers, outcome, notice?} (None = skipped, missing qid = unanswered). tui_gateway settles a batch the same way for the last lock, a cancel, an interrupt and the deadline, and clarify.lock keeps a null answer as a skip. A multi-select answer that is not a JSON array counts as one typed ("Other") answer. The tool-row preview reads the first question. * feat(clarify): every surface asks through the one question card CLI: the batch panel is the only panel; Enter on an empty field skips a question, Ctrl+C cancels and keeps the locked answers, the deadline returns timed_out. -q and -z return undelivered with a no-user notice. Ink TUI: the single-question prompt is gone; the card supports multi-select (Space or a digit toggles, Enter locks, typed Other text joins the picks), an empty submit skips, Esc cancels, and "Batch" names are dropped. Desktop: the single-question card is deleted and its keyboard handling moved into the one card (arrows, letters and digits, auto-advance, Enter picks then confirms). Confirm enables at one answer; blank questions lock null; Skip and a composer message cancel; the settled card shows No answer for unanswered questions. The bots room card follows the same contract. Messaging: one card per question with a "Reply skip to skip" line in every locale; timeouts and delivery failures map to timed_out and undelivered. * fix(clarify): cancelled for a released messaging card, labels win over the skip word A prose reply to a messaging choice card, /new and session end released the wait with "", which read as timed_out. They now resolve with a CANCELLED marker and the tool gets outcome cancelled. A typed reply that matches a choice label ("Skip") now resolves to that choice; the skip word applies only when no choice matches. The bots room card sends the picked labels as they are; the tool already strips the recommendation label. Unused OUTCOMES and a new docstring and comment are removed. * fix(tui): re-editing a multi-select answer keeps its picks The Ink card stored a multi-select answer as display text ("A, B"), so revisiting the question put the whole string into Other and re-locked it as one item. The answers map now keeps the raw JSON array, the card restores the picks on revisit, and only the display lines format it. Comments that earlier edits reworded are restored to their original words, minus the phrases the change made wrong. The compute-host clarify lock accepts None for a skipped question. * test(clarify): align three checks with the one-answer confirm and the regenerated keys The desktop Cmd+Enter test now expects a send with one answer (the blank question locks null), the compressor test expects the single-answer summary the code gives, and locales/_keys.desktop.json is regenerated for the removed and added clarify strings. * test(tui): the one-question card header is singular	2026-09-29 18:33:44 +05:30
teknium1	d10bb2ab6f	test: make tests/ mirror the source tree; drop issue numbers from filenames ... `scripts/run_tests.sh tests/<dir>/` is how a change gets its regression coverage run, so a test filed under the wrong directory is a test nobody runs when that code changes. Two kinds of drift had accumulated. Parallel directories for one source package, folded into the mirror: tests/acp -> tests/acp_adapter (its __init__/conftest move with it) tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into hermes_cli/conftest.py) tests/run_agent -> tests/agent (backoff fixture becomes agent/conftest.py) tests/relay -> tests/gateway/relay tests/state -> tests/hermes_state 246 loose files at tests/ root, routed by the package they import/patch: hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron. Installer and desktop-update script tests go to tests/scripts/{install, desktop_update}/. 43 tests of root-level modules (batch_runner, utils, hermes_constants, packaging) stay at the root. Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py); the number stays in the module docstring where it has context. Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli with different subsets — merged into one (10 tests, all kept); run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py; tests/test_account_usage.py -> agent/test_account_usage_fetch.py; tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py. Deleted: test_minisweagent_path.py (empty since PR #2804), test_model_picker_scroll.py (tested a private copy of the logic, imported nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour, imported nothing from Hermes). Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is bumped for the 202 files that changed depth and verified by evaluating every such expression against the new location. classify_changes' desktop-updater lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.	2026-09-13 09:18:02 -07:00