shellmate-cli 3.0.1__py3-none-any.whl → 3.0.2__py3-none-any.whl

shellmate/adapters/ble_adapter.sh

@@ -107,6 +107,8 @@ print(json.dumps({
     suggested_fix=$(python3 -c "import sys,json; d=json.loads(sys.argv[1]); print(d.get('suggested_fix',''))" "$raw" 2>/dev/null)
     severity=$(python3 -c "import sys,json; d=json.loads(sys.argv[1]); print(d.get('severity','MEDIUM'))" "$raw" 2>/dev/null)
 
+    # Color scheme mirrors shellmate/ui/colors.py: caution=91 red, warning=93
+    # yellow, suggestion/safe=92 green.
     local color="\e[93m"
     [[ "$severity" == "HIGH" || "$severity" == "CRITICAL" || "$severity" == "blocking" ]] && color="\e[91m"
     [[ "$severity" == "SAFE" || "$severity" == "LOW" ]] && color="\e[92m"
@@ -114,7 +116,8 @@ print(json.dumps({
     local line1 line2 line3=""
     line1="${color}  → ${what_happens}\e[m"
     line2="${color}  → Reversible: ${reversible}  |  ${scope}\e[m"
-    [[ -n "$suggested_fix" ]] && line3="\e[90m  → Safe alt: ${suggested_fix}\e[m"
+    # A suggested fix is a suggestion -> green (92), not dim.
+    [[ -n "$suggested_fix" ]] && line3="\e[92m  → Safe alt: ${suggested_fix}\e[m"
 
     # Gate HIGH/CRITICAL on second Enter
     if [[ "$severity" == "HIGH" || "$severity" == "CRITICAL" || "$severity" == "blocking" ]]; then
@@ -328,10 +331,11 @@ print('\n'.join(get_completions(sys.argv[1])))
       _SHELLMATE_TAB_CMD="$first"
       _SHELLMATE_TAB_STATE="suggested"
       local suffix="${first#$line}"
+      # Autocomplete ghost-text is a suggestion -> green (92), per shellmate/ui/colors.py.
       if [[ -n "$suffix" ]] && type ble/canvas/put.draw &>/dev/null; then
-        ble/canvas/put.draw "\e[90m${suffix}\e[m"
+        ble/canvas/put.draw "\e[92m${suffix}\e[m"
       elif [[ -n "$suffix" ]]; then
-        printf '\e[90m%s\e[m' "$suffix" >/dev/tty
+        printf '\e[92m%s\e[m' "$suffix" >/dev/tty
         printf '\e[%dD' "${#suffix}" >/dev/tty
       fi
     fi

shellmate/adapters/powershell_adapter.ps1

@@ -70,11 +70,13 @@ function Show-ShellMateConsequence {
              elseif ($Severity -in @("SAFE","LOW")) { "${ESC}[92m" } `
              else { "${ESC}[93m" }
     $reset = "${ESC}[0m"
-    $dim   = "${ESC}[90m"
+    # Color scheme mirrors shellmate/ui/colors.py: caution=91 red, warning=93
+    # yellow, suggestion/safe=92 green. A suggested fix is a suggestion -> green.
+    $green = "${ESC}[92m"
 
     $line1 = "${color}  -> ${WhatHappens}${reset}"
     $line2 = "${color}  -> Reversible: ${Reversible}  |  ${Scope}${reset}"
-    $line3 = if ($SuggestedFix) { "${dim}  -> Safe alt: ${SuggestedFix}${reset}" } else { "" }
+    $line3 = if ($SuggestedFix) { "${green}  -> Safe alt: ${SuggestedFix}${reset}" } else { "" }
 
     # Save cursor, write 3 lines below prompt, restore
     [Console]::Write("${ESC}[s")
@@ -368,7 +370,9 @@ if (-not $script:ShellMatePredictorRegistered) {
                     $ESC = [char]27
                     $suffix = ([string]$suggestion).Substring([Math]::Min($prefix.Length, ([string]$suggestion).Length))
                     if ($suffix) {
-                        [Console]::Write("${ESC}[90m${suffix}${ESC}[0m")
+                        # Autocomplete ghost-text is a suggestion -> green (92),
+                        # matching shellmate/ui/colors.py.
+                        [Console]::Write("${ESC}[92m${suffix}${ESC}[0m")
                         [Console]::Write("${ESC}[$($suffix.Length)D")
                     }
                     return

shellmate/adapters/powershell_predictor.ps1

@@ -89,6 +89,9 @@ if ($py -and (Test-Path $client)) {
             $predictor
         )
         Set-PSReadLineOption -PredictionSource Plugin -PredictionViewStyle InlineView -ErrorAction SilentlyContinue
+        # Render predictions green — they are suggestions (mirrors shellmate/ui/colors.py).
+        $smEsc = [char]27
+        Set-PSReadLineOption -Colors @{ InlinePrediction = "${smEsc}[92m" } -ErrorAction SilentlyContinue
         $script:ShellMatePredictorRegistered = $true
     } catch {
         Write-Verbose "ShellMate: predictor registration failed: $_"

shellmate/cli/version.py

@@ -1 +1 @@
-VERSION = "3.0.1"
+VERSION = "3.0.2"

shellmate/ui/annotations.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Any, Dict, Optional
 
+from shellmate.ui import colors
+
 # Emoji mappings for risk levels (short inline / Unix terminals)
 RISK_ICONS = {
     "SAFE": "✅",
@@ -105,6 +107,7 @@ def format_consequence_annotation(
     risk: str = "MEDIUM",
     *,
     ascii_safe: bool = False,
+    color: bool = False,
 ) -> str:
     """Format annotation using structured consequence preview + badges."""
     env_context = env_context or {}
@@ -137,7 +140,12 @@ def format_consequence_annotation(
     if not consequence.get("reversible", True):
         parts.append("[IRREVERSIBLE]")
 
-    return " ".join(parts) if len(parts) > 1 else ""
+    if len(parts) <= 1:
+        return ""
+    text = " ".join(parts)
+    # Consequence severity ("blocking"/"warning"/"info") or risk level both map
+    # through SEVERITY_ROLE -> caution=red / warning=yellow / safe=green.
+    return colors.by_severity(text, severity if severity in colors.SEVERITY_ROLE else risk) if color else text
 
 
 def format_legacy_pipeline_annotation(
@@ -146,6 +154,7 @@ def format_legacy_pipeline_annotation(
     chain_patterns: Optional[Dict[str, Any]] = None,
     *,
     ascii_safe: bool = False,
+    color: bool = False,
 ) -> str:
     """Format annotation from pipeline result without consequence_preview."""
     env_context = env_context or {}
@@ -186,7 +195,10 @@ def format_legacy_pipeline_annotation(
             msg = msg[:37] + "..."
         parts.append(msg)
 
-    return " ".join(parts) if len(parts) > 1 else ""
+    if len(parts) <= 1:
+        return ""
+    text = " ".join(parts)
+    return colors.by_severity(text, risk) if color else text
 
 
 def format_pipeline_annotation(
@@ -195,6 +207,7 @@ def format_pipeline_annotation(
     chain_patterns: Optional[Dict[str, Any]] = None,
     *,
     ascii_safe: bool = False,
+    color: bool = False,
 ) -> str:
     """Prefer consequence_preview; fall back to legacy pipeline formatting."""
     consequence = risk_result.get("consequence_preview") or {}
@@ -205,13 +218,16 @@ def format_pipeline_annotation(
             chain_patterns,
             risk_result.get("risk", "MEDIUM"),
             ascii_safe=ascii_safe,
+            color=color,
         )
     return format_legacy_pipeline_annotation(
-        risk_result, env_context, chain_patterns, ascii_safe=ascii_safe
+        risk_result, env_context, chain_patterns, ascii_safe=ascii_safe, color=color
     )
 
 
-def format_cached_annotation(cached_result: Dict[str, Any], *, ascii_safe: bool = False) -> str:
+def format_cached_annotation(
+    cached_result: Dict[str, Any], *, ascii_safe: bool = False, color: bool = False
+) -> str:
     """Format a simple annotation from a cache hit payload."""
     msg = cached_result.get("explanation", "") or ""
     risk = cached_result.get("risk", "MEDIUM")
@@ -229,4 +245,7 @@ def format_cached_annotation(cached_result: Dict[str, Any], *, ascii_safe: bool
 
     if len(msg) > 50:
         msg = msg[:47] + "..."
-    return f"{icon} {msg}" if msg else ""
+    if not msg:
+        return ""
+    text = f"{icon} {msg}"
+    return colors.by_severity(text, risk) if color else text

shellmate/ui/colors.py

@@ -0,0 +1,109 @@
+"""Semantic terminal colors for suggestions and cautions.
+
+Single source of truth for ShellMate's inline color scheme so every surface
+agrees on what red / yellow / green mean:
+
+    caution     -> red     (dangerous: HIGH / CRITICAL / blocking)
+    warning     -> yellow  (proceed with care: MEDIUM)
+    suggestion  -> green    (a safer alternative / "Safe alt")
+    safe        -> green    (SAFE / LOW — nothing to worry about)
+    info        -> cyan     (neutral information)
+    dim         -> grey     (de-emphasized)
+
+The shell adapters (``powershell_adapter.ps1`` / ``ble_adapter.sh``) mirror these
+SGR codes directly since they render ANSI themselves; keep them in sync with
+``ROLE_SGR`` below. Python-side rendering should use this module.
+
+Honors the https://no-color.org convention: if the ``NO_COLOR`` environment
+variable is set (to anything), colorizing becomes a no-op.
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Optional
+
+ESC = "\033"
+RESET = f"{ESC}[0m"
+
+# Role -> SGR (Select Graphic Rendition) code. Bright variants read well on both
+# dark and light terminals. Mirror these in the shell adapters.
+ROLE_SGR = {
+    "caution": 91,     # bright red
+    "warning": 93,     # bright yellow
+    "suggestion": 92,  # bright green
+    "safe": 92,        # bright green
+    "info": 96,        # bright cyan
+    "dim": 90,         # grey
+}
+
+# Role -> rich style name, for Console/Text rendering in the CLI scenes.
+ROLE_RICH = {
+    "caution": "bold red",
+    "warning": "yellow",
+    "suggestion": "green",
+    "safe": "green",
+    "info": "cyan",
+    "dim": "bright_black",
+}
+
+# Risk/severity label -> semantic role.
+SEVERITY_ROLE = {
+    "CRITICAL": "caution",
+    "HIGH": "caution",
+    "blocking": "caution",
+    "MEDIUM": "warning",
+    "warning": "warning",
+    "LOW": "safe",
+    "SAFE": "safe",
+    "info": "info",
+}
+
+
+def color_enabled(no_color: Optional[bool] = None) -> bool:
+    """Whether color should be emitted.
+
+    Explicit ``no_color`` wins; otherwise honor the ``NO_COLOR`` env var.
+    """
+    if no_color is not None:
+        return not no_color
+    return os.environ.get("NO_COLOR") is None
+
+
+def role_for_severity(severity: Optional[str]) -> str:
+    """Map a risk/severity label to a semantic role (defaults to ``warning``)."""
+    return SEVERITY_ROLE.get(severity or "", "warning")
+
+
+def colorize(text: str, role: str, *, no_color: Optional[bool] = None) -> str:
+    """Wrap ``text`` in the ANSI color for ``role``.
+
+    Returns ``text`` unchanged when color is disabled, the text is empty, or the
+    role is unknown — so it is always safe to call.
+    """
+    if not text or not color_enabled(no_color):
+        return text
+    sgr = ROLE_SGR.get(role)
+    if sgr is None:
+        return text
+    return f"{ESC}[{sgr}m{text}{RESET}"
+
+
+def caution(text: str, *, no_color: Optional[bool] = None) -> str:
+    """Red — a dangerous command or consequence."""
+    return colorize(text, "caution", no_color=no_color)
+
+
+def warning(text: str, *, no_color: Optional[bool] = None) -> str:
+    """Yellow — proceed with care."""
+    return colorize(text, "warning", no_color=no_color)
+
+
+def suggestion(text: str, *, no_color: Optional[bool] = None) -> str:
+    """Green — a safer alternative to offer."""
+    return colorize(text, "suggestion", no_color=no_color)
+
+
+def by_severity(text: str, severity: Optional[str], *, no_color: Optional[bool] = None) -> str:
+    """Colorize ``text`` using the role implied by a risk/severity label."""
+    return colorize(text, role_for_severity(severity), no_color=no_color)

{shellmate_cli-3.0.1.dist-info → shellmate_cli-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shellmate-cli
-Version: 3.0.1
+Version: 3.0.2
 Summary: Intelligent shell autocomplete with consequence preview
 Author: ShellMate Contributors
 License: MIT
@@ -39,7 +39,7 @@ Requires-Dist: pywinpty>=2.0.0; sys_platform == "win32" and extra == "windows-te
 Requires-Dist: pyte>=0.8.1; extra == "windows-test"
 Dynamic: license-file
 
-# 🐢 ShellMate
+# ShellMate
 
 **A friendly safety net for your terminal.**
 
@@ -67,22 +67,22 @@ $ git push --force
 
 ---
 
-## ✨ Why you'll like it
+## Why you'll like it
 
-- 🛑 **Stops the scary stuff.** Genuinely dangerous commands (like `rm -rf /`) are
+- **Stops the scary stuff.** Genuinely dangerous commands (like `rm -rf /`) are
   caught instantly and ask you to confirm before they run.
-- 💬 **Explains commands in plain English.** No more guessing what a command does —
+- **Explains commands in plain English.** No more guessing what a command does —
   ShellMate tells you what will happen and whether you can undo it.
-- 🧭 **Suggests safer alternatives.** When there's a gentler way to do the same thing,
+- **Suggests safer alternatives.** When there's a gentler way to do the same thing,
   it offers it.
-- ⌨️ **Autocomplete that helps you learn.** Press Tab for suggestions as you type.
-- 🙌 **Stays out of your way.** Safe commands run normally — no pop-ups, no nagging.
-- 🔒 **You stay in control.** ShellMate only *shows* you things. It never executes
+- **Autocomplete that helps you learn.** Press Tab for suggestions as you type.
+- **Stays out of your way.** Safe commands run normally — no pop-ups, no nagging.
+- **You stay in control.** ShellMate only *shows* you things. It never executes
   commands on its own.
 
 ---
 
-## 🚀 Get started in 3 steps
+## Get started in 3 steps
 
 ### 1. Install it
 
@@ -112,7 +112,7 @@ sm enable     # starts the helper in the background
 ```
 
 Now just **use your terminal normally.** Little notes will appear under your
-commands as you type. 🎉
+commands as you type.
 
 > **What you need:** Python 3.10+, and either **Windows PowerShell** or, on
 > **Linux/WSL**, [ble.sh](https://github.com/akinomyoga/ble.sh). ShellMate sets up
@@ -120,7 +120,7 @@ commands as you type. 🎉
 
 ---
 
-## 👀 What it feels like to use
+## What it feels like to use
 
 As you type, ShellMate shows a tiny note under your command:
 
@@ -139,7 +139,7 @@ many people from a bad day.
 
 ---
 
-## 🧰 Everyday commands
+## Everyday commands
 
 These are the only commands you need day to day:
 
@@ -154,7 +154,7 @@ These are the only commands you need day to day:
 
 ---
 
-## 🔒 A note on your privacy
+## A note on your privacy
 
 Being honest about how it works:
 
@@ -168,7 +168,7 @@ Being honest about how it works:
 
 ---
 
-## 🆘 Troubleshooting
+## Troubleshooting
 
 - **"I don't see any notes."** Run `sm status` to confirm the daemon is running, and
   make sure you ran `sm enable`. On a brand-new install, open a fresh terminal so the
@@ -182,7 +182,7 @@ Being honest about how it works:
 ---
 
 <details>
-<summary>🔧 <b>Under the hood</b> (for the curious / power users)</summary>
+<summary><b>Under the hood</b> (for the curious / power users)</summary>
 
 ### How it works
 

{shellmate_cli-3.0.1.dist-info → shellmate_cli-3.0.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 shellmate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shellmate/adapters/__init__.py,sha256=4gnk5hxRGFfKS9NM0oHVFPczZe7wK-4pu7pVHDlhqWc,2292
 shellmate/adapters/bash_adapter.sh,sha256=8n7DeBS_vy1_dwTmulY3wvsqhUEMYNy8Huz4gUh771M,312
-shellmate/adapters/ble_adapter.sh,sha256=tBgsJmVDbFfIKtxwB8bx32W0lh1ybWEPxySTr09TLjk,11268
-shellmate/adapters/powershell_adapter.ps1,sha256=4ngc0fFWfa46b5sOB5CPYzX5iPmMoAiect5KtPPmkzE,15782
-shellmate/adapters/powershell_predictor.ps1,sha256=W3NAsqYI0gOQ-qyMAgplfgTz0VxpsWBf4MTNTHh1zWU,4136
+shellmate/adapters/ble_adapter.sh,sha256=yAVdAYOV3e7HNiqXtmRCg3nJCt2TkrrHsddPAQY3eDo,11539
+shellmate/adapters/powershell_adapter.ps1,sha256=XfLWswjYOFbSY86rXHKtWLFIn1NM8cTiMxEIbZVWJ9U,16084
+shellmate/adapters/powershell_predictor.ps1,sha256=C52Ds-2seMGd_jWjazOaaoHO6YdhnH3Qk1OzTVKPDHI,4362
 shellmate/adapters/zsh_adapter.zsh,sha256=NBqP4d0JxkjlyAbRt95JqNe99o3YSHcT18R_nX2qeVg,342
 shellmate/agents/__init__.py,sha256=L1p1AT5XqnijplQv23G4OrzyAGlGTGfVX4StsNj_6Cc,515
 shellmate/agents/base.py,sha256=vfwvln6P2_qk054udxf0jGE921mMOxZJh0OjBYCH4JA,8140
@@ -20,7 +20,7 @@ shellmate/cache/semantic_cache.py,sha256=d9Je0gRFW1ASau8xemGBbbJfxk08C3QkIl_HtCI
 shellmate/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shellmate/cli/main.py,sha256=_gljAQLkDgYgukkyYNVjjow7d-FIOtWbFufnFhsNr7A,3815
 shellmate/cli/parser.py,sha256=Lh3mo6aHwn6ISmXoFKMfROF--tSe7Rpig_3rpjTGgi0,5747
-shellmate/cli/version.py,sha256=yK7aOUt_pFy8YQaEzXO6v5ZbKRSr9eAB9NpoD7gEyk4,18
+shellmate/cli/version.py,sha256=obmd3VOGkno3g89HIX3XZWI2xsdprkRqSyf-ntBilNg,18
 shellmate/cli/commands/__init__.py,sha256=MFJrPc6Yrhe6eFxTAJI8dnOnqUdILoh3JnBRCevVOwU,1032
 shellmate/cli/commands/analyze.py,sha256=t5BxxGBrPizJvgsbrvOpsF327DxgunoN7QefaBXIc3k,270
 shellmate/cli/commands/config.py,sha256=DI22jVKEwaFLqQIA3ps-ZFRz6lNML_DYBWBtyh70ISA,10168
@@ -84,8 +84,9 @@ shellmate/sanitizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 shellmate/sanitizer/typo_detector.py,sha256=ZBhOzB7ZSv4hctbu60tu_iBMjcBIP4TLjQ20aoCLVVQ,2957
 shellmate/ui/__init__.py,sha256=i8MvY7xFXCg9WRXFJcny3iiNBUnHoNW8U82t4tjqSrs,252
 shellmate/ui/analysis.py,sha256=U5WrGXSrBfR2Q_xOZ_nxi6frouTU6CrmHu-t7afLpmc,5905
-shellmate/ui/annotations.py,sha256=ztf3PlPcCeainX4Hi7qQW30pJ9T1zY5aaxC6IlyHwoI,6914
+shellmate/ui/annotations.py,sha256=1qp2zhD6bmRKG2TtSVvS7KaG5U0ZZ9TMOLvWYoCwAy8,7525
 shellmate/ui/banner.py,sha256=gOT8hYnO6pRqPW_tWx5KPInw9TOcByLthdmKz8uneaI,1752
+shellmate/ui/colors.py,sha256=1qzvODW1rpAlkH_02HgCbh5WY_hGOycJsMQydeQXzx4,3576
 shellmate/ui/progress.py,sha256=5rLtBR4VM9CUs7phTz6VJqVSIou0hGTk9YDRE-E0nvc,4020
 shellmate/ui/status.py,sha256=EmsWCd5R_h-rQ9nApBBUFPhhZurfKoXY3_te4h7LIJo,134
 shellmate/ui/runtime/__init__.py,sha256=G2tRJWagzRJSUYRVmyb0cBVxPr5XKwoXibVmSdXkA4Y,448
@@ -98,9 +99,9 @@ shellmate/ui/scenes/enable.py,sha256=wrKSyGg_aSU3anvCAMPQOBq9E13KDCtQT3GRDbCSalA
 shellmate/ui/scenes/help.py,sha256=ozg_JosfzpA4cNCSWHazETiRuU9gPO_-Y04arYmgUUU,1904
 shellmate/ui/scenes/stages.py,sha256=pK396uMatWxJm_XbWCJTWsvx7W6Sx0s7G95S3ec1ffQ,4048
 shellmate/ui/scenes/status.py,sha256=nC-wAC8cdE3UC2QXeK9zD8fOAMpdLogHK67h74a9Nek,6427
-shellmate_cli-3.0.1.dist-info/licenses/LICENSE,sha256=_eDrSi0nYhgVjipoIJoiUEdbARagURo6nVbTGBzqvD4,1079
-shellmate_cli-3.0.1.dist-info/METADATA,sha256=JtwRoRNQqImeJ2s4t-7YykXCwrpEFPwxkv7w2LDiklM,11864
-shellmate_cli-3.0.1.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-shellmate_cli-3.0.1.dist-info/entry_points.txt,sha256=lBMog9g17_P4iSXr6Akfg_QTVzswLWXUeGnuq66Wwhw,83
-shellmate_cli-3.0.1.dist-info/top_level.txt,sha256=0htuoy1ZSdVSt_0l2mO-mPPvSp2veo6dbr3h0K_AmIw,10
-shellmate_cli-3.0.1.dist-info/RECORD,,
+shellmate_cli-3.0.2.dist-info/licenses/LICENSE,sha256=_eDrSi0nYhgVjipoIJoiUEdbARagURo6nVbTGBzqvD4,1079
+shellmate_cli-3.0.2.dist-info/METADATA,sha256=AXJSeTRRhxe3wCX6cqNS5uc7fJAQl8PKi5Pr86w9BRA,11788
+shellmate_cli-3.0.2.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+shellmate_cli-3.0.2.dist-info/entry_points.txt,sha256=lBMog9g17_P4iSXr6Akfg_QTVzswLWXUeGnuq66Wwhw,83
+shellmate_cli-3.0.2.dist-info/top_level.txt,sha256=0htuoy1ZSdVSt_0l2mO-mPPvSp2veo6dbr3h0K_AmIw,10
+shellmate_cli-3.0.2.dist-info/RECORD,,