Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

fix: preserve repaired Deep Scan coverage on Windows (#2366)

Michael D'Angelo7f494cb12050
diff --git a/plugins/codex-security/scripts/workbench_coverage_receipts.py b/plugins/codex-security/scripts/workbench_coverage_receipts.py
index 4b27b3997..b13a19bc5 100644
--- a/plugins/codex-security/scripts/workbench_coverage_receipts.py
+++ b/plugins/codex-security/scripts/workbench_coverage_receipts.py
@@ -10,6 +10,7 @@ from typing import Any
from finalize_scan_contract import (
ContractError,
+ MissingScanLocalFileError,
_require_portable_relative_path,
_require_str,
_validate_schema_node,
@@ -398,9 +399,7 @@ def _generic_surface_updates(
for ref in previous_refs if isinstance(previous_refs, list) else []:
if ref not in refs:
failure = receipt_error(ref) if repaired else None
- replaceable = failure is not None and isinstance(
- failure.__cause__, FileNotFoundError
- )
+ replaceable = isinstance(failure, MissingScanLocalFileError)
if repaired and isinstance(ref, str):
try:
normalized = _require_portable_relative_path(
diff --git a/plugins/codex-security/tests/test_deep_coverage_recovery.py b/plugins/codex-security/tests/test_deep_coverage_recovery.py
index cec9ce4d7..31a5a7c61 100644
--- a/plugins/codex-security/tests/test_deep_coverage_recovery.py
+++ b/plugins/codex-security/tests/test_deep_coverage_recovery.py
@@ -1280,9 +1280,13 @@ def test_stopped_publication_recovers_unrepaired_failed_worker_receipt_collision
assert all(path.read_bytes() == contents for path, contents in originals.items())
[email protected]("reverse", [False, True])
-def test_missing_historical_receipt_does_not_hide_valid_case_variant(tmp_path, reverse):
- refs = ["artifacts/review.md", "artifacts/Review.md"]
+ ("historical", "reverse"),
+ [("missing", False), ("directory", False), ("case-variant", False), ("case-variant", True)],
+)
+def test_historical_receipt_repair_preserves_valid_evidence(tmp_path, historical, reverse):
+ old_ref = "artifacts/review.md" if historical == "case-variant" else "artifacts/old.md"
+ refs = [old_ref, "artifacts/Review.md"]
if reverse:
refs.reverse()
surface = {"id": "api", "label": "API", "disposition": "no_issue_found"}
@@ -1291,7 +1295,9 @@ def test_missing_historical_receipt_does_not_hide_valid_case_variant(tmp_path, r
output = Path(source["artifact_dir"])
(output / "artifacts/review.md").unlink()
(output / "artifacts/Review.md").write_text("Retained historical evidence.\n")
- if (output / "artifacts/review.md").exists():
+ if historical == "directory":
+ (output / old_ref).mkdir()
+ elif (output / old_ref).exists():
pytest.skip("This regression requires case-sensitive receipt paths.")
(output / "artifacts/replacement.md").write_text("Current review evidence.\n")
prefix = output.relative_to(tmp_path).as_posix() + "/"
@@ -1312,17 +1318,16 @@ def test_missing_historical_receipt_does_not_hide_valid_case_variant(tmp_path, r
)
write_checkpoint(output / "checkpoints", current, mtime_ns=300)
warnings = []
- documents = saved.merge_saved_results(
- tmp_path,
- "coverage-scan",
- saved_binding("deep_repository", repository="synthetic"),
- [source],
- warnings,
- stopped=True,
- reason="Interrupted retry before checkpoint-head publication.",
- )
- assert documents is not None
- retained = documents[2]["surfaces"][0]["receiptRefs"]
+ documents = recover(tmp_path, [source], warnings=warnings)
+ (row,) = documents[2]["surfaces"]
+ retained = row["receiptRefs"]
+ if historical == "directory":
+ assert row["disposition"] == "needs_follow_up"
+ assert prefix + "artifacts/Review.md" in retained
+ assert prefix + old_ref not in retained
+ assert not any("Replaced invalid saved coverage receipt" in warning for warning in warnings)
+ return
+ assert row["disposition"] == "no_issue_found"
assert set(retained) == {prefix + "artifacts/Review.md", prefix + "artifacts/replacement.md"}
assert any("Replaced invalid saved coverage receipt" in warning for warning in warnings)
scan = {