cloudwright-ai-cli 1.5.0__tar.gz → 1.6.1__tar.gz

{cloudwright_ai_cli-1.5.0 → cloudwright_ai_cli-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudwright-ai-cli
-Version: 1.5.0
+Version: 1.6.1
 Summary: CLI for Cloudwright architecture intelligence
 Project-URL: Homepage, https://github.com/xmpuspus/cloudwright
 Project-URL: Repository, https://github.com/xmpuspus/cloudwright

cloudwright_ai_cli-1.6.1/cloudwright_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.6.1"

{cloudwright_ai_cli-1.5.0 → cloudwright_ai_cli-1.6.1}/cloudwright_cli/commands/compliance_cmd.py

@@ -28,12 +28,24 @@ def compliance_scan(
     ] = None,
     fail_on: Annotated[str, typer.Option("--fail-on", help="Fail on: critical, high, medium, none")] = "high",
     output: Annotated[str | None, typer.Option("--output", "-o", help="Write a markdown control report")] = None,
+    oscal: Annotated[
+        bool,
+        typer.Option("--oscal", "-O", help="Emit OSCAL 1.1.2 component-definition JSON alongside the scan"),
+    ] = False,
+    traceability: Annotated[
+        bool,
+        typer.Option("--traceability", help="Show the control traceability chain: component -> resource -> control"),
+    ] = False,
 ) -> None:
     """Scan an ArchSpec and map every finding to framework control IDs.
 
     Maps design-stage findings to HIPAA / SOC 2 / PCI-DSS / FedRAMP / GDPR /
     ISO 27001 / NIST 800-53 controls before any infrastructure exists. Folds in
     a Checkov deep scan against the exported Terraform when Checkov is on PATH.
+
+    Use --oscal / -O to also emit an OSCAL 1.1.2 component-definition document.
+    When --output is set the OSCAL JSON is written to <output>.oscal.json;
+    otherwise it is printed to stdout after the standard report.
     """
     try:
         from cloudwright import ArchSpec
@@ -46,12 +58,34 @@ def compliance_scan(
         if output:
             Path(output).write_text(render_markdown(spec, report))
 
+        if oscal:
+            import json as _json
+
+            from cloudwright.oscal import to_oscal
+
+            scanner = ComplianceScanner()
+            resolved_fws = scanner.resolve_frameworks(spec, fw_list or None)
+            oscal_doc = to_oscal(spec, report, resolved_fws)
+            oscal_text = _json.dumps(oscal_doc, indent=2)
+            if output:
+                oscal_path = str(output) + ".oscal.json"
+                Path(oscal_path).write_text(oscal_text)
+                if not is_json_mode(ctx):
+                    console.print(f"OSCAL document written to {oscal_path}", style="dim")
+            else:
+                print(oscal_text)
+
         if is_json_mode(ctx):
             if should_stream(ctx):
                 for f in report.findings:
                     emit_stream(f.as_dict())
             else:
-                emit_success(ctx, report.as_dict())
+                payload = report.as_dict()
+                if traceability:
+                    from cloudwright.compliance import build_traceability
+
+                    payload["traceability"] = build_traceability(spec, report)
+                emit_success(ctx, payload)
             _maybe_exit(report, fail_on)
             return
 
@@ -79,6 +113,21 @@ def compliance_scan(
                 console.print(f"           Remediation: {f.remediation}", style="dim")
                 console.print()
 
+        if traceability and report.findings:
+            from cloudwright.compliance import build_traceability
+
+            chain_table = Table("Component", "Resource", "Controls", "Status", title="Control Traceability")
+            for row in build_traceability(spec, report):
+                ctrls = ", ".join(f"{c['framework']} {c['control_id']}" for c in row["controls"]) or "-"
+                chain_table.add_row(
+                    f"{row['label'] or row['component_id'] or '-'} ({row['service'] or '-'})",
+                    row["resource_type"] or "-",
+                    ctrls,
+                    f"[red]{row['status']}[/red]",
+                )
+            console.print(chain_table)
+            console.print()
+
         crit = report.critical_count
         high = report.high_count
         console.print(f"{len(report.findings)} finding(s) ({crit} critical, {high} high)")

{cloudwright_ai_cli-1.5.0 → cloudwright_ai_cli-1.6.1}/cloudwright_cli/commands/cost.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 from pathlib import Path
 from typing import Annotated
 
@@ -30,6 +31,18 @@ def cost(
             "Sets realistic defaults for request volumes, storage, node counts, and data transfer.",
         ),
     ] = None,
+    carbon: Annotated[
+        bool,
+        typer.Option("--carbon", help="Include a CO2e carbon footprint estimate."),
+    ] = False,
+    focus: Annotated[
+        bool,
+        typer.Option("--focus", help="Output cost data as FinOps FOCUS 1.0 CSV."),
+    ] = False,
+    output: Annotated[
+        Path | None,
+        typer.Option("-o", "--output", help="Write FOCUS CSV to this file instead of stdout."),
+    ] = None,
 ) -> None:
     """Show cost breakdown for an architecture spec."""
     if workload_profile:
