attackmap 0.4.1__tar.gz → 0.4.3__tar.gz

{attackmap-0.4.1/src/attackmap.egg-info → attackmap-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: attackmap
-Version: 0.4.1
+Version: 0.4.3
 Summary: AI-assisted defensive security analyzer for codebases — scans a repository, models assets and controls, finds cross-cutting weaknesses, and generates an evidence-grounded review with MITRE ATT&CK mappings and detection-engineering hints.
 Author: AttackMap Contributors
 Author-email: Matthew Davis <matthewd@matthewd.xyz>
@@ -36,6 +36,7 @@ Requires-Dist: pydantic>=2.7.0
 Requires-Dist: networkx>=3.3
 Provides-Extra: llm
 Requires-Dist: anthropic>=0.40.0; extra == "llm"
+Requires-Dist: openai>=1.60.0; extra == "llm"
 Provides-Extra: all
 Requires-Dist: attackmap[llm]; extra == "all"
 Requires-Dist: attackmap-analyzer-python>=0.1.0; extra == "all"
@@ -105,6 +106,12 @@ to use your existing Pro/Max subscription:
 attackmap analyze /path/to/repo --output reports --llm
 ```
 
+Prefer OpenAI? Add `--llm-provider openai` to run the same review/hunt/remediate
+phases on OpenAI. Set `OPENAI_API_KEY` for the Responses API, or log in once with
+the [`codex` CLI](https://developers.openai.com/codex) to use your subscription
+(`--llm-backend cli`). Default model is `gpt-5-codex`; `--llm-model` accepts any
+model ID verbatim.
+
 Read `reports/defensive-review.md` (heuristic) and `reports/defensive-review-llm.md`
 (LLM-narrated) side by side.
 
@@ -482,7 +489,9 @@ trust-boundary violations, and more.
 
 **4. LLM narrative review.** With `--llm`, Claude Opus generates a final review
 from the structured evidence pack. The model is forced to cite real
-surface/asset/control IDs, so it can't invent findings.
+surface/asset/control IDs, so it can't invent findings. Add `--llm-provider
+openai` to run the same phase on OpenAI/Codex instead (`gpt-5-codex` by default,
+via `OPENAI_API_KEY` or the `codex` CLI) — the grounding contract is identical.
 
 **5. Vulnerability-hypothesis hunting (`--hunt`).** The honest core of the
 "find the unknown" ask. `attackmap analyze . --hunt` has Claude reason over the
@@ -542,6 +551,8 @@ attackmap analyze <path> --module python --module rust   # only these analyzers
 attackmap analyze <path> --cve           # cross-reference SBOM against OSV.dev
 attackmap analyze <path> --llm           # add LLM narrative (auto-resolve auth)
 attackmap analyze <path> --llm --llm-backend cli         # force Claude CLI
+attackmap analyze <path> --llm --llm-provider openai     # use OpenAI/Codex (OPENAI_API_KEY or `codex` CLI)
+attackmap analyze <path> --llm --llm-provider openai --llm-model gpt-5.5   # any OpenAI model ID, passed through
 attackmap analyze <path> --hunt          # LLM vulnerability-hypothesis hunt (leads to confirm)
 attackmap analyze <path> --hunt --verify # adjudicate each lead vs. source (confirmed/refuted/review)
 attackmap analyze <path> --remediate     # LLM review-first fix suggestions (remediation.md)

{attackmap-0.4.1 → attackmap-0.4.3}/README.md

@@ -46,6 +46,12 @@ to use your existing Pro/Max subscription:
 attackmap analyze /path/to/repo --output reports --llm
 ```
 
+Prefer OpenAI? Add `--llm-provider openai` to run the same review/hunt/remediate
+phases on OpenAI. Set `OPENAI_API_KEY` for the Responses API, or log in once with
+the [`codex` CLI](https://developers.openai.com/codex) to use your subscription
+(`--llm-backend cli`). Default model is `gpt-5-codex`; `--llm-model` accepts any
+model ID verbatim.
+
 Read `reports/defensive-review.md` (heuristic) and `reports/defensive-review-llm.md`
 (LLM-narrated) side by side.
 
@@ -423,7 +429,9 @@ trust-boundary violations, and more.
 
 **4. LLM narrative review.** With `--llm`, Claude Opus generates a final review
 from the structured evidence pack. The model is forced to cite real
-surface/asset/control IDs, so it can't invent findings.
+surface/asset/control IDs, so it can't invent findings. Add `--llm-provider
+openai` to run the same phase on OpenAI/Codex instead (`gpt-5-codex` by default,
+via `OPENAI_API_KEY` or the `codex` CLI) — the grounding contract is identical.
 
 **5. Vulnerability-hypothesis hunting (`--hunt`).** The honest core of the
 "find the unknown" ask. `attackmap analyze . --hunt` has Claude reason over the
@@ -483,6 +491,8 @@ attackmap analyze <path> --module python --module rust   # only these analyzers
 attackmap analyze <path> --cve           # cross-reference SBOM against OSV.dev
 attackmap analyze <path> --llm           # add LLM narrative (auto-resolve auth)
 attackmap analyze <path> --llm --llm-backend cli         # force Claude CLI
+attackmap analyze <path> --llm --llm-provider openai     # use OpenAI/Codex (OPENAI_API_KEY or `codex` CLI)
+attackmap analyze <path> --llm --llm-provider openai --llm-model gpt-5.5   # any OpenAI model ID, passed through
 attackmap analyze <path> --hunt          # LLM vulnerability-hypothesis hunt (leads to confirm)
 attackmap analyze <path> --hunt --verify # adjudicate each lead vs. source (confirmed/refuted/review)
 attackmap analyze <path> --remediate     # LLM review-first fix suggestions (remediation.md)

{attackmap-0.4.1 → attackmap-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "attackmap"
-version = "0.4.1"
+version = "0.4.3"
 description = "AI-assisted defensive security analyzer for codebases — scans a repository, models assets and controls, finds cross-cutting weaknesses, and generates an evidence-grounded review with MITRE ATT&CK mappings and detection-engineering hints."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -56,6 +56,7 @@ dependencies = [
 [project.optional-dependencies]
 llm = [
   "anthropic>=0.40.0",
+  "openai>=1.60.0",
 ]
 all = [
   "attackmap[llm]",

{attackmap-0.4.1 → attackmap-0.4.3}/src/attackmap/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.4.1"
+__version__ = "0.4.3"

{attackmap-0.4.1 → attackmap-0.4.3}/src/attackmap/anomalies.py

@@ -36,10 +36,16 @@ from __future__ import annotations
 import re
 from dataclasses import dataclass
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from .models import Anomaly, Route, ScanResult
 from .srcpaths import is_test_file
 
+if TYPE_CHECKING:
+    from .progress import JsonScanProgress, ScanProgress
+
+    _Progress = ScanProgress | JsonScanProgress
+
 
 @dataclass
 class _SignalCtx:
@@ -106,8 +112,17 @@ _MIN_GROUP = 3
 _SCAFFOLD_RE = re.compile(r"^(?:api|rest|graphql|gql|v\d+(?:beta\d*|alpha\d*)?)$", re.IGNORECASE)
 
 
-def find_anomalies(scan: ScanResult, root: str | Path | None = None) -> list[Anomaly]:
-    """Return within-repo consistency outliers for the routes in ``scan``."""
+def find_anomalies(
+    scan: ScanResult,
+    root: str | Path | None = None,
+    progress: "_Progress | None" = None,
+) -> list[Anomaly]:
+    """Return within-repo consistency outliers for the routes in ``scan``.
+
+    On a large route surface the per-cohort source-window reads dominate this
+    pass, so when a ``progress`` reporter is supplied it drives a determinate
+    bar over the cohorts (rather than an open-ended spinner).
+    """
     root_path = Path(root or scan.root).resolve()
 
     routes = [r for r in scan.routes if not is_test_file(r.file)]
@@ -129,8 +144,13 @@ def find_anomalies(scan: ScanResult, root: str | Path | None = None) -> list[Ano
 
     ctx = _SignalCtx(root_path, line_cache, file_route_lines)
 
+    if progress is not None:
+        progress.begin(len(groups), "Anomaly / outlier detection")
+
     out: list[Anomaly] = []
     for key, members in groups.items():
+        if progress is not None:
+            progress.advance(key)
         if len(members) < _MIN_GROUP:
             continue
         if not _is_route_like_cohort(key, members):

{attackmap-0.4.1 → attackmap-0.4.3}/src/attackmap/cli.py

@@ -69,20 +69,30 @@ def analyze(
         "--llm",
         help="Generate a narrative defensive review by calling Claude with the evidence pack. Auth resolves automatically: ANTHROPIC_API_KEY → ANTHROPIC_AUTH_TOKEN → `claude` CLI (subscription auth). Force a backend with --llm-backend.",
     ),
+    llm_provider: str = typer.Option(
+        "claude",
+        "--llm-provider",
+        help="LLM provider for --llm/--hunt/--remediate: 'claude' (default, Anthropic) or 'openai' (OpenAI/Codex).",
+    ),
     llm_model: str | None = typer.Option(
         None,
         "--llm-model",
-        help="Claude model ID for --llm (defaults to claude-opus-4-7).",
+        help="Model ID for --llm. Claude provider: e.g. claude-opus-4-8 (default), claude-fable-5, claude-sonnet-5, claude-opus-4-7. OpenAI provider: e.g. gpt-5-codex (default), gpt-5.5, gpt-5.4, gpt-5.4-mini — any model ID is passed through verbatim.",
     ),
     llm_effort: str | None = typer.Option(
         None,
         "--llm-effort",
-        help="Effort for --llm: low|medium|high|xhigh|max. Defaults to high.",
+        help="Effort for --llm: low|medium|high|xhigh|max. Defaults to high. For OpenAI, xhigh/max clamp to high (Responses API reasoning effort tops out at high).",
     ),
     llm_backend: str = typer.Option(
         "auto",
         "--llm-backend",
-        help="Which backend --llm uses: 'auto' (default) tries ANTHROPIC_API_KEY → ANTHROPIC_AUTH_TOKEN → `claude` CLI; 'api' forces the SDK; 'cli' forces the `claude` CLI (uses your `claude login` auth, e.g. Pro/Max subscription).",
+        help="Which backend --llm uses. Claude: 'auto' tries ANTHROPIC_API_KEY → ANTHROPIC_AUTH_TOKEN → `claude` CLI; 'api' forces the SDK; 'cli' forces the `claude` CLI. OpenAI: 'auto' tries OPENAI_API_KEY then the `codex` CLI; 'api' forces the OpenAI SDK; 'cli' forces `codex exec` (your `codex login` subscription).",
+    ),
+    llm_speed: str = typer.Option(
+        "standard",
+        "--llm-speed",
+        help="LLM output speed: 'standard' (default) or 'fast'. Fast mode (~2.5x output speed, premium price) applies only to Opus 4.8/4.7 via the API backend; other models/backends fall back to standard.",
     ),
     hunt: bool = typer.Option(
         False,
@@ -155,12 +165,27 @@ def analyze(
 
     if progress_format not in {"auto", "tty", "json", "none"}:
         raise typer.BadParameter("--progress-format must be one of: auto, json, none.")
+    if llm_speed not in {"standard", "fast"}:
+        raise typer.BadParameter("--llm-speed must be one of: standard, fast.")
+    if llm_provider not in {"claude", "openai"}:
+        raise typer.BadParameter("--llm-provider must be one of: claude, openai.")
+    # Provider-aware label for the "via X" progress/echo strings.
+    llm_display = "Codex" if llm_provider == "openai" else "Claude"
+    if llm_provider == "openai" and llm_speed == "fast" and (llm or hunt or remediate):
+        typer.echo(
+            "Note: --llm-speed fast is Claude-only; ignoring it for the OpenAI provider.",
+            err=True,
+        )
     active_analyzers = resolve_run_analyzers(repo_path, analyzers=selected_analyzers)
     scan_progress = create_progress(progress_format, no_progress=no_progress)
     scan = analyze_repository(repo_path, analyzers=active_analyzers, progress=scan_progress)
     if cve and scan.dependencies:
         typer.echo(f"Checking {len(scan.dependencies)} dependencies against OSV.dev…")
-        vulns, cve_summary = query_vulnerabilities(scan.dependencies)
+        scan_progress.stage(f"Checking {len(scan.dependencies)} dependencies against OSV.dev")
+        try:
+            vulns, cve_summary = query_vulnerabilities(scan.dependencies)
+        finally:
+            scan_progress.done()
         scan.vulnerabilities = vulns
         typer.echo(
             f"CVE lookup: {len(vulns)} vulnerabilit"
@@ -255,17 +280,25 @@ def analyze(
 
             typer.echo("")
             typer.echo(
-                f"Generating narrative review via Claude (backend={llm_backend}, may take a minute)..."
+                f"Generating narrative review via {llm_display} (backend={llm_backend}, may take a minute)..."
             )
-            result = generate_llm_review(
-                scan,
-                attack_surfaces,
-                findings,
-                attack_paths,
-                model=llm_model,
-                effort=effort_value,  # type: ignore[arg-type]
-                backend=llm_backend,  # type: ignore[arg-type]
+            scan_progress.stage(
+                f"{llm_display} is writing the defensive review (backend={llm_backend})"
             )
+            try:
+                result = generate_llm_review(
+                    scan,
+                    attack_surfaces,
+                    findings,
+                    attack_paths,
+                    model=llm_model,
+                    effort=effort_value,  # type: ignore[arg-type]
+                    backend=llm_backend,  # type: ignore[arg-type]
+                    speed=llm_speed,  # type: ignore[arg-type]
+                    provider=llm_provider,  # type: ignore[arg-type]
+                )
+            finally:
+                scan_progress.done()
         except LlmReviewError as exc:
             typer.echo(f"LLM review skipped: {exc}", err=True)
         else:
@@ -304,19 +337,28 @@ def analyze(
             typer.echo("")
             hunt_mode = "hunt_verify" if verify else "hunt"
             typer.echo(
-                f"Hunting for vulnerability hypotheses via Claude "
+                f"Hunting for vulnerability hypotheses via {llm_display} "
                 f"({'adjudicated against source, ' if verify else ''}backend={llm_backend}, may take a minute)..."
             )
-            hunt_result = generate_llm_review(
-                scan,
-                attack_surfaces,
-                findings,
-                attack_paths,
-                model=llm_model,
-                effort=hunt_effort_value,  # type: ignore[arg-type]
-                backend=llm_backend,  # type: ignore[arg-type]
-                mode=hunt_mode,  # type: ignore[arg-type]
+            scan_progress.stage(
+                f"{llm_display} is hunting exploit-chain hypotheses"
+                f"{' + verifying against source' if verify else ''} (backend={llm_backend})"
             )
+            try:
+                hunt_result = generate_llm_review(
+                    scan,
+                    attack_surfaces,
+                    findings,
+                    attack_paths,
+                    model=llm_model,
+                    effort=hunt_effort_value,  # type: ignore[arg-type]
+                    backend=llm_backend,  # type: ignore[arg-type]
+                    mode=hunt_mode,  # type: ignore[arg-type]
+                    speed=llm_speed,  # type: ignore[arg-type]
+                    provider=llm_provider,  # type: ignore[arg-type]
+                )
+            finally:
+                scan_progress.done()
         except LlmReviewError as exc:
             typer.echo(f"Vulnerability hunt skipped: {exc}", err=True)
         else:
@@ -357,18 +399,26 @@ def analyze(
                 )
             typer.echo("")
             typer.echo(
-                f"Generating remediation suggestions via Claude (backend={llm_backend}, may take a minute)..."
+                f"Generating remediation suggestions via {llm_display} (backend={llm_backend}, may take a minute)..."
             )
-            rem_result = generate_llm_review(
-                scan,
-                attack_surfaces,
-                findings,
-                attack_paths,
-                model=llm_model,
-                effort=rem_effort_value,  # type: ignore[arg-type]
-                backend=llm_backend,  # type: ignore[arg-type]
-                mode="remediate",
+            scan_progress.stage(
+                f"{llm_display} is drafting remediation suggestions (backend={llm_backend})"
             )
+            try:
+                rem_result = generate_llm_review(
+                    scan,
+                    attack_surfaces,
+                    findings,
+                    attack_paths,
+                    model=llm_model,
+                    effort=rem_effort_value,  # type: ignore[arg-type]
+                    backend=llm_backend,  # type: ignore[arg-type]
+                    mode="remediate",
+                    speed=llm_speed,  # type: ignore[arg-type]
+                    provider=llm_provider,  # type: ignore[arg-type]
+                )
+            finally:
+                scan_progress.done()
         except LlmReviewError as exc:
             typer.echo(f"Remediation skipped: {exc}", err=True)
         else: