fix: add numbered approval and clarify shortcuts (#956)

agent/auxiliary_client.py

@@ -1,4 +1,4 @@
-from agent.telemetry_logger import log_token_usage\n"""Shared auxiliary client router for side tasks.
+"""Shared auxiliary client router for side tasks.
 
 Provides a single resolution chain so every consumer (context compression,
 session search, web extraction, vision analysis, browser vision) picks up
@@ -34,6 +34,8 @@ Payment / credit exhaustion fallback:
   their OpenRouter balance but has Codex OAuth or another provider available.
 """
 
+from agent.telemetry_logger import log_token_usage
+
 import json
 import logging
 import os
@@ -396,7 +398,8 @@ class _CodexCompletionsAdapter:
                     prompt_tokens=getattr(resp_usage, "input_tokens", 0),
                     completion_tokens=getattr(resp_usage, "output_tokens", 0),
                     total_tokens=getattr(resp_usage, "total_tokens", 0),
-                )\n        log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
+                )
+                log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
         except Exception as exc:
             logger.debug("Codex auxiliary Responses API call failed: %s", exc)
             raise
@@ -529,7 +532,8 @@ class _AnthropicCompletionsAdapter:
                 prompt_tokens=prompt_tokens,
                 completion_tokens=completion_tokens,
                 total_tokens=total_tokens,
-            )\n    log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
+            )
+            log_token_usage(usage.prompt_tokens, usage.completion_tokens, model)
 
         choice = SimpleNamespace(
             index=0,

cli.py

@@ -7254,6 +7254,40 @@ class HermesCLI:
             "Use your best judgement to make the choice and proceed."
         )
 
+    def _handle_clarify_selection(self) -> None:
+        """Process the currently selected clarify choice."""
+        state = self._clarify_state
+        if not state or self._clarify_freetext:
+            return
+
+        selected = state.get("selected", 0)
+        choices = state.get("choices") or []
+        if selected < len(choices):
+            state["response_queue"].put(choices[selected])
+            self._clarify_state = None
+            self._clarify_freetext = False
+            self._invalidate()
+            return
+
+        if selected == len(choices):
+            self._clarify_freetext = True
+            self._invalidate()
+
+    def _handle_clarify_number_shortcut(self, number: int) -> bool:
+        """Select a clarify option by number key."""
+        state = self._clarify_state
+        if not state or self._clarify_freetext:
+            return False
+
+        choices = state.get("choices") or []
+        max_option = len(choices) + 1
+        if number < 1 or number > max_option:
+            return False
+
+        state["selected"] = number - 1
+        self._handle_clarify_selection()
+        return True
+
     def _sudo_password_callback(self) -> str:
         """
         Prompt for sudo password through the prompt_toolkit UI.
@@ -7362,6 +7396,20 @@ class HermesCLI:
             choices.append("view")
         return choices
 
+    def _handle_approval_number_shortcut(self, number: int) -> bool:
+        """Select an approval option by number key."""
+        state = self._approval_state
+        if not state:
+            return False
+
+        choices = state.get("choices") or []
+        if number < 1 or number > len(choices):
+            return False
+
+        state["selected"] = number - 1
+        self._handle_approval_selection()
+        return True
+
     def _handle_approval_selection(self) -> None:
         """Process the currently selected dangerous-command approval choice."""
         state = self._approval_state
@@ -7437,8 +7485,9 @@ class HermesCLI:
         preview_lines.extend(_wrap_panel_text(cmd_display, 60))
         for i, choice in enumerate(choices):
             prefix = '❯ ' if i == selected else '  '
+            label = f"{i + 1}. {choice_labels.get(choice, choice)}"
             preview_lines.extend(_wrap_panel_text(
-                f"{prefix}{choice_labels.get(choice, choice)}",
+                f"{prefix}{label}",
                 60,
                 subsequent_indent="  ",
             ))
@@ -7456,7 +7505,7 @@ class HermesCLI:
             _append_panel_line(lines, 'class:approval-border', 'class:approval-cmd', wrapped, box_width)
         _append_blank_panel_line(lines, 'class:approval-border', box_width)
         for i, choice in enumerate(choices):
-            label = choice_labels.get(choice, choice)
+            label = f"{i + 1}. {choice_labels.get(choice, choice)}"
             style = 'class:approval-selected' if i == selected else 'class:approval-choice'
             prefix = '❯ ' if i == selected else '  '
             for wrapped in _wrap_panel_text(f"{prefix}{label}", inner_text_width, subsequent_indent="  "):
@@ -7465,6 +7514,97 @@ class HermesCLI:
         lines.append(('class:approval-border', '╰' + ('─' * box_width) + '╯\n'))
         return lines
 
+    def _get_clarify_display_fragments(self):
+        """Render the clarify panel for the prompt_toolkit UI."""
+        state = self._clarify_state
+        if not state:
+            return []
+
+        def _panel_box_width(title: str, content_lines: list[str], min_width: int = 46, max_width: int = 76) -> int:
+            term_cols = shutil.get_terminal_size((100, 20)).columns
+            longest = max([len(title)] + [len(line) for line in content_lines] + [min_width - 4])
+            inner = min(max(longest + 4, min_width - 2), max_width - 2, max(24, term_cols - 6))
+            return inner + 2
+
+        def _wrap_panel_text(text: str, width: int, subsequent_indent: str = "") -> list[str]:
+            wrapped = textwrap.wrap(
+                text,
+                width=max(8, width),
+                break_long_words=False,
+                break_on_hyphens=False,
+                subsequent_indent=subsequent_indent,
+            )
+            return wrapped or [""]
+
+        def _append_panel_line(lines, border_style: str, content_style: str, text: str, box_width: int) -> None:
+            inner_width = max(0, box_width - 2)
+            lines.append((border_style, "│ "))
+            lines.append((content_style, text.ljust(inner_width)))
+            lines.append((border_style, " │\n"))
+
+        def _append_blank_panel_line(lines, border_style: str, box_width: int) -> None:
+            lines.append((border_style, "│" + (" " * box_width) + "│\n"))
+
+        question = state["question"]
+        choices = state.get("choices") or []
+        selected = state.get("selected", 0)
+        preview_lines = _wrap_panel_text(question, 60)
+        for i, choice in enumerate(choices):
+            prefix = "❯ " if i == selected and not self._clarify_freetext else "  "
+            label = f"{i + 1}. {choice}"
+            preview_lines.extend(_wrap_panel_text(f"{prefix}{label}", 60, subsequent_indent="  "))
+        other_number = len(choices) + 1
+        other_label = (
+            f"❯ {other_number}. Other (type below)" if self._clarify_freetext
+            else f"❯ {other_number}. Other (type your answer)" if selected == len(choices)
+            else f"  {other_number}. Other (type your answer)"
+        )
+        preview_lines.extend(_wrap_panel_text(other_label, 60, subsequent_indent="  "))
+        box_width = _panel_box_width("Hermes needs your input", preview_lines)
+        inner_text_width = max(8, box_width - 2)
+
+        lines = []
+        lines.append(('class:clarify-border', '╭─ '))
+        lines.append(('class:clarify-title', 'Hermes needs your input'))
+        lines.append(('class:clarify-border', ' ' + ('─' * max(0, box_width - len("Hermes needs your input") - 3)) + '╮\n'))
+        _append_blank_panel_line(lines, 'class:clarify-border', box_width)
+
+        for wrapped in _wrap_panel_text(question, inner_text_width):
+            _append_panel_line(lines, 'class:clarify-border', 'class:clarify-question', wrapped, box_width)
+        _append_blank_panel_line(lines, 'class:clarify-border', box_width)
+
+        if self._clarify_freetext and not choices:
+            guidance = "Type your answer in the prompt below, then press Enter."
+            for wrapped in _wrap_panel_text(guidance, inner_text_width):
+                _append_panel_line(lines, 'class:clarify-border', 'class:clarify-choice', wrapped, box_width)
+            _append_blank_panel_line(lines, 'class:clarify-border', box_width)
+
+        if choices:
+            for i, choice in enumerate(choices):
+                style = 'class:clarify-selected' if i == selected and not self._clarify_freetext else 'class:clarify-choice'
+                prefix = '❯ ' if i == selected and not self._clarify_freetext else '  '
+                label = f"{i + 1}. {choice}"
+                wrapped_lines = _wrap_panel_text(f"{prefix}{label}", inner_text_width, subsequent_indent="  ")
+                for wrapped in wrapped_lines:
+                    _append_panel_line(lines, 'class:clarify-border', style, wrapped, box_width)
+
+            other_idx = len(choices)
+            if selected == other_idx and not self._clarify_freetext:
+                other_style = 'class:clarify-selected'
+                other_label = f'❯ {other_number}. Other (type your answer)'
+            elif self._clarify_freetext:
+                other_style = 'class:clarify-active-other'
+                other_label = f'❯ {other_number}. Other (type below)'
+            else:
+                other_style = 'class:clarify-choice'
+                other_label = f'  {other_number}. Other (type your answer)'
+            for wrapped in _wrap_panel_text(other_label, inner_text_width, subsequent_indent="  "):
+                _append_panel_line(lines, 'class:clarify-border', other_style, wrapped, box_width)
+
+        _append_blank_panel_line(lines, 'class:clarify-border', box_width)
+        lines.append(('class:clarify-border', '╰' + ('─' * box_width) + '╯\n'))
+        return lines
+
     def _secret_capture_callback(self, var_name: str, prompt: str, metadata=None) -> dict:
         return prompt_for_secret(self, var_name, prompt, metadata)
 
@@ -8371,17 +8511,8 @@ class HermesCLI:
 
             # --- Clarify choice mode: confirm the highlighted selection ---
             if self._clarify_state and not self._clarify_freetext:
-                state = self._clarify_state
-                selected = state["selected"]
-                choices = state.get("choices") or []
-                if selected < len(choices):
-                    state["response_queue"].put(choices[selected])
-                    self._clarify_state = None
-                    event.app.invalidate()
-                else:
-                    # "Other" selected → switch to freetext
-                    self._clarify_freetext = True
-                    event.app.invalidate()
+                self._handle_clarify_selection()
+                event.app.invalidate()
                 return
 
             # --- Normal input routing ---
@@ -8501,6 +8632,19 @@ class HermesCLI:
                 self._approval_state["selected"] = min(max_idx, self._approval_state["selected"] + 1)
                 event.app.invalidate()
 
+        # --- Numbered shortcuts for clarify / approval modal prompts ---
+        for _digit in '123456789':
+            @kb.add(_digit, filter=Condition(lambda: bool(self._approval_state) or (bool(self._clarify_state) and not self._clarify_freetext)))
+            def _handle_modal_number(event, digit=_digit):
+                number = int(digit)
+                handled = False
+                if self._approval_state:
+                    handled = self._handle_approval_number_shortcut(number)
+                elif self._clarify_state and not self._clarify_freetext:
+                    handled = self._handle_clarify_number_shortcut(number)
+                if handled:
+                    event.app.invalidate()
+
         # --- /model picker: arrow-key navigation ---
         @kb.add('up', filter=Condition(lambda: bool(self._model_picker_state)))
         def model_picker_up(event):
@@ -8995,7 +9139,7 @@ class HermesCLI:
             if cli_ref._approval_state:
                 remaining = max(0, int(cli_ref._approval_deadline - _time.monotonic()))
                 return [
-                    ('class:hint', '  ↑/↓ to select, Enter to confirm'),
+                    ('class:hint', '  1-9 or ↑/↓ to select, Enter to confirm'),
                     ('class:clarify-countdown', f'  ({remaining}s)'),
                 ]
 
@@ -9008,7 +9152,7 @@ class HermesCLI:
                         ('class:clarify-countdown', countdown),
                     ]
                 return [
-                    ('class:hint', '  ↑/↓ to select, Enter to confirm'),
+                    ('class:hint', '  1-9 or ↑/↓ to select, Enter to confirm'),
                     ('class:clarify-countdown', countdown),
                 ]
 
