vulnctl 0.2.1__tar.gz → 0.2.2__tar.gz

{vulnctl-0.2.1 → vulnctl-0.2.2}/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.2] - 2026-08-01
+
+### Fixed
+
+- **Root help type column now matches Typer's own spelling.** The generated
+  "Options by command" panel derived its type column itself (`PATH`, `TEXT`),
+  which disagreed with the per-command panels on Typer 0.27+ — what a fresh
+  `pipx install vulnctl` resolves — where Typer prints `<path>`, `<str>`. It
+  now delegates to Click's metavar, so both spellings track the installed
+  version. Arguments drop the column entirely: their metavar already names
+  what they take.
+
 ## [0.2.1] - 2026-08-01
 
 ### Added
@@ -130,7 +142,8 @@ that produced it.
   sign with keyless cosign (OIDC), and publish to PyPI via trusted publishing
   (no stored token).
 
-[Unreleased]: https://github.com/NokiGuard/vulnctl/compare/v0.2.1...HEAD
+[Unreleased]: https://github.com/NokiGuard/vulnctl/compare/v0.2.2...HEAD
+[0.2.2]: https://github.com/NokiGuard/vulnctl/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/NokiGuard/vulnctl/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/NokiGuard/vulnctl/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/NokiGuard/vulnctl/releases/tag/v0.1.0

