Add smelt columns to status table

ctrueden · claude · ctrueden · commit 7b00f257248a · 2026-05-19T16:44:01.000-05:00
Co-authored-by: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/pombast/cli/_status.py b/src/pombast/cli/_status.py
@@ -19,6 +19,7 @@
 
 from pombast.config._settings import PombastConfig, parse_repo_spec
 from pombast.core._filter import ComponentFilter
+from pombast.core._smelt_json import load_smelt_components
 from pombast.maven._bom import load_bom
 from pombast.maven._rules import RulesXML
 from pombast.status._drift import drift_text
@@ -82,6 +83,13 @@
     default=None,
     help="Path to vetting timestamps file (G:A <space> YYYYMMDDHHmmss per line).",
 )
+@click.option(
+    "--smelt",
+    "smelt_path",
+    type=click.Path(exists=True, path_type=Path),
+    default=None,
+    help="Path to smelt.json to overlay binary/source compatibility columns.",
+)
 @click.option(
     "--no-timestamps",
     is_flag=True,
@@ -142,6 +150,7 @@ def status_cmd(
     projects: str | None,
     badges: str | None,
     timestamps: str | None,
+    smelt_path: Path | None,
     no_timestamps: bool,
     nexus_base: str | None,
     html_path: Path | None,
@@ -167,6 +176,7 @@ def status_cmd(
     effective_projects = projects or (str(sc.projects) if sc.projects else None)
     effective_badges = badges or (str(sc.badges) if sc.badges else None)
     effective_timestamps = timestamps or (str(sc.timestamps) if sc.timestamps else None)
+    effective_smelt = smelt_path or sc.smelt
     effective_html = html_path or sc.html
     effective_header = header or sc.header
     effective_footer = footer or sc.footer
@@ -200,6 +210,14 @@ def status_cmd(
         load_timestamps_file(effective_timestamps) if effective_timestamps else {}
     )
 
+    smelt_components: dict[str, dict] | None = None
+    if effective_smelt:
+        smelt_components = load_smelt_components(effective_smelt)
+        console.print(
+            f"Loaded smelt data: [bold]{len(smelt_components)}[/bold] components "
+            f"([cyan]{effective_smelt}[/cyan])"
+        )
+
     cf = ComponentFilter(includes=list(include), excludes=list(exclude))
     total = len(cf.filter(bom_data.components))
 
@@ -231,7 +249,7 @@ def status_cmd(
                 description=f"{entry.component.group}:{entry.component.name}",
             )
 
-    _print_status_table(entries)
+    _print_status_table(entries, smelt=smelt_components)
 
     cuts = sum(1 for e in entries if e.action == "Cut")
     bumps = sum(1 for e in entries if e.action == "Bump")
@@ -251,17 +269,49 @@ def status_cmd(
                 nexus_base=nexus_base or "",
                 header_html=header_html,
                 footer_html=footer_html,
+                smelt=smelt_components,
             )
         )
         console.print(f"HTML report written to: [cyan]{effective_html}[/cyan]")
 
 
-def _print_status_table(entries: list[StatusEntry]) -> None:
+def _smelt_cells(comp_data: dict | None, bom_version: str) -> tuple[str, str]:
+    """Return (binary_cell, source_cell) Rich markup for a smelt component entry."""
+    if comp_data is None:
+        return "[dim]—[/dim]", "[dim]—[/dim]"
+
+    mismatch = comp_data.get("version") not in (None, bom_version)
+    suffix = "[yellow]*[/yellow]" if mismatch else ""
+    skipped = comp_data.get("skipped_reason")
+
+    def _render(status: str | None) -> str:
+        if status == "pass":
+            return f"[green]pass[/green]{suffix}"
+        if status in ("fail", "error"):
+            return f"[red]{status}[/red]{suffix}"
+        if status == "skipped":
+            return f"[dim]skip[/dim]{suffix}"
+        if status is None and skipped == "prior success":
+            return f"[green]prior[/green]{suffix}"
+        if status is None and skipped:
+            return f"[dim]skip[/dim]{suffix}"
+        return f"[dim]—[/dim]{suffix}"
+
+    return _render(comp_data.get("binary_test")), _render(comp_data.get("source_build"))
+
+
+def _print_status_table(
+    entries: list[StatusEntry],
+    smelt: dict[str, dict] | None = None,
+) -> None:
     table = Table(title="BOM Status", show_lines=False)
     table.add_column("Component", style="cyan", no_wrap=True)
     table.add_column("Release", justify="right")
     table.add_column("Drift", justify="right")
     table.add_column("Action", justify="left")
+    if smelt is not None:
+        table.add_column("Binary", justify="center")
+        table.add_column("Source", justify="center")
 
     for e in entries:
         latest = e.latest_version or e.bom_version
@@ -281,11 +331,23 @@ def _print_status_table(entries: list[StatusEntry]) -> None:
             "Bump": "[yellow]Bump[/yellow]",
             "None": "[dim]—[/dim]",
         }[e.action]
-        table.add_row(
+        row: list[str] = [
             f"{e.component.group}:{e.component.name}",
             release_str,
             drift_cell,
             action_str,
-        )
+        ]
+        if smelt is not None:
+            ga = f"{e.component.group}:{e.component.name}"
+            binary_cell, source_cell = _smelt_cells(smelt.get(ga), e.bom_version)
+            row.extend([binary_cell, source_cell])
+        table.add_row(*row)
 
     console.print(table)
+
+    if smelt is not None and any(
+        smelt.get(f"{e.component.group}:{e.component.name}", {}).get("version") not in
+        (None, e.bom_version)
+        for e in entries
+    ):
+        console.print("[dim][yellow]*[/yellow] smelt result is from a different version[/dim]")
diff --git a/src/pombast/config/_settings.py b/src/pombast/config/_settings.py
@@ -43,6 +43,7 @@ class StatusConfig:
     projects: Path | None = None
     badges: Path | None = None
     timestamps: Path | None = None
+    smelt: Path | None = None
     html: Path | None = None
     header: Path | None = None
     footer: Path | None = None
@@ -109,6 +110,7 @@ def resolve(section: dict, key: str) -> Path | None:
             projects=resolve(status_data, "projects"),
             badges=resolve(status_data, "badges"),
             timestamps=resolve(status_data, "timestamps"),
+            smelt=resolve(status_data, "smelt"),
             html=resolve(status_data, "html"),
             header=resolve(status_data, "header"),
             footer=resolve(status_data, "footer"),
diff --git a/src/pombast/core/_smelt_json.py b/src/pombast/core/_smelt_json.py
@@ -93,3 +93,10 @@ def write_json(report: ValidationReport, path: Path) -> None:
     """Write report as pretty-printed JSON to path."""
     data = report_to_dict(report)
     path.write_text(json.dumps(data, indent=2, ensure_ascii=False) + "\n")
+
+
+def load_smelt_components(path: Path) -> dict[str, dict]:
+    """Load smelt.json, returning a mapping of G:A to per-component data."""
+    with open(path) as f:
+        data = json.load(f)
+    return data.get("components", {})
diff --git a/src/pombast/status/_html.py b/src/pombast/status/_html.py
@@ -13,7 +13,8 @@
     from pombast.status._entry import StatusEntry
 
 
-_COLUMNS = ["Artifact", "Release", "Drift", "Action", "Build"]
+_COLUMNS_BASE = ["Artifact", "Release", "Drift", "Action", "Build"]
+_COLUMNS_SMELT = ["Binary", "Source"]
 
 _env = Environment(
     loader=PackageLoader("pombast.status", "templates"),
@@ -79,14 +80,47 @@ def _drift_data(entry: StatusEntry) -> dict[str, Any]:
     }
 
 
-def _row_data(entry: StatusEntry, nexus_base: str) -> dict[str, Any]:
+def _smelt_cell_data(status: str | None, skipped_reason: str | None) -> dict[str, str]:
+    """Return {label, css} for a single smelt result cell."""
+    if status == "pass":
+        return {"label": "pass", "css": "smelt-pass"}
+    if status in ("fail", "error"):
+        return {"label": status, "css": "smelt-fail"}
+    if status == "skipped":
+        return {"label": "skip", "css": "smelt-skip"}
+    if status is None and skipped_reason == "prior success":
+        return {"label": "prior", "css": "smelt-pass"}
+    if status is None and skipped_reason:
+        return {"label": "skip", "css": "smelt-skip"}
+    return {"label": "—", "css": "smelt-none"}
+
+
+def _smelt_row_data(comp_data: dict | None, bom_version: str) -> dict[str, Any]:
+    """Build smelt columns data for a single row."""
+    if comp_data is None:
+        empty = {"label": "—", "css": "smelt-none"}
+        return {"binary": empty, "source": empty, "version_mismatch": False}
+    skipped = comp_data.get("skipped_reason")
+    mismatch = comp_data.get("version") not in (None, bom_version)
+    return {
+        "binary": _smelt_cell_data(comp_data.get("binary_test"), skipped),
+        "source": _smelt_cell_data(comp_data.get("source_build"), skipped),
+        "version_mismatch": mismatch,
+    }
+
+
+def _row_data(
+    entry: StatusEntry,
+    nexus_base: str,
+    smelt: dict[str, dict] | None = None,
+) -> dict[str, Any]:
     g = entry.component.group
     a = entry.component.name
     bom_v = entry.bom_version
     latest_v = entry.latest_version or bom_v
     action_key = {"Cut": 1, "Bump": 2, "None": 3}[entry.action]
 
-    return {
+    row: dict[str, Any] = {
         "ga": f"{g}:{a}",
         "group_css": _css_safe(g),
         "artifact_css": _css_safe(a),
@@ -103,6 +137,10 @@ def _row_data(entry: StatusEntry, nexus_base: str) -> dict[str, Any]:
         "action_key": action_key,
         "badge_html": entry.badge_html or "<td>-</td>",
     }
+    if smelt is not None:
+        comp_data = smelt.get(f"{g}:{a}")
+        row["smelt"] = _smelt_row_data(comp_data, bom_v)
+    return row
 
 
 def generate_html(
@@ -112,13 +150,15 @@ def generate_html(
     title: str = "SciJava software status",
     header_html: str = "",
     footer_html: str = "",
+    smelt: dict[str, dict] | None = None,
 ) -> str:
     """Return a complete HTML page with the status dashboard table."""
-    rows = [_row_data(entry, nexus_base) for entry in entries]
+    rows = [_row_data(entry, nexus_base, smelt=smelt) for entry in entries]
+    columns = _COLUMNS_BASE + (_COLUMNS_SMELT if smelt is not None else [])
     template = _env.get_template("status.html.j2")
     return template.render(
         title=title,
-        columns=_COLUMNS,
+        columns=columns,
         rows=rows,
         header_html=header_html,
         footer_html=footer_html,
diff --git a/src/pombast/status/templates/status.html.j2 b/src/pombast/status/templates/status.html.j2
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<meta charset="utf-8">
 <title>{{ title }}</title>
 <link type="text/css" rel="stylesheet" href="status.css">
 <link rel="icon" type="image/png" href="favicon.png">
@@ -36,6 +37,10 @@
 <td{% if row.drift.cls %} class="{{ row.drift.cls }}"{% endif %} sorttable_customkey="{{ row.drift.sort_key }}"{% if row.drift.tooltip %} title="{{ row.drift.tooltip }}"{% endif %}>{{ row.drift.html | safe }}</td>
 <td sorttable_customkey="{{ row.action_key }}">{{ row.action }}</td>
 {{ row.badge_html | safe }}
+{%- if row.smelt is defined %}
+<td class="{{ row.smelt.binary.css }}{% if row.smelt.version_mismatch %} smelt-stale{% endif %}">{{ row.smelt.binary.label }}</td>
+<td class="{{ row.smelt.source.css }}{% if row.smelt.version_mismatch %} smelt-stale{% endif %}">{{ row.smelt.source.label }}</td>
+{%- endif %}
 </tr>
 {%- endfor %}
 </table>