@@ -9086,71 +9230,7 @@ class HermesCLI:
             lines.append((border_style, "│" + (" " * box_width) + "│\n"))
 
         def _get_clarify_display():
-            """Build styled text for the clarify question/choices panel."""
-            state = cli_ref._clarify_state
-            if not state:
-                return []
-
-            question = state["question"]
-            choices = state.get("choices") or []
-            selected = state.get("selected", 0)
-            preview_lines = _wrap_panel_text(question, 60)
-            for i, choice in enumerate(choices):
-                prefix = "❯ " if i == selected and not cli_ref._clarify_freetext else "  "
-                preview_lines.extend(_wrap_panel_text(f"{prefix}{choice}", 60, subsequent_indent="  "))
-            other_label = (
-                "❯ Other (type below)" if cli_ref._clarify_freetext
-                else "❯ Other (type your answer)" if selected == len(choices)
-                else "  Other (type your answer)"
-            )
-            preview_lines.extend(_wrap_panel_text(other_label, 60, subsequent_indent="  "))
-            box_width = _panel_box_width("Hermes needs your input", preview_lines)
-            inner_text_width = max(8, box_width - 2)
-
-            lines = []
-            # Box top border
-            lines.append(('class:clarify-border', '╭─ '))
-            lines.append(('class:clarify-title', 'Hermes needs your input'))
-            lines.append(('class:clarify-border', ' ' + ('─' * max(0, box_width - len("Hermes needs your input") - 3)) + '╮\n'))
-            _append_blank_panel_line(lines, 'class:clarify-border', box_width)
-
-            # Question text
-            for wrapped in _wrap_panel_text(question, inner_text_width):
-                _append_panel_line(lines, 'class:clarify-border', 'class:clarify-question', wrapped, box_width)
-            _append_blank_panel_line(lines, 'class:clarify-border', box_width)
-
-            if cli_ref._clarify_freetext and not choices:
-                guidance = "Type your answer in the prompt below, then press Enter."
-                for wrapped in _wrap_panel_text(guidance, inner_text_width):
-                    _append_panel_line(lines, 'class:clarify-border', 'class:clarify-choice', wrapped, box_width)
-                _append_blank_panel_line(lines, 'class:clarify-border', box_width)
-
-            if choices:
-                # Multiple-choice mode: show selectable options
-                for i, choice in enumerate(choices):
-                    style = 'class:clarify-selected' if i == selected and not cli_ref._clarify_freetext else 'class:clarify-choice'
-                    prefix = '❯ ' if i == selected and not cli_ref._clarify_freetext else '  '
-                    wrapped_lines = _wrap_panel_text(f"{prefix}{choice}", inner_text_width, subsequent_indent="  ")
-                    for wrapped in wrapped_lines:
-                        _append_panel_line(lines, 'class:clarify-border', style, wrapped, box_width)
-
-                # "Other" option (5th line, only shown when choices exist)
-                other_idx = len(choices)
-                if selected == other_idx and not cli_ref._clarify_freetext:
-                    other_style = 'class:clarify-selected'
-                    other_label = '❯ Other (type your answer)'
-                elif cli_ref._clarify_freetext:
-                    other_style = 'class:clarify-active-other'
-                    other_label = '❯ Other (type below)'
-                else:
-                    other_style = 'class:clarify-choice'
-                    other_label = '  Other (type your answer)'
-                for wrapped in _wrap_panel_text(other_label, inner_text_width, subsequent_indent="  "):
-                    _append_panel_line(lines, 'class:clarify-border', other_style, wrapped, box_width)
-
-            _append_blank_panel_line(lines, 'class:clarify-border', box_width)
-            lines.append(('class:clarify-border', '╰' + ('─' * box_width) + '╯\n'))
-            return lines
+            return cli_ref._get_clarify_display_fragments()
 
         clarify_widget = ConditionalContainer(
             Window(

docs/morning-review-packet-2026-04-21-status.md

@@ -1,66 +0,0 @@
-# Morning Review Packet Status — #949
-
-Generated: 2026-04-22T14:57:44.332419+00:00
-Epic: [EPIC: Morning review packet — Hermes harness features landed 2026-04-21](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/949)
-
-## Summary
-
-- Child QA issues tracked: 13
-- Open child issues: 11
-- Closed child issues: 2
-- Open child issues already backed by PRs: 7
-- Open child issues still unowned on forge: 4
-
-## Child QA Matrix
-
-| Issue | State | Open PRs | Title |
-|------:|-------|----------|-------|
-| #950 | open | — | [QA] Verify AI Gateway provider UX + attribution headers |
-| #951 | open | — | [QA] Verify transport abstraction + AnthropicTransport wiring |
-| #952 | open | — | [QA] Verify CLI voice beep toggle |
-| #953 | open | [#1020](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1020) | [QA] Verify bundled skill scripts run out of the box |
-| #954 | open | [#1021](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1021) | [QA] Verify maps skill guest_house / camp_site / bakery expansion |
-| #955 | open | — | [QA] Verify KittenTTS local provider end-to-end |
-| #956 | open | [#1018](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1018) | [QA] Verify numbered keyboard shortcuts for approval + clarify prompts |
-| #957 | open | [#1015](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1015) | [QA] Verify optional adversarial-ux-test skill catalog flow |
-| #958 | open | [#1016](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1016) | [QA] Verify /usage account limits in CLI + gateway |
-| #959 | open | [#1014](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1014) | [QA] Verify OpenCode-Go curated catalog additions |
-| #960 | open | [#1017](https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1017) | [QA] Verify patch 'did you mean?' suggestions |
-| #961 | closed | — | [QA] Verify web dashboard update/restart action buttons |
-| #962 | closed | — | [QA] Verify hardcoded-home path guard on burn/921 branch |
-
-## Drift Signals
-
-forge/main is still catching up to the upstream packet.
-
-Active PR-backed child lanes:
-- #953 -> #1020 ([QA] Verify bundled skill scripts run out of the box)
-- #954 -> #1021 ([QA] Verify maps skill guest_house / camp_site / bakery expansion)
-- #956 -> #1018 ([QA] Verify numbered keyboard shortcuts for approval + clarify prompts)
-- #957 -> #1015 ([QA] Verify optional adversarial-ux-test skill catalog flow)
-- #958 -> #1016 ([QA] Verify /usage account limits in CLI + gateway)
-- #959 -> #1014 ([QA] Verify OpenCode-Go curated catalog additions)
-- #960 -> #1017 ([QA] Verify patch 'did you mean?' suggestions)
-
-## Unowned Open QA Issues
-
-- #950 [QA] Verify AI Gateway provider UX + attribution headers
-- #951 [QA] Verify transport abstraction + AnthropicTransport wiring
-- #952 [QA] Verify CLI voice beep toggle
-- #955 [QA] Verify KittenTTS local provider end-to-end
-
-## Decomposition Follow-Ups
-
-- #965 [open] [EPIC: Morning review packet — Hermes harness features landed 2026-04-21] Phase 1: Landscape Analysis & Scaffolding
-- #966 [open] [EPIC: Morning review packet — Hermes harness features landed 2026-04-21] Phase 2: Core Logic Implementation
-- #967 [closed] [EPIC: Morning review packet — Hermes harness features landed 2026-04-21] Phase 3: Poka-yoke Integration & Fleet Verification
-
-## Conclusion
-
-Refs #949 only. This epic remains open until every child QA issue has a truthful PASS/FAIL outcome, attached evidence, and any upstream/main versus forge/main drift is resolved or explicitly documented.
-
-## Regeneration
-
-```bash
-python3 scripts/morning_review_packet_status.py --fetch-live --json-out docs/morning-review-packet-2026-04-21.snapshot.json --markdown-out docs/morning-review-packet-2026-04-21-status.md
-```

docs/morning-review-packet-2026-04-21.snapshot.json

@@ -1,172 +0,0 @@
-{
-  "generated_at": "2026-04-22T14:57:44.332419+00:00",
-  "repo": "Timmy_Foundation/hermes-agent",
-  "epic": {
-    "number": 949,
-    "title": "EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21",
-    "state": "open",
-    "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/949"
-  },
-  "children": [
-    {
-      "number": 950,
-      "title": "[QA] Verify AI Gateway provider UX + attribution headers",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/950",
-      "open_prs": []
-    },
-    {
-      "number": 951,
-      "title": "[QA] Verify transport abstraction + AnthropicTransport wiring",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/951",
-      "open_prs": []
-    },
-    {
-      "number": 952,
-      "title": "[QA] Verify CLI voice beep toggle",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/952",
-      "open_prs": []
-    },
-    {
-      "number": 953,
-      "title": "[QA] Verify bundled skill scripts run out of the box",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/953",
-      "open_prs": [
-        {
-          "number": 1020,
-          "title": "fix: ship bundled skill scripts executable",
-          "head": "fix/953",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1020"
-        }
-      ]
-    },
-    {
-      "number": 954,
-      "title": "[QA] Verify maps skill guest_house / camp_site / bakery expansion",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/954",
-      "open_prs": [
-        {
-          "number": 1021,
-          "title": "feat: sync maps skill and verify guest_house/camp_site/bakery (#954)",
-          "head": "fix/954",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1021"
-        }
-      ]
-    },
-    {
-      "number": 955,
-      "title": "[QA] Verify KittenTTS local provider end-to-end",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/955",
-      "open_prs": []
-    },
-    {
-      "number": 956,
-      "title": "[QA] Verify numbered keyboard shortcuts for approval + clarify prompts",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/956",
-      "open_prs": [
-        {
-          "number": 1018,
-          "title": "fix: add numbered approval and clarify shortcuts (#956)",
-          "head": "fix/956",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1018"
-        }
-      ]
-    },
-    {
-      "number": 957,
-      "title": "[QA] Verify optional adversarial-ux-test skill catalog flow",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/957",
-      "open_prs": [
-        {
-          "number": 1015,
-          "title": "feat(skills): backport adversarial-ux-test optional skill",
-          "head": "fix/957",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1015"
-        }
-      ]
-    },
-    {
-      "number": 958,
-      "title": "[QA] Verify /usage account limits in CLI + gateway",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/958",
-      "open_prs": [
-        {
-          "number": 1016,
-          "title": "fix: restore /usage account limits in CLI + gateway (#958)",
-          "head": "fix/958",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1016"
-        }
-      ]
-    },
-    {
-      "number": 959,
-      "title": "[QA] Verify OpenCode-Go curated catalog additions",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/959",
-      "open_prs": [
-        {
-          "number": 1014,
-          "title": "fix(opencode-go): restore curated catalog additions",
-          "head": "fix/959",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1014"
-        }
-      ]
-    },
-    {
-      "number": 960,
-      "title": "[QA] Verify patch 'did you mean?' suggestions",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/960",
-      "open_prs": [
-        {
-          "number": 1017,
-          "title": "fix(patch): port and verify did-you-mean suggestions (#960)",
-          "head": "fix/960",
-          "url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/pulls/1017"
-        }
-      ]
-    },
-    {
-      "number": 961,
-      "title": "[QA] Verify web dashboard update/restart action buttons",
-      "state": "closed",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/961",
-      "open_prs": []
-    },
-    {
-      "number": 962,
-      "title": "[QA] Verify hardcoded-home path guard on burn/921 branch",
-      "state": "closed",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/962",
-      "open_prs": []
-    }
-  ],
-  "decomposition_issues": [
-    {
-      "number": 965,
-      "title": "[EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21] Phase 1: Landscape Analysis & Scaffolding",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/965"
-    },
-    {
-      "number": 966,
-      "title": "[EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21] Phase 2: Core Logic Implementation",
-      "state": "open",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/966"
-    },
-    {
-      "number": 967,
-      "title": "[EPIC: Morning review packet \u2014 Hermes harness features landed 2026-04-21] Phase 3: Poka-yoke Integration & Fleet Verification",
-      "state": "closed",
-      "html_url": "https://forge.alexanderwhitestone.com/Timmy_Foundation/hermes-agent/issues/967"
-    }
-  ]
-}

scripts/morning_review_packet_status.py

@@ -1,288 +0,0 @@
-#!/usr/bin/env python3
-"""Generate a grounded status report for hermes-agent morning review packet epic #949."""
-
-from __future__ import annotations
-
-import argparse
-import base64
-import json
-import os
-import re
-import ssl
-import urllib.request
-from datetime import datetime, timezone
-from pathlib import Path
-from typing import Any
-
-BASE_API = "https://forge.alexanderwhitestone.com/api/v1"
-REPO = "Timmy_Foundation/hermes-agent"
-TOKEN_PATH = Path("~/.config/gitea/token").expanduser()
-DEFAULT_JSON_OUT = Path("docs/morning-review-packet-2026-04-21.snapshot.json")
-DEFAULT_MARKDOWN_OUT = Path("docs/morning-review-packet-2026-04-21-status.md")
-
-
-def extract_issue_numbers(text: str) -> list[int]:
-    seen: set[int] = set()
-    numbers: list[int] = []
-    for match in re.finditer(r"#(\d+)", text or ""):
-        num = int(match.group(1))
-        if num not in seen:
-            seen.add(num)
-            numbers.append(num)
-    return numbers
-
-
-def _auth_headers(token: str) -> list[dict[str, str]]:
-    basic = base64.b64encode(f"{token}:".encode()).decode()
-    return [
-        {"Authorization": f"token {token}", "Accept": "application/json"},
-        {"Authorization": f"Basic {basic}", "Accept": "application/json"},
-    ]
-
-
-def api_get(path: str, *, headers_options: list[dict[str, str]] | None = None) -> Any:
-    token = TOKEN_PATH.read_text(encoding="utf-8").strip()
-    headers_options = headers_options or _auth_headers(token)
-    ctx = ssl.create_default_context()
-    url = f"{BASE_API}{path}"
-    last_error: Exception | None = None
-    for headers in headers_options:
-        try:
-            req = urllib.request.Request(url, headers=headers)
-            with urllib.request.urlopen(req, context=ctx, timeout=30) as resp:
-                return json.loads(resp.read().decode())
-        except Exception as exc:  # pragma: no cover - exercised via live CLI use
-            last_error = exc
-    raise RuntimeError(f"GET {url} failed: {last_error}")
-
-
-def issue_pr_matches(pr: dict[str, Any], issue_num: int) -> bool:
-    title = pr.get("title") or ""
-    body = pr.get("body") or ""
-    head = (pr.get("head") or {}).get("ref") or ""
-    exact_ref = re.compile(rf"(?<!\d)#{issue_num}(?!\d)")
-    body_ref = re.compile(rf"(?i)(closes|close|fixes|fix|resolves|resolve|refs|ref)\s+#?{issue_num}(?!\d)")
-    branch_variants = {
-        f"fix/{issue_num}",
-        f"issue-{issue_num}",
-        f"burn/{issue_num}",
-        f"fix/issue-{issue_num}",
-    }
-    return bool(
-        exact_ref.search(title)
-        or exact_ref.search(body)
-        or body_ref.search(body)
-        or head in branch_variants
-    )
-
-
-def fetch_open_prs(*, headers_options: list[dict[str, str]]) -> list[dict[str, Any]]:
-    prs: list[dict[str, Any]] = []
-    page = 1
-    while True:
-        batch = api_get(
-            f"/repos/{REPO}/pulls?state=open&limit=100&page={page}",
-            headers_options=headers_options,
-        )
-        if not batch:
-            break
-        prs.extend(batch)
-        if len(batch) < 100:
-            break
-        page += 1
-    return prs
-
-
-def fetch_live_snapshot(epic_issue_num: int = 949) -> dict[str, Any]:
-    token = TOKEN_PATH.read_text(encoding="utf-8").strip()
-    headers_options = _auth_headers(token)
-
-    epic = api_get(f"/repos/{REPO}/issues/{epic_issue_num}", headers_options=headers_options)
-    comments = api_get(f"/repos/{REPO}/issues/{epic_issue_num}/comments", headers_options=headers_options)
-    child_numbers = [n for n in extract_issue_numbers(epic.get("body") or "") if n != epic_issue_num]
-    decomposition_numbers = [
-        n
-        for comment in comments
-        for n in extract_issue_numbers(comment.get("body") or "")
-        if n not in child_numbers and n != epic_issue_num
-    ]
-
-    open_prs = fetch_open_prs(headers_options=headers_options)
-
-    children = []
-    for number in child_numbers:
-        issue = api_get(f"/repos/{REPO}/issues/{number}", headers_options=headers_options)
-        matching_prs = [
-            {
-                "number": pr["number"],
-                "title": pr["title"],
-                "head": pr.get("head", {}).get("ref", ""),
-                "url": pr["html_url"],
-            }
-            for pr in open_prs
-            if issue_pr_matches(pr, number)
-        ]
-        children.append(
-            {
-                "number": issue["number"],
-                "title": issue["title"],
-                "state": issue["state"],
-                "html_url": issue["html_url"],
-                "open_prs": matching_prs,
-            }
-        )
-
-    decomposition_issues = []
-    for number in decomposition_numbers:
-        issue = api_get(f"/repos/{REPO}/issues/{number}", headers_options=headers_options)
-        decomposition_issues.append(
-            {
-                "number": issue["number"],
-                "title": issue["title"],
-                "state": issue["state"],
-                "html_url": issue["html_url"],
-            }
-        )
-
-    return {
-        "generated_at": datetime.now(timezone.utc).isoformat(),
-        "repo": REPO,
-        "epic": {
-            "number": epic["number"],
-            "title": epic["title"],
-            "state": epic["state"],
-            "html_url": epic["html_url"],
-        },
-        "children": children,
-        "decomposition_issues": decomposition_issues,
-    }
-
-
-def summarize_snapshot(snapshot: dict[str, Any]) -> dict[str, int]:
-    children = snapshot.get("children", [])
-    open_children = [issue for issue in children if issue.get("state") == "open"]
-    closed_children = [issue for issue in children if issue.get("state") == "closed"]
-    open_with_pr = [issue for issue in open_children if issue.get("open_prs")]
-    open_without_pr = [issue for issue in open_children if not issue.get("open_prs")]
-    return {
-        "total_children": len(children),
-        "open_children": len(open_children),
-        "closed_children": len(closed_children),
-        "open_with_pr": len(open_with_pr),
-        "open_without_pr": len(open_without_pr),
-    }
-
-
-def render_markdown(snapshot: dict[str, Any]) -> str:
-    epic = snapshot["epic"]
-    children = snapshot.get("children", [])
-    summary = summarize_snapshot(snapshot)
-    open_with_pr = [issue for issue in children if issue.get("state") == "open" and issue.get("open_prs")]
-    open_without_pr = [issue for issue in children if issue.get("state") == "open" and not issue.get("open_prs")]
-    decomposition = snapshot.get("decomposition_issues", [])
-
-    lines = [
-        f"# Morning Review Packet Status — #{epic['number']}",
-        "",
-        f"Generated: {snapshot.get('generated_at', '')}",
-        f"Epic: [{epic['title']}]({epic.get('html_url', '')})",
-        "",
-        "## Summary",
-        "",
-        f"- Child QA issues tracked: {summary['total_children']}",
-        f"- Open child issues: {summary['open_children']}",
-        f"- Closed child issues: {summary['closed_children']}",
-        f"- Open child issues already backed by PRs: {summary['open_with_pr']}",
-        f"- Open child issues still unowned on forge: {summary['open_without_pr']}",
-        "",
-        "## Child QA Matrix",
-        "",
-        "| Issue | State | Open PRs | Title |",
-        "|------:|-------|----------|-------|",
-    ]
-
-    for issue in children:
-        rendered_prs = []
-        for pr in issue.get("open_prs", []):
-            pr_num = pr.get("number", "?")
-            pr_url = pr.get("url") or pr.get("html_url") or ""
-            rendered_prs.append(f"[#{pr_num}]({pr_url})" if pr_url else f"#{pr_num}")
-        pr_text = ", ".join(rendered_prs) or "—"
-        lines.append(
-            f"| #{issue['number']} | {issue['state']} | {pr_text} | {issue['title']} |"
-        )
-
-    lines.extend([
-        "",
-        "## Drift Signals",
-        "",
-        "forge/main is still catching up to the upstream packet.",
-    ])
-
-    if open_with_pr:
-        lines.append("")
-        lines.append("Active PR-backed child lanes:")
-        for issue in open_with_pr:
-            pr_numbers = ", ".join(f"#{pr['number']}" for pr in issue.get("open_prs", []))
-            lines.append(f"- #{issue['number']} -> {pr_numbers} ({issue['title']})")
-
-    if open_without_pr:
-        lines.extend([
-            "",
-            "## Unowned Open QA Issues",
-            "",
-        ])
-        for issue in open_without_pr:
-            lines.append(f"- #{issue['number']} {issue['title']}")
-
-    if decomposition:
-        lines.extend([
-            "",
-            "## Decomposition Follow-Ups",
-            "",
-        ])
-        for issue in decomposition:
-            lines.append(f"- #{issue['number']} [{issue['state']}] {issue['title']}")
-
-    lines.extend([
-        "",
-        "## Conclusion",
-        "",
-        "Refs #949 only. This epic remains open until every child QA issue has a truthful PASS/FAIL outcome, attached evidence, and any upstream/main versus forge/main drift is resolved or explicitly documented.",
-        "",
-        "## Regeneration",
-        "",
-        "```bash",
-        "python3 scripts/morning_review_packet_status.py --fetch-live --json-out docs/morning-review-packet-2026-04-21.snapshot.json --markdown-out docs/morning-review-packet-2026-04-21-status.md",
-        "```",
-    ])
-
-    return "\n".join(lines) + "\n"
-
-
-def write_json(path: Path, data: dict[str, Any]) -> None:
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="Generate grounded status docs for epic #949")
-    parser.add_argument("--fetch-live", action="store_true", help="Fetch the current packet state from Forge")
-    parser.add_argument("--snapshot", type=Path, help="Read a local JSON snapshot instead of hitting the API")
-    parser.add_argument("--json-out", type=Path, default=DEFAULT_JSON_OUT, help="Path to write JSON snapshot")
-    parser.add_argument("--markdown-out", type=Path, default=DEFAULT_MARKDOWN_OUT, help="Path to write markdown report")
-    args = parser.parse_args()
-
-    if args.fetch_live or not args.snapshot:
-        snapshot = fetch_live_snapshot()
-    else:
-        snapshot = json.loads(args.snapshot.read_text(encoding="utf-8"))
-
-    write_json(args.json_out, snapshot)
-    args.markdown_out.parent.mkdir(parents=True, exist_ok=True)
-    args.markdown_out.write_text(render_markdown(snapshot), encoding="utf-8")
-    print(args.markdown_out)
-
-
-if __name__ == "__main__":
-    main()

tests/cli/test_cli_numbered_prompt_shortcuts.py

@@ -0,0 +1,172 @@
+import queue
+import threading
+from types import SimpleNamespace
+from unittest.mock import MagicMock
+
+from cli import HermesCLI
+
+
+class _FakeBuffer:
+    def __init__(self, text="", cursor_position=None):
+        self.text = text
+        self.cursor_position = len(text) if cursor_position is None else cursor_position
+
+    def reset(self, append_to_history=False):
+        self.text = ""
+        self.cursor_position = 0
+
+
+def _make_cli_stub():
+    cli = HermesCLI.__new__(HermesCLI)
+    cli._approval_state = None
+    cli._approval_deadline = 0
+    cli._approval_lock = threading.Lock()
+    cli._clarify_state = None
+    cli._clarify_freetext = False
+    cli._clarify_deadline = 0
+    cli._sudo_state = None
+    cli._sudo_deadline = 0
+    cli._secret_state = None
+    cli._secret_deadline = 0
+    cli._modal_input_snapshot = None
+    cli._invalidate = MagicMock()
+    cli._app = SimpleNamespace(invalidate=MagicMock(), current_buffer=_FakeBuffer())
+    return cli
+
+
+def test_approval_display_numbers_choices():
+    cli = _make_cli_stub()
+    cli._approval_state = {
+        "command": "sudo rm -rf /tmp/example",
+        "description": "dangerous command",
+        "choices": ["once", "session", "always", "deny"],
+        "selected": 0,
+        "response_queue": queue.Queue(),
+    }
+
+    rendered = "".join(text for _style, text in cli._get_approval_display_fragments())
+
+    assert "❯ 1. Allow once" in rendered
+    assert "2. Allow for this session" in rendered
+    assert "3. Add to permanent allowlist" in rendered
+    assert "4. Deny" in rendered
+
+
+def test_approval_number_shortcut_submits_choice():
+    cli = _make_cli_stub()
+    response_queue = queue.Queue()
+    cli._approval_state = {
+        "command": "sudo rm -rf /tmp/example",
+        "description": "dangerous command",
+        "choices": ["once", "session", "always", "deny"],
+        "selected": 0,
+        "response_queue": response_queue,
+    }
+
+    assert cli._handle_approval_number_shortcut(2) is True
+    assert response_queue.get_nowait() == "session"
+    assert cli._approval_state is None
+
+
+def test_approval_selection_still_submits_selected_choice():
+    cli = _make_cli_stub()
+    response_queue = queue.Queue()
+    cli._approval_state = {
+        "command": "sudo rm -rf /tmp/example",
+        "description": "dangerous command",
+        "choices": ["once", "session", "always", "deny"],
+        "selected": 1,
+        "response_queue": response_queue,
+    }
+
+    cli._handle_approval_selection()
+
+    assert response_queue.get_nowait() == "session"
+    assert cli._approval_state is None
+
+
+def test_approval_number_shortcut_handles_view_in_place():
+    cli = _make_cli_stub()
+    response_queue = queue.Queue()
+    cli._approval_state = {
+        "command": "sudo dd if=/tmp/in of=/usr/share/keyrings/githubcli-archive-keyring.gpg bs=4M status=progress",
+        "description": "disk copy",
+        "choices": ["once", "session", "always", "deny", "view"],
+        "selected": 0,
+        "response_queue": response_queue,
+    }
+
+    assert cli._handle_approval_number_shortcut(5) is True
+    assert cli._approval_state is not None
+    assert cli._approval_state["show_full"] is True
+    assert "view" not in cli._approval_state["choices"]
+    assert cli._approval_state["selected"] == 3
+    assert response_queue.empty()
+
+
+def test_clarify_display_numbers_choices_and_other():
+    cli = _make_cli_stub()
+    cli._clarify_state = {
+        "question": "Pick the best option",
+        "choices": ["Alpha", "Beta", "Gamma", "Delta"],
+        "selected": 1,
+        "response_queue": queue.Queue(),
+    }
+
+    rendered = "".join(text for _style, text in cli._get_clarify_display_fragments())
+
+    assert "1. Alpha" in rendered
+    assert "❯ 2. Beta" in rendered
+    assert "3. Gamma" in rendered
+    assert "4. Delta" in rendered
+    assert "5. Other (type your answer)" in rendered
+
+
+def test_clarify_number_shortcut_submits_choice():
+    cli = _make_cli_stub()
+    response_queue = queue.Queue()
+    cli._clarify_state = {
+        "question": "Pick the best option",
+        "choices": ["Alpha", "Beta", "Gamma"],
+        "selected": 0,
+        "response_queue": response_queue,
+    }
+
+    assert cli._handle_clarify_number_shortcut(3) is True
+    assert response_queue.get_nowait() == "Gamma"
+    assert cli._clarify_state is None
+    assert cli._clarify_freetext is False
+
+
+def test_clarify_selection_still_submits_selected_choice():
+    cli = _make_cli_stub()
+    response_queue = queue.Queue()
+    cli._clarify_state = {
+        "question": "Pick the best option",
+        "choices": ["Alpha", "Beta", "Gamma"],
+        "selected": 1,
+        "response_queue": response_queue,
+    }
+
+    cli._handle_clarify_selection()
+
+    assert response_queue.get_nowait() == "Beta"
+    assert cli._clarify_state is None
+    assert cli._clarify_freetext is False
+
+
+def test_clarify_number_shortcut_activates_other_freetext():
+    cli = _make_cli_stub()
+    response_queue = queue.Queue()
+    cli._clarify_state = {
+        "question": "Pick the best option",
+        "choices": ["Alpha", "Beta", "Gamma"],
+        "selected": 0,
+        "response_queue": response_queue,
+    }
+
+    assert cli._handle_clarify_number_shortcut(4) is True
+    assert cli._clarify_state is not None
+    assert cli._clarify_state["selected"] == 3
+    assert cli._clarify_freetext is True
+    assert response_queue.empty()

tests/test_morning_review_packet_status.py

@@ -1,94 +0,0 @@
-"""Tests for the morning review packet status report generator."""
-
-from __future__ import annotations
-
-import importlib.util
-from pathlib import Path
-
-SCRIPT_PATH = Path(__file__).resolve().parents[1] / "scripts" / "morning_review_packet_status.py"
-DOC_PATH = Path(__file__).resolve().parents[1] / "docs" / "morning-review-packet-2026-04-21-status.md"
-
-
-def load_module():
-    assert SCRIPT_PATH.exists(), f"missing status script: {SCRIPT_PATH}"
-    spec = importlib.util.spec_from_file_location("morning_review_packet_status_test", SCRIPT_PATH)
-    module = importlib.util.module_from_spec(spec)
-    assert spec.loader is not None
-    spec.loader.exec_module(module)
-    return module
-
-
-def sample_snapshot():
-    return {
-        "epic": {"number": 949, "title": "Morning review packet", "state": "open"},
-        "children": [
-            {
-                "number": 950,
-                "title": "Verify AI Gateway provider UX + attribution headers",
-                "state": "open",
-                "open_prs": [],
-            },
-            {
-                "number": 954,
-                "title": "Verify maps skill guest_house / camp_site / bakery expansion",
-                "state": "open",
-                "open_prs": [
-                    {"number": 1021, "head": "fix/954", "title": "feat: sync maps skill and verify guest_house/camp_site/bakery (#954)"}
-                ],
-            },
-            {
-                "number": 961,
-                "title": "Verify web dashboard update/restart action buttons",
-                "state": "closed",
-                "open_prs": [],
-            },
-        ],
-        "decomposition_issues": [
-            {"number": 965, "title": "Phase 1: Landscape Analysis & Scaffolding", "state": "open"},
-            {"number": 967, "title": "Phase 3: Poka-yoke Integration & Fleet Verification", "state": "closed"},
-        ],
-    }
-
-
-def test_extract_child_issue_numbers_from_epic_body():
-    module = load_module()
-    body = """
-- [ ] #950 one
-- [ ] #951 two
-- [ ] #962 three
-"""
-    assert module.extract_issue_numbers(body) == [950, 951, 962]
-
-
-def test_summarize_snapshot_counts_open_closed_and_pr_backing():
-    module = load_module()
-    summary = module.summarize_snapshot(sample_snapshot())
-
-    assert summary["total_children"] == 3
-    assert summary["open_children"] == 2
-    assert summary["closed_children"] == 1
-    assert summary["open_with_pr"] == 1
-    assert summary["open_without_pr"] == 1
-
-
-def test_render_markdown_includes_issue_matrix_and_drift_sections():
-    module = load_module()
-    md = module.render_markdown(sample_snapshot())
-
-    assert "# Morning Review Packet Status — #949" in md
-    assert "## Child QA Matrix" in md
-    assert "#950" in md
-    assert "#954" in md
-    assert "#1021" in md
-    assert "## Unowned Open QA Issues" in md
-    assert "## Drift Signals" in md
-    assert "forge/main is still catching up to the upstream packet" in md
-
-
-def test_committed_status_doc_exists_and_mentions_live_examples():
-    assert DOC_PATH.exists(), f"missing generated status doc: {DOC_PATH}"
-    text = DOC_PATH.read_text(encoding="utf-8")
-    assert "# Morning Review Packet Status — #949" in text
-    assert "#954" in text
-    assert "#1021" in text
-    assert "#950" in text