Merge remote-tracking branch 'origin/main' into claude/installation-paths-ci-Uhfly

# Conflicts:
#	aai_cli/output.py

Author: claude

aai_cli/commands/account.py

@@ -182,9 +182,9 @@ def render(d: dict[str, object]) -> object:
             shown_with_breakdown = [(item, _line_items_summary(item)) for item in shown]
             show_breakdown = any(summary for _, summary in shown_with_breakdown)
             table = (
-                Table("period", "total", "breakdown", header_style="aai.heading")
+                output.data_table("period", "total", "breakdown")
                 if show_breakdown
-                else Table("period", "total", header_style="aai.heading")
+                else output.data_table("period", "total")
             )
             hidden_count = len(items) - len(shown)
             for item, breakdown in shown_with_breakdown:
@@ -230,7 +230,7 @@ def body(state: AppState, json_mode: bool) -> None:
         data = ams.get_rate_limits(account_id, jwt)
 
         def render(d: dict[str, object]) -> Table:
-            table = Table("service", "limit", header_style="aai.heading")
+            table = output.data_table("service", "limit")
             for limit in jsonshape.mapping_list(d.get("rate_limits")):
                 table.add_row(
                     escape(str(limit.get("service", ""))),

aai_cli/commands/audit.py

@@ -6,7 +6,6 @@
 import typer
 from rich.console import Group
 from rich.markup import escape
-from rich.table import Table
 from rich.text import Text
 
 from aai_cli import help_panels, jsonshape, output, timeparse
@@ -141,7 +140,7 @@ def render(data: list[dict[str, object]]) -> object:
                     )
                 return Text(message, style="aai.muted")
 
-            table = Table("when (UTC)", "event", "resource", "actor", header_style="aai.heading")
+            table = output.data_table("when (UTC)", "event", "resource", "actor")
             for entry in shown:
                 table.add_row(
                     escape(_format_time(entry.get("log_time"))),

aai_cli/commands/keys.py

@@ -61,7 +61,7 @@ def body(state: AppState, json_mode: bool) -> None:
             )
 
         def render(data: list[dict[str, object]]) -> Table:
-            table = Table("id", "name", "project", "key", "disabled", header_style="aai.heading")
+            table = output.data_table("id", "name", "project", "key", "disabled")
             for row in data:
                 table.add_row(
                     str(row["id"]),

aai_cli/commands/login.py

@@ -126,9 +126,7 @@ def body(state: AppState, json_mode: bool) -> None:
         account_id = config.get_account_id(profile)
 
         def render(_d: dict[str, object]) -> Table:
-            table = Table.grid(padding=(0, 3))
-            table.add_column(style="aai.muted")
-            table.add_column()
+            table = output.detail_table()
             table.add_row("Profile", escape(profile))
             table.add_row("Env", escape(env))
             table.add_row("API key", escape(masked))

aai_cli/commands/sessions.py

@@ -56,13 +56,12 @@ def body(state: AppState, json_mode: bool) -> None:
         rows = _session_rows(payload.get("data"))
 
         def render(data: list[dict[str, object]]) -> Table:
-            table = Table(
+            table = output.data_table(
                 "session id",
                 "status",
                 "created",
                 "audio (s)",
                 "model",
-                header_style="aai.heading",
             )
             for s in data:
                 status_str = str(s["status"])
@@ -99,10 +98,11 @@ def body(state: AppState, json_mode: bool) -> None:
         data = ams.get_streaming(session_id, jwt)
 
         def render(d: dict[str, object]) -> Table:
-            table = Table(show_header=False)
+            table = output.detail_table()
             for field in _DETAIL_FIELDS:
                 value = d.get(field)
-                table.add_row(field, escape("" if value is None else str(value)))
+                label = field.replace("_", " ")
+                table.add_row(label, escape("" if value is None else str(value)))
             return table
 
         output.emit(data, render, json_mode=json_mode)

aai_cli/commands/stream.py

@@ -66,20 +66,22 @@ def stream(
     speech_model: str = typer.Option(
         DEFAULT_SPEECH_MODEL, "--speech-model", help="Streaming speech model."
     ),
-    encoding: str | None = typer.Option(None, "--encoding", help="pcm_s16le or pcm_mulaw."),
+    encoding: str | None = typer.Option(
+        None, "--encoding", help="Audio encoding: pcm_s16le or pcm_mulaw."
+    ),
     language_detection: bool | None = typer.Option(
         None, "--language-detection", help="Auto-detect the spoken language."
     ),
     domain: str | None = typer.Option(None, "--domain", help="Domain preset (e.g. medical)."),
     # turn detection
     end_of_turn_confidence_threshold: float | None = typer.Option(
-        None, "--end-of-turn-confidence-threshold", help="0-1 end-of-turn confidence."
+        None, "--end-of-turn-confidence-threshold", help="End-of-turn confidence (0-1)."
     ),
     min_turn_silence: int | None = typer.Option(
-        None, "--min-turn-silence", help="Min turn silence (ms)."
+        None, "--min-turn-silence", help="Min silence to end a turn (ms)."
     ),
     max_turn_silence: int | None = typer.Option(
-        None, "--max-turn-silence", help="Max turn silence (ms)."
+        None, "--max-turn-silence", help="Max silence before ending a turn (ms)."
     ),
     vad_threshold: float | None = typer.Option(
         None, "--vad-threshold", help="Voice-activity threshold."
@@ -99,7 +101,9 @@ def stream(
     ),
     speaker_labels: bool | None = typer.Option(None, "--speaker-labels", help="Label speakers."),
     max_speakers: int | None = typer.Option(None, "--max-speakers", help="Max speakers."),
-    voice_focus: str | None = typer.Option(None, "--voice-focus", help="near_field or far_field."),
+    voice_focus: str | None = typer.Option(
+        None, "--voice-focus", help="Voice focus: near_field or far_field."
+    ),
     voice_focus_threshold: float | None = typer.Option(
         None, "--voice-focus-threshold", help="Voice-focus threshold."
     ),
@@ -108,7 +112,7 @@ def stream(
         None, "--redact-pii-policy", help="Comma-separated PII policies."
     ),
     redact_pii_sub: str | None = typer.Option(
-        None, "--redact-pii-sub", help="hash or entity_name."
+        None, "--redact-pii-sub", help="Replace redacted PII with: hash or entity_name."
     ),
     inactivity_timeout: int | None = typer.Option(
         None, "--inactivity-timeout", help="Auto-close after N seconds idle."
@@ -125,7 +129,9 @@ def stream(
         None, "--config-file", help="JSON file of streaming fields."
     ),
     # existing
-    prompt: str | None = typer.Option(None, "--prompt", help="Bias the speech model (u3-pro)."),
+    prompt: str | None = typer.Option(
+        None, "--prompt", help="Prompt to bias the speech model (u3-pro)."
+    ),
     llm_prompt: list[str] | None = typer.Option(
         None,
         "--llm",
@@ -150,8 +156,9 @@ def stream(
 ) -> None:
     """Transcribe live audio in real time — from your mic, a file, or a URL.
 
-    --prompt biases the speech model. --llm-gateway-prompt transforms the full
-    transcript through LLM Gateway once the stream ends (e.g. "summarize the call").
+    --prompt biases the speech model. --llm runs a prompt over the live transcript
+    through LLM Gateway, refreshing the answer on every finalized turn (e.g.
+    "summarize action items").
     """
 
     def body(state: AppState, json_mode: bool) -> None:

aai_cli/commands/transcribe.py

@@ -82,7 +82,7 @@ def transcribe(
     sample: bool = typer.Option(False, "--sample", help="Use the hosted wildfires.mp3 sample."),
     # model & language
     speech_model: str | None = typer.Option(
-        None, "--speech-model", help="best, nano, slam-1, universal."
+        None, "--speech-model", help="Speech model: best, nano, slam-1, or universal."
     ),
     language_code: str | None = typer.Option(
         None, "--language-code", help="Force a language (e.g. en_us)."
@@ -96,22 +96,26 @@ def transcribe(
     temperature: float | None = typer.Option(
         None, "--temperature", help="Speech model temperature."
     ),
-    prompt: str | None = typer.Option(None, "--prompt", help="Bias the speech model (u3-pro)."),
+    prompt: str | None = typer.Option(
+        None, "--prompt", help="Prompt to bias the speech model (u3-pro)."
+    ),
     # formatting
     punctuate: bool | None = typer.Option(
         None, "--punctuate/--no-punctuate", help="Add punctuation."
     ),
     format_text: bool | None = typer.Option(
-        None, "--format-text/--no-format-text", help="Format text."
+        None, "--format-text/--no-format-text", help="Apply text formatting (casing, numbers)."
+    ),
+    disfluencies: bool | None = typer.Option(
+        None, "--disfluencies", help="Keep filler words (e.g. um, uh)."
     ),
-    disfluencies: bool | None = typer.Option(None, "--disfluencies", help="Keep filler words."),
     # speakers & channels
     speaker_labels: bool = typer.Option(False, "--speaker-labels", help="Enable diarization."),
     speakers_expected: int | None = typer.Option(
         None, "--speakers-expected", help="Hint speaker count."
     ),
     multichannel: bool | None = typer.Option(
-        None, "--multichannel", help="Transcribe each channel."
+        None, "--multichannel", help="Transcribe each audio channel separately."
     ),
     # guardrails
     redact_pii: bool | None = typer.Option(
@@ -121,7 +125,7 @@ def transcribe(
         None, "--redact-pii-policy", help="Comma-separated PII policies (e.g. person_name,...)."
     ),
     redact_pii_sub: str | None = typer.Option(
-        None, "--redact-pii-sub", help="Substitution: hash or entity_name."
+        None, "--redact-pii-sub", help="Replace redacted PII with: hash or entity_name."
     ),
     redact_pii_audio: bool | None = typer.Option(
         None, "--redact-pii-audio", help="Also redact audio."
@@ -133,20 +137,20 @@ def transcribe(
         None, "--content-safety", help="Detect sensitive content."
     ),
     content_safety_confidence: int | None = typer.Option(
-        None, "--content-safety-confidence", help="Confidence threshold 25-100."
+        None, "--content-safety-confidence", help="Content-safety confidence threshold (25-100)."
     ),
     speech_threshold: float | None = typer.Option(
-        None, "--speech-threshold", help="Minimum speech proportion 0-1."
+        None, "--speech-threshold", help="Minimum proportion of speech required (0-1)."
     ),
     # analysis
     summarization: bool | None = typer.Option(
         None, "--summarization", help="Summarize the transcript."
     ),
     summary_model: str | None = typer.Option(
-        None, "--summary-model", help="informative/conversational/catchy."
+        None, "--summary-model", help="Summary model: informative, conversational, or catchy."
     ),
     summary_type: str | None = typer.Option(
-        None, "--summary-type", help="bullets/gist/headline/paragraph."
+        None, "--summary-type", help="Summary format: bullets, gist, headline, or paragraph."
     ),
     auto_chapters: bool | None = typer.Option(None, "--auto-chapters", help="Generate chapters."),
     sentiment_analysis: bool | None = typer.Option(

aai_cli/commands/transcripts.py

@@ -76,7 +76,7 @@ def body(state: AppState, json_mode: bool) -> None:
         rows = client.list_transcripts(api_key, limit=limit)
 
         def render(data: list[dict[str, object]]) -> Table:
-            table = Table("id", "status", "created", header_style="aai.heading")
+            table = output.data_table("id", "status", "created")
             for row in data:
                 status = str(row["status"])
                 table.add_row(

aai_cli/output.py

@@ -6,7 +6,9 @@
 from collections.abc import Callable
 from typing import TYPE_CHECKING
 
+from rich import box
 from rich.markup import escape
+from rich.table import Table
 
 from aai_cli import theme
 from aai_cli.errors import UsageError
@@ -90,6 +92,31 @@ def heading(text: str) -> str:
     return f"[aai.heading]{text}[/aai.heading]"
 
 
+def data_table(*columns: str) -> Table:
+    """A list table with the one consistent, minimal look used CLI-wide.
+
+    Headers render in the brand heading style with a single rule beneath them and
+    no surrounding box — the quiet, scannable style the Vercel/Supabase CLIs use.
+    Defined once here so every listing command (`transcripts list`, `keys list`,
+    `sessions list`, `usage`, `limits`, `audit`) shares the same table, rather than
+    each re-deriving Rich's heavy default box.
+    """
+    return Table(*columns, box=box.SIMPLE_HEAD, header_style="aai.heading", pad_edge=False)
+
+
+def detail_table() -> Table:
+    """A borderless label/value grid for single-record views (`whoami`, `sessions get`).
+
+    The label column is muted so the values read as the content and the pair scans
+    as a definition list, not a boxed table. Centralizes what was two divergent
+    one-off tables into one look.
+    """
+    table = Table.grid(padding=(0, 3))
+    table.add_column(style="aai.muted")
+    table.add_column()
+    return table
+
+
 def emit[T](data: T, human_renderer: Callable[[T], object], *, json_mode: bool) -> None:
     if json_mode:
         print(json.dumps(data, default=str))