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(

plugins/memory/holographic/__init__.py

@@ -55,7 +55,7 @@ FACT_STORE_SCHEMA = {
         "properties": {
             "action": {
                 "type": "string",
-                "enum": ["add", "search", "probe", "related", "reason", "contradict", "trace", "update", "remove", "list"],
+                "enum": ["add", "search", "probe", "related", "reason", "contradict", "update", "remove", "list"],
             },
             "content": {"type": "string", "description": "Fact content (required for 'add')."},
             "query": {"type": "string", "description": "Search query (required for 'search')."},
@@ -67,13 +67,6 @@ FACT_STORE_SCHEMA = {
             "trust_delta": {"type": "number", "description": "Trust adjustment for 'update'."},
             "min_trust": {"type": "number", "description": "Minimum trust filter (default: 0.3)."},
             "limit": {"type": "integer", "description": "Max results (default: 10)."},
-            "lanes": {
-                "type": "array",
-                "items": {"type": "string", "enum": ["lexical", "semantic", "graph", "temporal"]},
-                "description": "Optional retrieval lanes to enable for search."
-            },
-            "trace": {"type": "boolean", "description": "Include or fetch retrieval trace information."},
-            "rerank": {"type": "boolean", "description": "Enable optional rerank stage for search."},
         },
         "required": ["action"],
     },
@@ -126,9 +119,6 @@ class HolographicMemoryProvider(MemoryProvider):
         self._store = None
         self._retriever = None
         self._min_trust = float(self._config.get("min_trust_threshold", 0.3))
-        self._retrieval_lanes = self._parse_retrieval_lanes(self._config.get("retrieval_lanes"))
-        self._enable_rerank = str(self._config.get("enable_rerank", "true")).lower() != "false"
-        self._last_retrieval_trace: dict | None = None
 
     @property
     def name(self) -> str:
@@ -154,14 +144,6 @@ class HolographicMemoryProvider(MemoryProvider):
         except Exception:
             pass
 
-    def _parse_retrieval_lanes(self, value) -> list[str]:
-        if isinstance(value, str):
-            value = [part.strip() for part in value.split(",") if part.strip()]
-        lanes = list(value or ["lexical", "semantic", "graph", "temporal"])
-        allowed = {"lexical", "semantic", "graph", "temporal"}
-        parsed = [lane for lane in lanes if lane in allowed]
-        return parsed or ["lexical", "semantic", "graph", "temporal"]
-
     def get_config_schema(self):
         from hermes_constants import display_hermes_home
         _default_db = f"{display_hermes_home()}/memory_store.db"
@@ -170,10 +152,6 @@ class HolographicMemoryProvider(MemoryProvider):
             {"key": "auto_extract", "description": "Auto-extract facts at session end", "default": "false", "choices": ["true", "false"]},
             {"key": "default_trust", "description": "Default trust score for new facts", "default": "0.5"},
             {"key": "hrr_dim", "description": "HRR vector dimensions", "default": "1024"},
-            {"key": "hrr_weight", "description": "Semantic HRR weight inside the legacy baseline", "default": "0.3"},
-            {"key": "temporal_decay_half_life", "description": "Temporal decay half-life in days (0 disables baseline decay)", "default": "0"},
-            {"key": "retrieval_lanes", "description": "Comma-separated retrieval lanes (lexical,semantic,graph,temporal)", "default": "lexical,semantic,graph,temporal"},
-            {"key": "enable_rerank", "description": "Enable optional local rerank stage", "default": "true", "choices": ["true", "false"]},
         ]
 
     def initialize(self, session_id: str, **kwargs) -> None:
@@ -191,8 +169,6 @@ class HolographicMemoryProvider(MemoryProvider):
         hrr_dim = int(self._config.get("hrr_dim", 1024))
         hrr_weight = float(self._config.get("hrr_weight", 0.3))
         temporal_decay = int(self._config.get("temporal_decay_half_life", 0))
-        self._retrieval_lanes = self._parse_retrieval_lanes(self._config.get("retrieval_lanes", self._retrieval_lanes))
-        self._enable_rerank = str(self._config.get("enable_rerank", self._enable_rerank)).lower() != "false"
 
         self._store = MemoryStore(db_path=db_path, default_trust=default_trust, hrr_dim=hrr_dim)
         self._retriever = FactRetriever(
@@ -200,8 +176,6 @@ class HolographicMemoryProvider(MemoryProvider):
             temporal_decay_half_life=temporal_decay,
             hrr_weight=hrr_weight,
             hrr_dim=hrr_dim,
-            retrieval_lanes=self._retrieval_lanes,
-            enable_rerank=self._enable_rerank,
         )
         self._session_id = session_id
 
@@ -232,23 +206,13 @@ class HolographicMemoryProvider(MemoryProvider):
         if not self._retriever or not query:
             return ""
         try:
-            payload = self._retriever.search_with_trace(
-                query,
-                min_trust=self._min_trust,
-                limit=5,
-                lanes=self._retrieval_lanes,
-                rerank=self._enable_rerank,
-            )
-            self._last_retrieval_trace = payload["trace"]
-            results = payload["results"]
+            results = self._retriever.search(query, min_trust=self._min_trust, limit=5)
             if not results:
                 return ""
             lines = []
             for r in results:
                 trust = r.get("trust_score", r.get("trust", 0))
-                lanes = ",".join(r.get("matched_lanes", []))
-                lane_suffix = f" [{lanes}]" if lanes else ""
-                lines.append(f"- [{trust:.1f}] {r.get('content', '')}{lane_suffix}")
+                lines.append(f"- [{trust:.1f}] {r.get('content', '')}")
             return "## Holographic Memory\n" + "\n".join(lines)
         except Exception as e:
             logger.debug("Holographic prefetch failed: %s", e)
@@ -306,39 +270,14 @@ class HolographicMemoryProvider(MemoryProvider):
                 return json.dumps({"fact_id": fact_id, "status": "added"})
 
             elif action == "search":
-                lanes = args.get("lanes")
-                rerank = args.get("rerank")
-                with_trace = bool(args.get("trace", False))
-                if with_trace:
-                    payload = retriever.search_with_trace(
-                        args["query"],
-                        category=args.get("category"),
-                        min_trust=float(args.get("min_trust", self._min_trust)),
-                        limit=int(args.get("limit", 10)),
-                        lanes=lanes,
-                        rerank=rerank,
-                    )
-                    self._last_retrieval_trace = payload["trace"]
-                    return json.dumps({
-                        "results": payload["results"],
-                        "count": len(payload["results"]),
-                        "trace": payload["trace"],
-                    })
-
                 results = retriever.search(
                     args["query"],
                     category=args.get("category"),
                     min_trust=float(args.get("min_trust", self._min_trust)),
                     limit=int(args.get("limit", 10)),
-                    lanes=lanes,
-                    rerank=rerank,
                 )
-                self._last_retrieval_trace = retriever.last_trace
                 return json.dumps({"results": results, "count": len(results)})
 
-            elif action == "trace":
-                return json.dumps({"trace": self._last_retrieval_trace or retriever.last_trace or {}})
-
             elif action == "probe":
                 results = retriever.probe(
                     args["entity"],
@@ -384,8 +323,7 @@ class HolographicMemoryProvider(MemoryProvider):
                 return json.dumps({"updated": updated})
 
             elif action == "remove":
-                removed = store.remove_fact(int(args["fact_id"])
-                )
+                removed = store.remove_fact(int(args["fact_id"]))
                 return json.dumps({"removed": removed})
 
             elif action == "list":

plugins/memory/holographic/store.py

@@ -83,7 +83,6 @@ _TRUST_MAX       =  1.0
 
 # Entity extraction patterns
 _RE_CAPITALIZED  = re.compile(r'\b([A-Z][a-z]+(?:\s+[A-Z][a-z]+)+)\b')
-_RE_SINGLE_PROPER = re.compile(r'\b([A-Z][A-Za-z0-9_-]{2,})\b')
 _RE_DOUBLE_QUOTE = re.compile(r'"([^"]+)"')
 _RE_SINGLE_QUOTE = re.compile(r"'([^']+)'")
 _RE_AKA          = re.compile(
@@ -415,13 +414,6 @@ class MemoryStore:
         for m in _RE_CAPITALIZED.finditer(text):
             _add(m.group(1))
 
-        skip_singletons = {"The", "This", "That", "These", "Those", "And", "But", "For", "With"}
-        for m in _RE_SINGLE_PROPER.finditer(text):
-            candidate = m.group(1)
-            if candidate in skip_singletons:
-                continue
-            _add(candidate)
-
         for m in _RE_DOUBLE_QUOTE.finditer(text):
             _add(m.group(1))
 

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/fixtures/holographic_recall_matrix.json

@@ -1,56 +0,0 @@
-{
-  "facts": [
-    {
-      "content": "Alexander Whitestone aka Rockachopa.",
-      "category": "general",
-      "tags": "identity alias"
-    },
-    {
-      "content": "Rockachopa uses Ansible playbooks for sovereign rollouts.",
-      "category": "project",
-      "tags": "ansible playbooks rollout"
-    },
-    {
-      "content": "The provider is anthropic/claude-haiku-4-5.",
-      "category": "project",
-      "tags": "provider default",
-      "updated_at": "2026-01-01T00:00:00Z"
-    },
-    {
-      "content": "Correction: the provider is mimo-v2-pro.",
-      "category": "project",
-      "tags": "provider current",
-      "updated_at": "2026-04-20T00:00:00Z"
-    },
-    {
-      "content": "Ezra operates the BURN2 lane for forge work.",
-      "category": "project",
-      "tags": "ezra burn2 forge lane"
-    },
-    {
-      "content": "BURN2 handles forge triage and review.",
-      "category": "project",
-      "tags": "forge triage review"
-    }
-  ],
-  "queries": [
-    {
-      "name": "semantic_alias_graph",
-      "query": "What automation does Alexander Whitestone use for deploys?",
-      "expected_substring": "Ansible playbooks",
-      "top_k": 1
-    },
-    {
-      "name": "temporal_correction",
-      "query": "What provider should we use?",
-      "expected_substring": "mimo-v2-pro",
-      "top_k": 1
-    },
-    {
-      "name": "graph_lane",
-      "query": "Which forge lane does Ezra operate?",
-      "expected_substring": "BURN2 lane",
-      "top_k": 1
-    }
-  ]
-}

tests/plugins/memory/test_holographic_retrieval.py

@@ -1,116 +0,0 @@
-"""Tests for multi-path holographic retrieval fusion and traceability."""
-
-from __future__ import annotations
-
-import json
-import sys
-from pathlib import Path
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[3]))
-
-from plugins.memory.holographic import HolographicMemoryProvider
-from plugins.memory.holographic.retrieval import FactRetriever, format_benchmark_report
-from plugins.memory.holographic.store import MemoryStore
-
-_FIXTURE_PATH = Path(__file__).resolve().parents[2] / "fixtures" / "holographic_recall_matrix.json"
-
-
-def _fixture() -> dict:
-    return json.loads(_FIXTURE_PATH.read_text())
-
-
-def _seed_store(tmp_path) -> MemoryStore:
-    store = MemoryStore(db_path=tmp_path / "memory_store.db")
-    for fact in _fixture()["facts"]:
-        fact_id = store.add_fact(fact["content"], category=fact["category"], tags=fact.get("tags", ""))
-        if fact.get("updated_at"):
-            store._conn.execute(
-                "UPDATE facts SET created_at = ?, updated_at = ? WHERE fact_id = ?",
-                (fact["updated_at"], fact["updated_at"], fact_id),
-            )
-    store._conn.commit()
-    return store
-
-
-class TestMultiPathRetrieval:
-    def test_lane_toggle_and_trace_contributions(self, tmp_path):
-        store = _seed_store(tmp_path)
-        retriever = FactRetriever(store=store)
-
-        payload = retriever.search_with_trace(
-            "Which forge lane does Ezra operate?",
-            limit=3,
-            lanes=["lexical", "graph"],
-        )
-
-        assert payload["trace"]["lanes_run"] == ["lexical", "graph"]
-        assert payload["results"]
-        top = payload["results"][0]
-        assert "BURN2 lane" in top["content"]
-        assert "graph" in top["lane_contributions"]
-        assert set(top["lane_contributions"]).issubset({"lexical", "graph"})
-
-    def test_trace_available_for_failed_recall(self, tmp_path):
-        store = _seed_store(tmp_path)
-        retriever = FactRetriever(store=store)
-
-        payload = retriever.search_with_trace(
-            "nonexistent memory topic xyz123",
-            limit=3,
-            lanes=["lexical", "semantic", "graph", "temporal"],
-        )
-
-        assert payload["results"] == []
-        assert payload["trace"]["fused_count"] == 0
-        assert payload["trace"]["lane_hits"]["lexical"] == 0
-        assert payload["trace"]["lane_hits"]["semantic"] == 0
-
-    def test_benchmark_prompt_matrix_shows_gain_over_baseline(self, tmp_path):
-        store = _seed_store(tmp_path)
-        retriever = FactRetriever(store=store)
-        report = retriever.benchmark_prompt_matrix(_fixture()["queries"], limit=3)
-
-        assert report["fused_top1_hits"] > report["baseline_top1_hits"]
-        assert report["improvement"] > 0
-
-        rendered = format_benchmark_report(report)
-        assert "Prompt matrix benchmark" in rendered
-        assert "semantic_alias_graph" in rendered
-        assert "improvement" in rendered.lower()
-
-
-class TestHolographicProviderTrace:
-    def test_prefetch_records_trace_and_trace_action_returns_it(self, tmp_path):
-        provider = HolographicMemoryProvider(
-            config={
-                "db_path": str(tmp_path / "provider.db"),
-                "retrieval_lanes": ["lexical", "semantic", "graph", "temporal"],
-                "enable_rerank": True,
-            }
-        )
-        provider.initialize("test-session")
-
-        seed_store = _seed_store(tmp_path / "seed")
-        rows = seed_store.list_facts(min_trust=0.0, limit=20)
-        for row in rows:
-            provider._store.add_fact(row["content"], category=row["category"], tags=row.get("tags", ""))
-            if row["content"].startswith("The provider is anthropic"):
-                provider._store._conn.execute(
-                    "UPDATE facts SET created_at = ?, updated_at = ? WHERE content = ?",
-                    ("2026-01-01T00:00:00Z", "2026-01-01T00:00:00Z", row["content"]),
-                )
-            elif row["content"].startswith("Correction: the provider is mimo"):
-                provider._store._conn.execute(
-                    "UPDATE facts SET created_at = ?, updated_at = ? WHERE content = ?",
-                    ("2026-04-20T00:00:00Z", "2026-04-20T00:00:00Z", row["content"]),
-                )
-        provider._store._conn.commit()
-
-        block = provider.prefetch("What provider should we use?")
-        assert "Holographic Memory" in block
-        assert "mimo-v2-pro" in block
-
-        trace_payload = json.loads(provider.handle_tool_call("fact_store", {"action": "trace"}))
-        assert trace_payload["trace"]["query"] == "What provider should we use?"
-        assert trace_payload["trace"]["rerank_applied"] in {True, False}
-        assert trace_payload["trace"]["lane_hits"]["temporal"] >= 1