@@ -43,14 +56,32 @@ def cost(
             raise typer.Exit(1)
 
     spec = ArchSpec.from_file(spec_file)
+    tier = pricing_tier or "on_demand"
 
     # Compute cost estimate if not present
     if not spec.cost_estimate:
         engine = CostEngine()
-        spec.cost_estimate = engine.estimate(spec, workload_profile=workload_profile)
+        spec.cost_estimate = engine.estimate(spec, pricing_tier=tier, workload_profile=workload_profile)
+
+    # --focus: emit FOCUS CSV and exit
+    if focus:
+        from cloudwright.focus import to_focus_csv
+
+        csv_text = to_focus_csv(spec.cost_estimate, pricing_tier=tier)
+        if output:
+            output.write_text(csv_text, encoding="utf-8")
+            console.print(f"FOCUS CSV written to {output}")
+        else:
+            sys.stdout.write(csv_text)
+        return
 
     if is_json_mode(ctx):
-        emit_success(ctx, {"estimate": spec.cost_estimate.model_dump(exclude_none=True)})
+        payload: dict = {"estimate": spec.cost_estimate.model_dump(exclude_none=True)}
+        if carbon:
+            from cloudwright.carbon import estimate_carbon
+
+            payload["carbon"] = estimate_carbon(spec)
+        emit_success(ctx, payload)
         return
 
     if compare:
@@ -59,31 +90,51 @@ def cost(
     else:
         _print_single_cost_table(spec)
 
+    if carbon:
+        from cloudwright.carbon import estimate_carbon
+
+        _print_carbon_table(spec, estimate_carbon(spec))
+
 
 def _print_single_cost_table(spec: ArchSpec) -> None:
     if not spec.cost_estimate:
         console.print("[yellow]No cost estimate in spec. Run 'cloudwright design' to generate one.[/yellow]")
         return
 
-    table = Table(title=f"Cost Breakdown — {spec.name}", show_footer=True)
+    est = spec.cost_estimate
+    region_note = ""
+    if est.region_multiplier != 1.0:
+        region_note = f" (region multiplier: {est.region_multiplier:.2f}x vs us-east-1)"
+
+    title = f"Cost Breakdown — {spec.name}{region_note}"
+    table = Table(title=title, show_footer=True)
     table.add_column("Component", style="cyan")
     table.add_column("Service")
-    table.add_column("Monthly", justify="right", footer=f"${spec.cost_estimate.monthly_total:,.2f}")
+    table.add_column("Monthly", justify="right", footer=f"${est.monthly_total:,.2f}")
+    table.add_column("Confidence", justify="center")
     table.add_column("Notes", style="dim")
 
     comp_map = {c.id: c for c in spec.components}
-    for item in spec.cost_estimate.breakdown:
+    for item in est.breakdown:
         comp = comp_map.get(item.component_id)
         svc_label = comp.service if comp else item.service
+        conf_style = "green" if item.confidence == "high" else "yellow"
         table.add_row(
             item.component_id,
             svc_label,
             f"${item.monthly:,.2f}",
+            f"[{conf_style}]{item.confidence}[/{conf_style}]",
             item.notes,
         )
 
     console.print(table)
 
+    if est.pricing_confidence != "high":
+        console.print(
+            "[yellow]Pricing confidence: low[/yellow] — one or more services used formula/fallback "
+            "pricing, not real catalog data. Treat totals as rough estimates."
+        )
+
 
 def _print_multi_cloud_table(spec: ArchSpec, providers: list[str]) -> None:
     all_providers = [spec.provider] + [p for p in providers if p != spec.provider]
@@ -129,3 +180,29 @@ def _print_multi_cloud_table(spec: ArchSpec, providers: list[str]) -> None:
     table.add_row("[bold]TOTAL[/bold]", *totals)
 
     console.print(table)
+
+
+def _print_carbon_table(spec: ArchSpec, carbon: dict) -> None:
+    table = Table(title=f"Carbon Estimate — {spec.name} ({carbon['region']})")
+    table.add_column("Component", style="cyan")
+    table.add_column("Service")
+    table.add_column("Watts", justify="right")
+    table.add_column("kWh/mo", justify="right")
+    table.add_column("kgCO2e/mo", justify="right")
+
+    for item in carbon["breakdown"]:
+        table.add_row(
+            item["component_id"],
+            item["service"],
+            f"{item['watts']:.1f}",
+            f"{item['kwh_per_month']:.2f}",
+            f"{item['kg_co2e_per_month']:.3f}",
+        )
+
+    console.print(table)
+    console.print(
+        f"[bold]Total:[/bold] {carbon['total_kg_co2e_per_month']:.3f} kgCO2e/month  "
+        f"[dim](grid: {carbon['grid_intensity_g_per_kwh']} gCO2e/kWh, "
+        f"PUE: {carbon['assumptions']['pue']})[/dim]"
+    )
+    console.print(f"[dim]{carbon['assumptions']['disclaimer']}[/dim]")

{cloudwright_ai_cli-1.5.0 → cloudwright_ai_cli-1.6.1}/cloudwright_cli/commands/drift_cmd.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Annotated
+from typing import Annotated, Any
 
 import typer
 from rich.console import Console
@@ -24,6 +24,17 @@ def drift(
     fmt: Annotated[
         str, typer.Option("--format", "-f", help="Infrastructure format: auto, terraform, cloudformation")
     ] = "auto",
+    remediate: Annotated[
+        bool,
+        typer.Option(
+            "--remediate",
+            help="Show cost/quality delta and terraform plan preview to close drift (read-only).",
+        ),
+    ] = False,
+    run_plan: Annotated[
+        bool,
+        typer.Option("--run-plan", help="With --remediate: attempt a real terraform plan (needs credentials)."),
+    ] = False,
 ) -> None:
     """Compare design spec against deployed infrastructure to detect drift."""
     try:
@@ -39,6 +50,10 @@ def drift(
         with console.status("Detecting drift..."):
             report = detect_drift(spec_file, infra_file, infra_format=fmt)
 
+        if remediate:
+            _run_remediate(ctx, report, run_plan=run_plan)
+            return
+
         if is_json_mode(ctx):
             result = {
                 "drift_score": report.drift_score,
@@ -94,3 +109,61 @@ def drift(
         raise
     except Exception as e:
         handle_error(ctx, e)
+
+
+def _run_remediate(ctx: typer.Context, report: Any, *, run_plan: bool) -> None:
+    from cloudwright.remediation import remediate as compute_remediation
+
+    with console.status("Computing remediation plan..."):
+        result = compute_remediation(report.deployed_spec, report.design_spec, run_plan=run_plan)
+
+    if is_json_mode(ctx):
+        emit_success(ctx, {"remediation": result})
+        return
+
+    console.print(Rule("[bold]Cloudwright Remediation Preview[/bold]"))
+    console.print(Panel(result["summary"], title="Summary"))
+
+    drift_items = result["drift"]
+    if drift_items:
+        table = Table(title=f"Changes to close drift ({len(drift_items)})")
+        table.add_column("Action", style="cyan")
+        table.add_column("Component")
+        table.add_column("Detail")
+        for item in drift_items:
+            action = item["change"]
+            cid = item.get("id", "")
+            detail = ""
+            if action == "modify":
+                detail = f"{item.get('field')}: {item.get('from')} -> {item.get('to')}"
+            elif action == "add":
+                detail = item.get("service", "")
+            elif action == "remove":
+                detail = item.get("service", "")
+            color = {"add": "green", "remove": "red", "modify": "yellow"}.get(action, "white")
+            table.add_row(f"[{color}]{action}[/{color}]", cid, detail)
+        console.print()
+        console.print(table)
+    else:
+        console.print("[green]No drift changes required.[/green]")
+
+    cd = result["cost_delta"]
+    sign = "+" if cd["delta"] >= 0 else ""
+    console.print(
+        f"\n[bold]Cost delta:[/bold] {sign}${cd['delta']:,.2f}/mo (${cd['current']:,.2f} -> ${cd['desired']:,.2f})"
+    )
+
+    qd = result["quality_delta"]
+    q_sign = "+" if qd["delta"] >= 0 else ""
+    q_color = "green" if qd["delta"] >= 0 else "red"
+    console.print(
+        f"[bold]Quality delta:[/bold] [{q_color}]{q_sign}{qd['delta']:.1f} pts[/{q_color}] "
+        f"(grade {qd['current_grade']} -> {qd['desired_grade']})"
+    )
+
+    plan = result["plan"]
+    plan_color = "green" if plan.get("ok") else "red"
+    plan_label = "valid" if plan.get("validated") else "not validated"
+    console.print(f"[bold]Plan ([/bold]{plan['tool']}[bold]):[/bold] [{plan_color}]{plan_label}[/{plan_color}]")
+    for msg in plan.get("messages", []):
+        console.print(f"  [dim]{msg}[/dim]")

cloudwright_ai_cli-1.6.1/cloudwright_cli/commands/review_cmd.py

@@ -0,0 +1,78 @@
+"""Review an architecture with the deterministic critics (offline)."""
+
+from __future__ import annotations
+
+from typing import Annotated
+
+import typer
+from rich.console import Console
+from rich.panel import Panel
+from rich.table import Table
+
+from cloudwright_cli.output import emit_success, is_json_mode
+from cloudwright_cli.utils import handle_error
+
+console = Console()
+
+_SEV_COLOR = {"critical": "red", "high": "red", "medium": "yellow", "low": "cyan"}
+
+
+def review(
+    ctx: typer.Context,
+    spec_file: Annotated[str, typer.Argument(help="Path to ArchSpec YAML/JSON file")],
+    compliance: Annotated[str, typer.Option("--compliance", help="Comma-separated frameworks, e.g. hipaa,soc2")] = "",
+    well_architected: Annotated[
+        bool, typer.Option("--well-architected", help="Include Well-Architected checks")
+    ] = False,
+) -> None:
+    """Review an architecture: unified scorer + linter + validator findings (no LLM, free)."""
+    try:
+        from cloudwright import ArchSpec
+        from cloudwright.critique import critique
+
+        spec = ArchSpec.from_file(spec_file)
+        frameworks = [f.strip() for f in compliance.split(",") if f.strip()] or None
+        report = critique(spec, compliance=frameworks, well_architected=well_architected)
+
+        if is_json_mode(ctx):
+            emit_success(ctx, {"review": report.as_dict()})
+            return
+
+        border = "green" if not report.blocking else "red"
+        console.print(
+            Panel(
+                f"[bold]{report.summary_line()}[/bold]",
+                title=f"Architecture Review: {spec.name}",
+                border_style=border,
+            )
+        )
+
+        if not report.findings:
+            console.print("[green]No findings. This architecture passes every critic.[/green]")
+            return
+
+        table = Table(title="Findings (severity-ranked)")
+        table.add_column("Severity")
+        table.add_column("Source", style="dim")
+        table.add_column("Finding")
+        table.add_column("Fix")
+        for f in report.findings:
+            color = _SEV_COLOR.get(f.severity, "white")
+            table.add_row(
+                f"[{color}]{f.severity}[/{color}]",
+                f.source,
+                f.message,
+                (f.recommendation or "")[:80],
+            )
+        console.print(table)
+
+        if report.blocking:
+            console.print(
+                f"\n[red]{len(report.blocking)} blocking finding(s).[/red] "
+                "Run `cloudwright design` (repair is on by default) or fix these before deploy."
+            )
+
+    except typer.Exit:
+        raise
+    except Exception as e:
+        handle_error(ctx, e)

{cloudwright_ai_cli-1.5.0 → cloudwright_ai_cli-1.6.1}/cloudwright_cli/main.py

@@ -22,6 +22,7 @@ from cloudwright_cli.commands.modify_cmd import modify
 from cloudwright_cli.commands.plan_cmd import plan
 from cloudwright_cli.commands.policy import policy
 from cloudwright_cli.commands.refresh_cmd import refresh
+from cloudwright_cli.commands.review_cmd import review
 from cloudwright_cli.commands.schema_cmd import schema
 from cloudwright_cli.commands.score_cmd import score
 from cloudwright_cli.commands.security_cmd import security_scan
@@ -77,6 +78,7 @@ app.command()(init)
 app.command()(plan)
 app.command()(policy)
 app.command()(score)
+app.command()(review)
 app.command()(analyze)
 app.command()(refresh)
 app.command()(lint)

cloudwright_ai_cli-1.5.0/cloudwright_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.5.0"