{vulnctl-0.2.1 → vulnctl-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vulnctl
-Version: 0.2.1
+Version: 0.2.2
 Summary: CLI-first vulnerability prioritization: auditable SSVC verdicts from fused threat intelligence
 Project-URL: Homepage, https://github.com/NokiGuard/vulnctl
 Author: Brian Truong

{vulnctl-0.2.1 → vulnctl-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vulnctl"
-version = "0.2.1"
+version = "0.2.2"
 description = "CLI-first vulnerability prioritization: auditable SSVC verdicts from fused threat intelligence"
 readme = "README.md"
 license = "Apache-2.0"

{vulnctl-0.2.1 → vulnctl-0.2.2}/src/vulnctl/cli_help.py

@@ -57,21 +57,18 @@ _EXAMPLES: tuple[tuple[str, str], ...] = (
 )
 
 
-def _value_hint(param: Any) -> str:
-    """Render what an option takes: ``PATH``, ``[a|b]``, or "" for a switch."""
-    if getattr(param, "is_flag", False):
-        return ""
-    if param.metavar:
-        return str(param.metavar)
-    choices = getattr(param.type, "choices", None)
-    if choices:
-        return "[" + "|".join(str(choice) for choice in choices) + "]"
-    return str(param.type.name).upper()
+def _metavar(param: Any, ctx: Any) -> str:
+    """What a parameter takes, spelled the way Typer's own help spells it.
 
-
-def _arg_name(param: Any) -> str:
-    """The metavar an argument is documented under, e.g. ``[VULN_ID...]``."""
-    return str(param.metavar or str(param.name).upper())
+    Delegates to Click rather than deriving it, so the appended panel agrees
+    with the per-command panels on whatever version is installed — Typer 0.26
+    renders ``PATH``, 0.27 renders ``<path>``. Click gained the ``ctx``
+    argument in 8.2; older versions take none.
+    """
+    try:
+        return str(param.make_metavar(ctx=ctx))
+    except TypeError:
+        return str(param.make_metavar())
 
 
 def _visible_params(cmd: Any, kind: str) -> list[Any]:
@@ -82,28 +79,30 @@ def _visible_params(cmd: Any, kind: str) -> list[Any]:
     ]
 
 
-def _usage(path: str, cmd: Any) -> str:
+def _usage(path: str, cmd: Any, ctx: Any) -> str:
     """The one-line invocation shape, e.g. ``vulnctl enrich [OPTIONS] [VULN_ID...]``."""
     parts = [path]
     if _visible_params(cmd, "option"):
         parts.append("[OPTIONS]")
-    parts.extend(_arg_name(param) for param in _visible_params(cmd, "argument"))
+    parts.extend(_metavar(param, ctx) for param in _visible_params(cmd, "argument"))
     return " ".join(parts)
 
 
-def _param_rows(cmd: Any) -> Iterator[tuple[Text, Text, str]]:
+def _param_rows(cmd: Any, ctx: Any) -> Iterator[tuple[Text, Text, str]]:
     """Yield ``(name, value hint, help)`` for one command's arguments and options."""
     for param in _visible_params(cmd, "argument"):
+        # No type column: an argument's metavar already names what it takes.
         yield (
-            Text(f"  {_arg_name(param)}", style=_STYLE_OPTION),
-            Text(str(param.type.name).upper(), style=_STYLE_TYPES),
+            Text(f"  {_metavar(param, ctx)}", style=_STYLE_OPTION),
+            Text(""),
             str(getattr(param, "help", "") or ""),
         )
     for param in _visible_params(cmd, "option"):
         switch = bool(getattr(param, "is_flag", False))
+        hint = "" if switch else _metavar(param, ctx)
         yield (
             Text("  " + " ".join(param.opts), style=_STYLE_SWITCH if switch else _STYLE_OPTION),
-            Text(_value_hint(param), style=_STYLE_TYPES),
+            Text(hint, style=_STYLE_TYPES),
             str(getattr(param, "help", "") or ""),
         )
 
@@ -127,7 +126,7 @@ def _leaf_commands(group: Any, prefix: str) -> Iterator[tuple[str, str, Any]]:
             yield label, name, cmd
 
 
-def _flags_panel(group: Any, prog: str) -> Panel:
+def _flags_panel(group: Any, prog: str, ctx: Any) -> Panel:
     """Every command's parameters, generated from the registered Click objects."""
     table = Table(box=None, show_header=False, pad_edge=False, padding=(0, 1))
     table.add_column(no_wrap=True)  # command / flag
@@ -140,9 +139,9 @@ def _flags_panel(group: Any, prog: str) -> Panel:
         table.add_row(
             Text(label, style="bold"),
             "",
-            Text(_usage(f"{prog} {label}", cmd), style="dim"),
+            Text(_usage(f"{prog} {label}", cmd, ctx), style="dim"),
         )
-        for name, hint, help_text in _param_rows(cmd):
+        for name, hint, help_text in _param_rows(cmd, ctx):
             table.add_row(name, hint, help_text)
 
     return Panel(
@@ -178,7 +177,7 @@ class HelpfulGroup(TyperGroup):
         super().format_help(ctx, formatter)
         prog = str(ctx.find_root().info_name or "vulnctl")
         console = Console()
-        console.print(_flags_panel(self, prog))
+        console.print(_flags_panel(self, prog, ctx))
         console.print(_examples_panel())
         console.print(
             Padding(

{vulnctl-0.2.1 → vulnctl-0.2.2}/tests/test_cli.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json
+import re
 from importlib.metadata import version as pkg_version
 from pathlib import Path
 
@@ -77,6 +78,25 @@ def test_root_help_shows_usage_shapes_and_examples() -> None:
     assert "vulnctl COMMAND --help" in result.output  # pointer to per-command detail
 
 
+def test_root_help_type_column_matches_per_command_help() -> None:
+    # The type column is Click's own metavar, not a hand-derived one, so it
+    # tracks whatever spelling the installed Typer uses (0.26 prints `PATH`,
+    # 0.27 prints `<path>`) instead of disagreeing with the panels above it.
+    def plain(text: str) -> str:
+        return re.sub(r"\x1b\[[0-9;]*m", "", text)  # CI forces colour on Typer's console
+
+    def option_row(output: str) -> str:
+        # The flag also occurs inside other params' help text; take the row it
+        # heads, panel border and indent stripped.
+        rows = [ln.lstrip("│ ") for ln in plain(output).splitlines()]
+        (row,) = [ln for ln in rows if ln.startswith("--sbom")]
+        return row
+
+    metavar = option_row(runner.invoke(app, ["enrich", "--help"]).output).split()[1]
+    assert metavar.strip("<>").lower() == "path"
+    assert metavar in option_row(runner.invoke(app, ["--help"]).output)
+
+
 def test_help_examples_use_real_flags() -> None:
     """Worked examples rot silently; assert every flag in them still exists."""
     known = _subcommand_flags()

{vulnctl-0.2.1 → vulnctl-0.2.2}/uv.lock

@@ -1066,7 +1066,7 @@ wheels = [
 
 [[package]]
 name = "vulnctl"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },