@openai/codex-security 0.8.2 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +201 -178
- package/_bundled_plugin/.app.json +4 -0
- package/_bundled_plugin/.mcp.json +6 -1
- package/_bundled_plugin/examples/completed-scan/findings.json +16 -4
- package/_bundled_plugin/examples/completed-scan/report.md +11 -8
- package/_bundled_plugin/examples/completed-scan/scan-manifest.json +4 -2
- package/_bundled_plugin/mcp/fzstd-LICENSE.txt +21 -0
- package/_bundled_plugin/mcp/helpers.mjs +2 -11
- package/_bundled_plugin/mcp/helpers.mjs.br +0 -0
- package/_bundled_plugin/mcp/native/THIRD_PARTY_NOTICES.txt +3 -210
- package/_bundled_plugin/mcp/native/darwin-arm64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/darwin-x64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/win32-arm64/windows.node +0 -0
- package/_bundled_plugin/mcp/native/win32-x64/windows.node +0 -0
- package/_bundled_plugin/mcp/package.json +1 -0
- package/_bundled_plugin/mcp/permission-profile-preflight.mjs +51 -14
- package/_bundled_plugin/mcp/server.mjs +2 -11
- package/_bundled_plugin/mcp/server.mjs.br +0 -0
- package/_bundled_plugin/mcp/session-decompression.mjs +712 -0
- package/_bundled_plugin/references/artifact-storage.md +1 -1
- package/_bundled_plugin/references/core-scan.md +14 -5
- package/_bundled_plugin/references/default-severity-rubric.md +33 -0
- package/_bundled_plugin/references/final-report.md +5 -3
- package/_bundled_plugin/references/finding-detail-fields.md +19 -18
- package/_bundled_plugin/references/sarif-adapter.md +8 -2
- package/_bundled_plugin/references/scan-artifacts.md +21 -12
- package/_bundled_plugin/references/scan-contract.md +27 -33
- package/_bundled_plugin/references/threat-model.md +1 -0
- package/_bundled_plugin/schemas/tools/scan-draft.schema.json +2 -2
- package/_bundled_plugin/scripts/check_deep_scan_target.py +97 -0
- package/_bundled_plugin/scripts/codex_profile.mjs +7 -1
- package/_bundled_plugin/scripts/deep_scan_config.py +20 -1
- package/_bundled_plugin/scripts/deep_scan_workbench.py +188 -454
- package/_bundled_plugin/scripts/filesystem_identity.py +1 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +317 -377
- package/_bundled_plugin/scripts/finding_preview.py +25 -29
- package/_bundled_plugin/scripts/launch_codex_security_mcp +1 -0
- package/_bundled_plugin/scripts/legacy_findings.py +148 -0
- package/_bundled_plugin/scripts/posix_scan_local_files.py +198 -0
- package/_bundled_plugin/scripts/read_codex_session.mjs +21 -0
- package/_bundled_plugin/scripts/report_projection.py +167 -178
- package/_bundled_plugin/scripts/review_state.py +8 -2
- package/_bundled_plugin/scripts/servicenow_avit.py +20 -0
- package/_bundled_plugin/scripts/snapshot_sqlite.py +1 -0
- package/_bundled_plugin/scripts/threat_model_projection.py +22 -26
- package/_bundled_plugin/scripts/validate_scan_contract.py +9 -7
- package/_bundled_plugin/scripts/windows_scan_local_files.py +600 -72
- package/_bundled_plugin/scripts/workbench/__init__.py +1 -1
- package/_bundled_plugin/scripts/workbench/handoff.py +47 -0
- package/_bundled_plugin/scripts/workbench/retained_coverage.py +38 -75
- package/_bundled_plugin/scripts/workbench/retained_records.py +18 -30
- package/_bundled_plugin/scripts/workbench/runtime_toml.py +4 -1
- package/_bundled_plugin/scripts/workbench/saved_coverage.py +152 -248
- package/_bundled_plugin/scripts/workbench/saved_outputs.py +9 -0
- package/_bundled_plugin/scripts/workbench/saved_sources.py +47 -40
- package/_bundled_plugin/scripts/workbench/storage.py +71 -7
- package/_bundled_plugin/scripts/workbench_cli.py +121 -14
- package/_bundled_plugin/scripts/workbench_constants.py +19 -0
- package/_bundled_plugin/scripts/workbench_coverage_receipts.py +3 -3
- package/_bundled_plugin/scripts/workbench_db.py +550 -492
- package/_bundled_plugin/scripts/workbench_feedback.py +8 -7
- package/_bundled_plugin/scripts/workbench_finding_index.py +1 -0
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +90 -4
- package/_bundled_plugin/scripts/workbench_native_indexes.py +29 -33
- package/_bundled_plugin/scripts/workbench_progress.py +10 -1
- package/_bundled_plugin/scripts/workbench_publication.py +14 -10
- package/_bundled_plugin/scripts/workbench_remediation.py +508 -11
- package/_bundled_plugin/scripts/workbench_saved_results.py +132 -77
- package/_bundled_plugin/scripts/workbench_scan_history.py +139 -80
- package/_bundled_plugin/scripts/workbench_scan_start.py +84 -25
- package/_bundled_plugin/scripts/workbench_scan_usage.py +666 -117
- package/_bundled_plugin/scripts/workbench_schema.py +44 -55
- package/_bundled_plugin/scripts/workbench_setup.py +251 -0
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +13 -0
- package/_bundled_plugin/scripts/workbench_source_scopes.py +33 -23
- package/_bundled_plugin/scripts/workbench_target.py +330 -66
- package/_bundled_plugin/scripts/workbench_target_state.py +3 -0
- package/_bundled_plugin/scripts/workbench_validation.py +44 -12
- package/_bundled_plugin/shared/workbench-history-repairs.json +19 -16
- package/_bundled_plugin/shared/workbench-migrations.json +53 -0
- package/_bundled_plugin/skills/attack-path-analysis/SKILL.md +1 -1
- package/_bundled_plugin/skills/attack-path-analysis/references/severity-policy.md +4 -68
- package/_bundled_plugin/skills/check-skills/SKILL.md +43 -0
- package/_bundled_plugin/skills/check-skills/agents/openai.yaml +4 -0
- package/_bundled_plugin/skills/cloud-findings/SKILL.md +6 -4
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +7 -50
- package/_bundled_plugin/skills/fix-finding/SKILL.md +19 -2
- package/_bundled_plugin/skills/publish-findings/SKILL.md +81 -45
- package/_bundled_plugin/skills/publish-findings/references/checkmarx-import.md +37 -0
- package/_bundled_plugin/skills/publish-findings/references/wiz-import.md +5 -24
- package/_bundled_plugin/skills/publish-findings/scripts/collect_checkmarx.py +464 -0
- package/_bundled_plugin/skills/threat-model-visualize/scripts/build_explorer.py +36 -9
- package/_bundled_plugin/skills/track-findings/SKILL.md +5 -3
- package/_bundled_plugin/skills/triage-finding/references/github-rest-intake.md +22 -68
- package/_bundled_plugin/skills/triage-finding/references/ticket-intake.md +12 -6
- package/dist/api.d.ts +45 -5
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +1144 -411
- package/dist/api.js.map +1 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +10 -7
- package/dist/auth.js.map +1 -1
- package/dist/bedrock-oss-pricing.d.ts +6 -0
- package/dist/bedrock-oss-pricing.d.ts.map +1 -0
- package/dist/bedrock-oss-pricing.js +58 -0
- package/dist/bedrock-oss-pricing.js.map +1 -0
- package/dist/bedrock-pricing.d.ts +15 -0
- package/dist/bedrock-pricing.d.ts.map +1 -0
- package/dist/bedrock-pricing.js +117 -0
- package/dist/bedrock-pricing.js.map +1 -0
- package/dist/blackduck-findings.d.ts +8 -0
- package/dist/blackduck-findings.d.ts.map +1 -0
- package/dist/blackduck-findings.js +320 -0
- package/dist/blackduck-findings.js.map +1 -0
- package/dist/bulk-scan-discovery.d.ts.map +1 -1
- package/dist/bulk-scan-discovery.js +51 -36
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/checkmarx-evidence.d.ts +19 -0
- package/dist/checkmarx-evidence.d.ts.map +1 -0
- package/dist/checkmarx-evidence.js +36 -0
- package/dist/checkmarx-evidence.js.map +1 -0
- package/dist/checkmarx-findings.d.ts +4 -0
- package/dist/checkmarx-findings.d.ts.map +1 -0
- package/dist/checkmarx-findings.js +27 -0
- package/dist/checkmarx-findings.js.map +1 -0
- package/dist/checkmarx-one.d.ts +4 -0
- package/dist/checkmarx-one.d.ts.map +1 -0
- package/dist/checkmarx-one.js +53 -0
- package/dist/checkmarx-one.js.map +1 -0
- package/dist/checkmarx-repository.d.ts +12 -0
- package/dist/checkmarx-repository.d.ts.map +1 -0
- package/dist/checkmarx-repository.js +181 -0
- package/dist/checkmarx-repository.js.map +1 -0
- package/dist/checkmarx-xml.d.ts +12 -0
- package/dist/checkmarx-xml.d.ts.map +1 -0
- package/dist/checkmarx-xml.js +196 -0
- package/dist/checkmarx-xml.js.map +1 -0
- package/dist/classify-severity-records.d.ts +6 -9
- package/dist/classify-severity-records.d.ts.map +1 -1
- package/dist/classify-severity-records.js +9 -21
- package/dist/classify-severity-records.js.map +1 -1
- package/dist/classify-severity.d.ts +4 -1
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +30 -13
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli.d.ts +14 -5
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +2112 -1266
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.js +2 -2
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codex-prompt.d.ts +2 -0
- package/dist/codex-prompt.d.ts.map +1 -1
- package/dist/codex-prompt.js +6 -0
- package/dist/codex-prompt.js.map +1 -1
- package/dist/component-scan.d.ts +16 -3
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +32 -6
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts +2 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +221 -65
- package/dist/config.js.map +1 -1
- package/dist/continuum-findings.d.ts +7 -0
- package/dist/continuum-findings.d.ts.map +1 -0
- package/dist/continuum-findings.js +225 -0
- package/dist/continuum-findings.js.map +1 -0
- package/dist/contract-values.d.ts +30 -0
- package/dist/contract-values.d.ts.map +1 -0
- package/dist/contract-values.js +78 -0
- package/dist/contract-values.js.map +1 -0
- package/dist/contract.d.ts +2 -20
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +58 -669
- package/dist/contract.js.map +1 -1
- package/dist/cost-model.d.ts +13 -1
- package/dist/cost-model.d.ts.map +1 -1
- package/dist/cost-model.js +66 -115
- package/dist/cost-model.js.map +1 -1
- package/dist/cost.d.ts +61 -4
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +2560 -100
- package/dist/cost.js.map +1 -1
- package/dist/custom-publish.d.ts +4 -0
- package/dist/custom-publish.d.ts.map +1 -1
- package/dist/custom-publish.js +40 -3
- package/dist/custom-publish.js.map +1 -1
- package/dist/custom-validation-prompt.d.ts +1 -1
- package/dist/custom-validation-prompt.d.ts.map +1 -1
- package/dist/custom-validation-prompt.js +5 -0
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/custom-validation.d.ts +2 -0
- package/dist/custom-validation.d.ts.map +1 -1
- package/dist/custom-validation.js +4 -0
- package/dist/custom-validation.js.map +1 -1
- package/dist/deduplication/deduplication-prompts.d.ts +4 -4
- package/dist/deduplication/deduplication-prompts.d.ts.map +1 -1
- package/dist/deduplication/deduplication-prompts.js +2 -2
- package/dist/deduplication/deduplication-prompts.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts +14 -11
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +11 -4
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/deduplication.js.map +1 -1
- package/dist/deduplication/finding-schema.d.ts +19 -1
- package/dist/deduplication/finding-schema.d.ts.map +1 -1
- package/dist/deduplication/finding-schema.js +25 -0
- package/dist/deduplication/finding-schema.js.map +1 -1
- package/dist/deduplication/local.d.ts +2 -2
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +5 -10
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/records.d.ts +8 -2
- package/dist/deduplication/records.d.ts.map +1 -1
- package/dist/deduplication/records.js +36 -8
- package/dist/deduplication/records.js.map +1 -1
- package/dist/deduplication/refusal.d.ts.map +1 -1
- package/dist/deduplication/refusal.js +25 -5
- package/dist/deduplication/refusal.js.map +1 -1
- package/dist/deduplication/scan.d.ts +3 -0
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +1 -1
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-config.d.ts +0 -1
- package/dist/deep-config.d.ts.map +1 -1
- package/dist/deep-config.js +22 -33
- package/dist/deep-config.js.map +1 -1
- package/dist/deep-scan-defaults.d.ts +2 -0
- package/dist/deep-scan-defaults.d.ts.map +1 -1
- package/dist/deep-scan-defaults.js +28 -1
- package/dist/deep-scan-defaults.js.map +1 -1
- package/dist/deep-scan.d.ts +13 -0
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +262 -7
- package/dist/deep-scan.js.map +1 -1
- package/dist/default-severity-rubric.d.ts +1 -2
- package/dist/default-severity-rubric.d.ts.map +1 -1
- package/dist/default-severity-rubric.js +2 -66
- package/dist/default-severity-rubric.js.map +1 -1
- package/dist/endor-findings.d.ts +3 -1
- package/dist/endor-findings.d.ts.map +1 -1
- package/dist/endor-findings.js +108 -80
- package/dist/endor-findings.js.map +1 -1
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +9 -2
- package/dist/errors.js.map +1 -1
- package/dist/external-findings-import.d.ts +5 -3
- package/dist/external-findings-import.d.ts.map +1 -1
- package/dist/external-findings-import.js +11 -16
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +15 -4
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +619 -225
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +20 -6
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +2356 -308
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +28 -2
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +174 -81
- package/dist/external-findings-read.js.map +1 -1
- package/dist/external-findings.d.ts +17 -3
- package/dist/external-findings.d.ts.map +1 -1
- package/dist/external-findings.js +153 -1
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-contract.d.ts +33 -1
- package/dist/external-import-contract.d.ts.map +1 -1
- package/dist/external-import-contract.js +335 -51
- package/dist/external-import-contract.js.map +1 -1
- package/dist/external-import-models.d.ts +1 -1
- package/dist/external-import-models.d.ts.map +1 -1
- package/dist/external-import-models.js.map +1 -1
- package/dist/feedback.d.ts.map +1 -1
- package/dist/feedback.js +5 -4
- package/dist/feedback.js.map +1 -1
- package/dist/finding-prompt.d.ts +5 -0
- package/dist/finding-prompt.d.ts.map +1 -0
- package/dist/finding-prompt.js +32 -0
- package/dist/finding-prompt.js.map +1 -0
- package/dist/finding-retrieval.d.ts +3 -3
- package/dist/finding-retrieval.d.ts.map +1 -1
- package/dist/finding-retrieval.js.map +1 -1
- package/dist/finding-workflow.d.ts +6 -1
- package/dist/finding-workflow.d.ts.map +1 -1
- package/dist/finding-workflow.js +2 -2
- package/dist/finding-workflow.js.map +1 -1
- package/dist/findings-client.d.ts +1 -0
- package/dist/findings-client.d.ts.map +1 -1
- package/dist/findings-client.js +27 -3
- package/dist/findings-client.js.map +1 -1
- package/dist/git-remote.d.ts +4 -0
- package/dist/git-remote.d.ts.map +1 -1
- package/dist/git-remote.js +20 -0
- package/dist/git-remote.js.map +1 -1
- package/dist/github-advisories.d.ts +3 -12
- package/dist/github-advisories.d.ts.map +1 -1
- package/dist/github-advisories.js +9 -31
- package/dist/github-advisories.js.map +1 -1
- package/dist/github-dependabot-findings.d.ts.map +1 -1
- package/dist/github-dependabot-findings.js +22 -20
- package/dist/github-dependabot-findings.js.map +1 -1
- package/dist/github-findings.d.ts +4 -1
- package/dist/github-findings.d.ts.map +1 -1
- package/dist/github-findings.js +392 -79
- package/dist/github-findings.js.map +1 -1
- package/dist/github.d.ts +17 -7
- package/dist/github.d.ts.map +1 -1
- package/dist/github.js +43 -30
- package/dist/github.js.map +1 -1
- package/dist/host-protocol.d.ts +2 -2
- package/dist/host-protocol.d.ts.map +1 -1
- package/dist/host-protocol.js.map +1 -1
- package/dist/host-records-protocol.d.ts +10 -11
- package/dist/host-records-protocol.d.ts.map +1 -1
- package/dist/host-records-protocol.js +69 -9
- package/dist/host-records-protocol.js.map +1 -1
- package/dist/hosted-git-remotes.d.ts +5 -0
- package/dist/hosted-git-remotes.d.ts.map +1 -0
- package/dist/hosted-git-remotes.js +285 -0
- package/dist/hosted-git-remotes.js.map +1 -0
- package/dist/hosted-git-repository.d.ts +28 -0
- package/dist/hosted-git-repository.d.ts.map +1 -0
- package/dist/hosted-git-repository.js +222 -0
- package/dist/hosted-git-repository.js.map +1 -0
- package/dist/hosted-scan-protocol.js +2 -2
- package/dist/hosted-scan-protocol.js.map +1 -1
- package/dist/hosted-scan.d.ts +15 -0
- package/dist/hosted-scan.d.ts.map +1 -1
- package/dist/hosted-scan.js +71 -44
- package/dist/hosted-scan.js.map +1 -1
- package/dist/hosted-scanner-http.d.ts +21 -0
- package/dist/hosted-scanner-http.d.ts.map +1 -0
- package/dist/hosted-scanner-http.js +204 -0
- package/dist/hosted-scanner-http.js.map +1 -0
- package/dist/hosted-scanner-v1.d.ts +6 -0
- package/dist/hosted-scanner-v1.d.ts.map +1 -0
- package/dist/hosted-scanner-v1.js +60 -0
- package/dist/hosted-scanner-v1.js.map +1 -0
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +3 -0
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +24 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -1
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts.map +1 -1
- package/dist/inspector-findings.js +58 -81
- package/dist/inspector-findings.js.map +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +86 -10
- package/dist/knowledge-base.js.map +1 -1
- package/dist/local-git-metadata.d.ts +5 -0
- package/dist/local-git-metadata.d.ts.map +1 -0
- package/dist/local-git-metadata.js +130 -0
- package/dist/local-git-metadata.js.map +1 -0
- package/dist/multiscan.d.ts +6 -4
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +160 -77
- package/dist/multiscan.js.map +1 -1
- package/dist/native-json-findings.d.ts +2 -1
- package/dist/native-json-findings.d.ts.map +1 -1
- package/dist/native-json-findings.js +12 -2
- package/dist/native-json-findings.js.map +1 -1
- package/dist/opengrep-findings.d.ts +1 -0
- package/dist/opengrep-findings.d.ts.map +1 -1
- package/dist/opengrep-findings.js +49 -31
- package/dist/opengrep-findings.js.map +1 -1
- package/dist/operation-telemetry.d.ts +104 -0
- package/dist/operation-telemetry.d.ts.map +1 -0
- package/dist/operation-telemetry.js +293 -0
- package/dist/operation-telemetry.js.map +1 -0
- package/dist/patch-tui.d.ts.map +1 -1
- package/dist/patch-tui.js +90 -35
- package/dist/patch-tui.js.map +1 -1
- package/dist/plugin-python-probe.d.ts +4 -0
- package/dist/plugin-python-probe.d.ts.map +1 -0
- package/dist/plugin-python-probe.js +10 -0
- package/dist/plugin-python-probe.js.map +1 -0
- package/dist/private-finding-import.d.ts +341 -0
- package/dist/private-finding-import.d.ts.map +1 -0
- package/dist/private-finding-import.js +411 -0
- package/dist/private-finding-import.js.map +1 -0
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +2 -2
- package/dist/project-config.js.map +1 -1
- package/dist/provider-profile.d.ts +11 -3
- package/dist/provider-profile.d.ts.map +1 -1
- package/dist/provider-profile.js +80 -11
- package/dist/provider-profile.js.map +1 -1
- package/dist/publication-telemetry.d.ts +45 -0
- package/dist/publication-telemetry.d.ts.map +1 -0
- package/dist/publication-telemetry.js +50 -0
- package/dist/publication-telemetry.js.map +1 -0
- package/dist/publication.js +7 -1
- package/dist/publication.js.map +1 -1
- package/dist/publish.d.ts +4 -0
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +42 -2
- package/dist/publish.js.map +1 -1
- package/dist/reader-selection.d.ts +15 -0
- package/dist/reader-selection.d.ts.map +1 -0
- package/dist/reader-selection.js +89 -0
- package/dist/reader-selection.js.map +1 -0
- package/dist/record.d.ts +6 -1
- package/dist/record.d.ts.map +1 -1
- package/dist/record.js +53 -2
- package/dist/record.js.map +1 -1
- package/dist/remediation.d.ts +3 -1
- package/dist/remediation.d.ts.map +1 -1
- package/dist/remediation.js +28 -2
- package/dist/remediation.js.map +1 -1
- package/dist/request-metadata.d.ts +3 -0
- package/dist/request-metadata.d.ts.map +1 -1
- package/dist/request-metadata.js +9 -0
- package/dist/request-metadata.js.map +1 -1
- package/dist/result.d.ts +6 -0
- package/dist/result.d.ts.map +1 -1
- package/dist/result.js +3 -1
- package/dist/result.js.map +1 -1
- package/dist/retry-windows-rename.d.ts +8 -0
- package/dist/retry-windows-rename.d.ts.map +1 -0
- package/dist/retry-windows-rename.js +24 -0
- package/dist/retry-windows-rename.js.map +1 -0
- package/dist/runtime.d.ts +22 -1
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +408 -162
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +1 -0
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +18 -15
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-activity.d.ts.map +1 -1
- package/dist/scan-activity.js +172 -64
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-comparison.d.ts +10 -5
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +68 -25
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +7 -6
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +91 -79
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts +12 -1
- package/dist/scan-executor.d.ts.map +1 -1
- package/dist/scan-executor.js +22 -2
- package/dist/scan-executor.js.map +1 -1
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +31 -28
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-logs.d.ts +12 -0
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +106 -77
- package/dist/scan-logs.js.map +1 -1
- package/dist/scan-measurement.d.ts +26 -0
- package/dist/scan-measurement.d.ts.map +1 -0
- package/dist/scan-measurement.js +77 -0
- package/dist/scan-measurement.js.map +1 -0
- package/dist/scan-progress.d.ts +1 -0
- package/dist/scan-progress.d.ts.map +1 -1
- package/dist/scan-progress.js +3 -0
- package/dist/scan-progress.js.map +1 -1
- package/dist/scan-sessions.d.ts.map +1 -1
- package/dist/scan-sessions.js +4 -1
- package/dist/scan-sessions.js.map +1 -1
- package/dist/scan-settings.d.ts +1 -1
- package/dist/scan-settings.d.ts.map +1 -1
- package/dist/scan-settings.js +1 -24
- package/dist/scan-settings.js.map +1 -1
- package/dist/scanner-import.d.ts +64 -6
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +406 -48
- package/dist/scanner-import.js.map +1 -1
- package/dist/scanner-repository-url.d.ts +17 -0
- package/dist/scanner-repository-url.d.ts.map +1 -0
- package/dist/scanner-repository-url.js +71 -0
- package/dist/scanner-repository-url.js.map +1 -0
- package/dist/security-policy.d.ts +1 -1
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js.map +1 -1
- package/dist/semgrep-findings.d.ts +6 -3
- package/dist/semgrep-findings.d.ts.map +1 -1
- package/dist/semgrep-findings.js +124 -88
- package/dist/semgrep-findings.js.map +1 -1
- package/dist/semgrep-guardian-findings.d.ts +38 -0
- package/dist/semgrep-guardian-findings.d.ts.map +1 -0
- package/dist/semgrep-guardian-findings.js +165 -0
- package/dist/semgrep-guardian-findings.js.map +1 -0
- package/dist/semgrep-platform-collector.d.ts +26 -0
- package/dist/semgrep-platform-collector.d.ts.map +1 -0
- package/dist/semgrep-platform-collector.js +108 -0
- package/dist/semgrep-platform-collector.js.map +1 -0
- package/dist/semgrep-platform-findings.d.ts +213 -0
- package/dist/semgrep-platform-findings.d.ts.map +1 -0
- package/dist/semgrep-platform-findings.js +1078 -0
- package/dist/semgrep-platform-findings.js.map +1 -0
- package/dist/semgrep-platform-v1.d.ts +6 -0
- package/dist/semgrep-platform-v1.d.ts.map +1 -0
- package/dist/semgrep-platform-v1.js +83 -0
- package/dist/semgrep-platform-v1.js.map +1 -0
- package/dist/server/api.d.ts +1 -1
- package/dist/server/api.d.ts.map +1 -1
- package/dist/server/api.js.map +1 -1
- package/dist/server/embedding-tokenizer.cdx.json +33 -0
- package/dist/server/embedding-tokenizer.d.ts +2 -0
- package/dist/server/embedding-tokenizer.d.ts.map +1 -0
- package/dist/server/embedding-tokenizer.js +322 -0
- package/dist/server/embedding-tokenizer.js.map +6 -0
- package/dist/server/embeddings.d.ts +16 -2
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +35 -5
- package/dist/server/embeddings.js.map +1 -1
- package/dist/session-lines.d.ts +5 -0
- package/dist/session-lines.d.ts.map +1 -0
- package/dist/session-lines.js +60 -0
- package/dist/session-lines.js.map +1 -0
- package/dist/severity-review.d.ts +3 -1
- package/dist/severity-review.d.ts.map +1 -1
- package/dist/severity-review.js +3 -2
- package/dist/severity-review.js.map +1 -1
- package/dist/severity-rubric.d.ts +20 -0
- package/dist/severity-rubric.d.ts.map +1 -0
- package/dist/severity-rubric.js +73 -0
- package/dist/severity-rubric.js.map +1 -0
- package/dist/severity-store.js +15 -5
- package/dist/severity-store.js.map +1 -1
- package/dist/skill-authentication.d.ts +1 -0
- package/dist/skill-authentication.d.ts.map +1 -1
- package/dist/skill-authentication.js +1 -0
- package/dist/skill-authentication.js.map +1 -1
- package/dist/snyk-findings.d.ts +7 -2
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +108 -84
- package/dist/snyk-findings.js.map +1 -1
- package/dist/snyk-rest-findings.d.ts +76 -0
- package/dist/snyk-rest-findings.d.ts.map +1 -0
- package/dist/snyk-rest-findings.js +1051 -0
- package/dist/snyk-rest-findings.js.map +1 -0
- package/dist/snyk-rest-v1.d.ts +28 -0
- package/dist/snyk-rest-v1.d.ts.map +1 -0
- package/dist/snyk-rest-v1.js +132 -0
- package/dist/snyk-rest-v1.js.map +1 -0
- package/dist/snyk-token-origin.d.ts +4 -0
- package/dist/snyk-token-origin.d.ts.map +1 -0
- package/dist/snyk-token-origin.js +82 -0
- package/dist/snyk-token-origin.js.map +1 -0
- package/dist/sonar-collector.d.ts +16 -0
- package/dist/sonar-collector.d.ts.map +1 -0
- package/dist/sonar-collector.js +380 -0
- package/dist/sonar-collector.js.map +1 -0
- package/dist/sonar-findings.d.ts +49 -0
- package/dist/sonar-findings.d.ts.map +1 -0
- package/dist/sonar-findings.js +288 -0
- package/dist/sonar-findings.js.map +1 -0
- package/dist/sonar-import.d.ts +111 -0
- package/dist/sonar-import.d.ts.map +1 -0
- package/dist/sonar-import.js +277 -0
- package/dist/sonar-import.js.map +1 -0
- package/dist/suggest-owners.d.ts.map +1 -1
- package/dist/suggest-owners.js +2 -1
- package/dist/suggest-owners.js.map +1 -1
- package/dist/target-drift.d.ts +9 -0
- package/dist/target-drift.d.ts.map +1 -0
- package/dist/target-drift.js +27 -0
- package/dist/target-drift.js.map +1 -0
- package/dist/targets.d.ts +5 -0
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +73 -31
- package/dist/targets.js.map +1 -1
- package/dist/tenable-findings.d.ts +9 -0
- package/dist/tenable-findings.d.ts.map +1 -0
- package/dist/tenable-findings.js +122 -0
- package/dist/tenable-findings.js.map +1 -0
- package/dist/terminal-columns.d.ts +4 -0
- package/dist/terminal-columns.d.ts.map +1 -0
- package/dist/terminal-columns.js +19 -0
- package/dist/terminal-columns.js.map +1 -0
- package/dist/terminal-stream.d.ts +13 -0
- package/dist/terminal-stream.d.ts.map +1 -0
- package/dist/terminal-stream.js +35 -0
- package/dist/terminal-stream.js.map +1 -0
- package/dist/trivy-findings.d.ts +19 -0
- package/dist/trivy-findings.d.ts.map +1 -0
- package/dist/trivy-findings.js +435 -0
- package/dist/trivy-findings.js.map +1 -0
- package/dist/trivy-import.d.ts +19 -0
- package/dist/trivy-import.d.ts.map +1 -0
- package/dist/trivy-import.js +151 -0
- package/dist/trivy-import.js.map +1 -0
- package/dist/validation-records.d.ts +0 -3
- package/dist/validation-records.d.ts.map +1 -1
- package/dist/validation-records.js +1 -17
- package/dist/validation-records.js.map +1 -1
- package/dist/veracode-findings.d.ts +9 -0
- package/dist/veracode-findings.d.ts.map +1 -0
- package/dist/veracode-findings.js +409 -0
- package/dist/veracode-findings.js.map +1 -0
- package/dist/vertex-pricing.d.ts +8 -0
- package/dist/vertex-pricing.d.ts.map +1 -0
- package/dist/vertex-pricing.js +20 -0
- package/dist/vertex-pricing.js.map +1 -0
- package/dist/windows-path.d.ts +1 -0
- package/dist/windows-path.d.ts.map +1 -1
- package/dist/windows-path.js +27 -1
- package/dist/windows-path.js.map +1 -1
- package/dist/wiz-csv.d.ts +2 -2
- package/dist/wiz-csv.d.ts.map +1 -1
- package/dist/wiz-csv.js +1 -3
- package/dist/wiz-csv.js.map +1 -1
- package/dist/wiz-findings.d.ts +14 -2
- package/dist/wiz-findings.d.ts.map +1 -1
- package/dist/wiz-findings.js +143 -50
- package/dist/wiz-findings.js.map +1 -1
- package/docs/classify-severity-records.md +28 -13
- package/docs/cli.md +623 -843
- package/docs/dedupe-records.md +54 -24
- package/docs/findings-service.md +87 -47
- package/docs/hosted-remediation.md +14 -7
- package/docs/hosted-scans.md +64 -41
- package/docs/telemetry.md +236 -0
- package/docs/validate-records.md +78 -44
- package/package.json +19 -17
- package/schemas/external-findings.schema.json +14 -1
- package/schemas/hosted-scan-v2.fixture.json +16 -1
- package/_bundled_plugin/mcp/helpers.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/helpers.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-002 +0 -0
- package/_bundled_plugin/schemas/tools/deep-reducer.schema.json +0 -96
- package/_bundled_plugin/scripts/validate_tracking_source.py +0 -82
- package/_bundled_plugin/scripts/workbench_local_dedupe.py +0 -136
- package/dist/deduplication/records-protocol.d.ts +0 -4
- package/dist/deduplication/records-protocol.d.ts.map +0 -1
- package/dist/deduplication/records-protocol.js +0 -49
- package/dist/deduplication/records-protocol.js.map +0 -1
- package/dist/external-imports-feature.d.ts +0 -6
- package/dist/external-imports-feature.d.ts.map +0 -1
- package/dist/external-imports-feature.js +0 -51
- package/dist/external-imports-feature.js.map +0 -1
- package/dist/finding-normalization.d.ts +0 -5
- package/dist/finding-normalization.d.ts.map +0 -1
- package/dist/finding-normalization.js +0 -120
- package/dist/finding-normalization.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
"""
|
|
1
|
+
"""Persist workbench state, transfer scan ownership, and recover results from saved artifacts."""
|
|
@@ -12,18 +12,47 @@ RECOVERY_HANDOFF_TOKEN_PREFIX = "recovery_"
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
def require_handoff_claim_token(value: str) -> str:
|
|
15
|
+
"""Normalize the claim UUID, retaining the prefix that marks a recovery handoff."""
|
|
15
16
|
recovery_token = value.startswith(RECOVERY_HANDOFF_TOKEN_PREFIX)
|
|
16
17
|
token = value.removeprefix(RECOVERY_HANDOFF_TOKEN_PREFIX) if recovery_token else value
|
|
17
18
|
normalized = require_uuid(token, "claim-token")
|
|
18
19
|
return f"{RECOVERY_HANDOFF_TOKEN_PREFIX}{normalized}" if recovery_token else normalized
|
|
19
20
|
|
|
20
21
|
|
|
22
|
+
def require_tokenless_scan_owner(
|
|
23
|
+
connection: sqlite3.Connection,
|
|
24
|
+
scan: sqlite3.Row,
|
|
25
|
+
model_thread_id: str | None,
|
|
26
|
+
) -> None:
|
|
27
|
+
"""Check model callers against a recorded owner. Trusted local callers omit model_thread_id."""
|
|
28
|
+
if model_thread_id is None or scan["handoff_claim_token"] is not None:
|
|
29
|
+
return
|
|
30
|
+
if scan["handoff_status"] == "pending":
|
|
31
|
+
raise SystemExit(
|
|
32
|
+
"This Codex Security scan handoff has not been delivered. "
|
|
33
|
+
"Claim the pending Codex Security scan handoff before continuing."
|
|
34
|
+
)
|
|
35
|
+
owner = scan["continuation_thread_id"] or scan["deep_scan_owner_thread_id"]
|
|
36
|
+
if owner is None:
|
|
37
|
+
owner = connection.execute(
|
|
38
|
+
"SELECT thread_id FROM workspaces WHERE id = ?", (scan["workspace_id"],)
|
|
39
|
+
).fetchone()[0]
|
|
40
|
+
if owner is None:
|
|
41
|
+
# Only a completed import is intentionally ownerless among registered scans.
|
|
42
|
+
completed_import = scan["launch_kind"] == "import" and scan["status"] == "complete"
|
|
43
|
+
if scan["recipe_json"] is not None and not completed_import:
|
|
44
|
+
raise SystemExit("This scan is awaiting its owning Codex thread.")
|
|
45
|
+
elif owner != model_thread_id:
|
|
46
|
+
raise SystemExit("This scan requires its owning Codex thread.")
|
|
47
|
+
|
|
48
|
+
|
|
21
49
|
def require_current_continuation(
|
|
22
50
|
scan: sqlite3.Row,
|
|
23
51
|
claim_token: str | None,
|
|
24
52
|
*,
|
|
25
53
|
error_message: str,
|
|
26
54
|
) -> None:
|
|
55
|
+
"""Require the current claim token, allowing a tokenless continuation for legacy delivered scans."""
|
|
27
56
|
if (
|
|
28
57
|
scan["handoff_status"] == "delivered"
|
|
29
58
|
and scan["handoff_claim_token"] is None
|
|
@@ -41,6 +70,7 @@ def validate_handoff_delivery_thread(
|
|
|
41
70
|
requesting_thread_id: str,
|
|
42
71
|
claim_token: str,
|
|
43
72
|
) -> None:
|
|
73
|
+
"""Require the owning thread for delivery unless the caller presents a recovery claim token."""
|
|
44
74
|
if owning_thread_id != requesting_thread_id and not claim_token.startswith(
|
|
45
75
|
RECOVERY_HANDOFF_TOKEN_PREFIX
|
|
46
76
|
):
|
|
@@ -54,6 +84,12 @@ def claim_handoff_delivery(
|
|
|
54
84
|
connection: sqlite3.Connection,
|
|
55
85
|
args: argparse.Namespace,
|
|
56
86
|
) -> dict[str, Any]:
|
|
87
|
+
"""Claim a pending handoff and return the current workspace state.
|
|
88
|
+
|
|
89
|
+
The first claim wins. When take_over_stale is requested, replacing an expired
|
|
90
|
+
claim also clears the continuation and deep scan owner. Retrying the same claim
|
|
91
|
+
or losing a competing claim returns the workspace state without changing ownership.
|
|
92
|
+
"""
|
|
57
93
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
58
94
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
59
95
|
timestamp = wb.now()
|
|
@@ -102,6 +138,7 @@ def release_handoff_delivery(
|
|
|
102
138
|
connection: sqlite3.Connection,
|
|
103
139
|
args: argparse.Namespace,
|
|
104
140
|
) -> dict[str, Any]:
|
|
141
|
+
"""Release a matching pending claim, detach its continuation, and return the workspace state."""
|
|
105
142
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
106
143
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
107
144
|
timestamp = wb.now()
|
|
@@ -126,6 +163,11 @@ def attach_scan_continuation_thread(
|
|
|
126
163
|
connection: sqlite3.Connection,
|
|
127
164
|
args: argparse.Namespace,
|
|
128
165
|
) -> dict[str, Any]:
|
|
166
|
+
"""Bind the claimed scan to a continuation and return its workspace state.
|
|
167
|
+
|
|
168
|
+
An immediate transaction serializes ownership changes. Reattaching the same
|
|
169
|
+
thread is idempotent. A different thread or mismatched claim token raises SystemExit.
|
|
170
|
+
"""
|
|
129
171
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
130
172
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
131
173
|
thread_id = optional_text(args.thread_id, maximum=512)
|
|
@@ -165,6 +207,11 @@ def mark_handoff_delivered(
|
|
|
165
207
|
connection: sqlite3.Connection,
|
|
166
208
|
args: argparse.Namespace,
|
|
167
209
|
) -> dict[str, Any]:
|
|
210
|
+
"""Record delivery for the pending claim and return the workspace state.
|
|
211
|
+
|
|
212
|
+
For standard scans this resets preflight progress. The same claim can confirm
|
|
213
|
+
delivery again. A conflicting claim or invalid requesting thread raises SystemExit.
|
|
214
|
+
"""
|
|
168
215
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
169
216
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
170
217
|
thread_id = optional_text(args.thread_id, maximum=512)
|
|
@@ -47,6 +47,7 @@ from workbench.retained_records import (
|
|
|
47
47
|
same_raw_value,
|
|
48
48
|
)
|
|
49
49
|
from workbench.saved_coverage import (
|
|
50
|
+
SavedCoverageProjection,
|
|
50
51
|
_coverage_rows,
|
|
51
52
|
_has_candidate_metadata,
|
|
52
53
|
_inherit_coverage_sources,
|
|
@@ -69,7 +70,8 @@ from workbench.saved_sources import (
|
|
|
69
70
|
_frozen_checkpoint_heads,
|
|
70
71
|
_frozen_source_times,
|
|
71
72
|
_is_source_order_snapshot,
|
|
72
|
-
|
|
73
|
+
_iteration_order,
|
|
74
|
+
_latest_iteration,
|
|
73
75
|
_model_capture,
|
|
74
76
|
_parent_publication_ancestors,
|
|
75
77
|
_read_saved_parent_result,
|
|
@@ -114,7 +116,13 @@ def merge_saved_results(
|
|
|
114
116
|
current_contract: bool = False,
|
|
115
117
|
recovery_snapshot_error: _CheckpointSnapshotError | None = None,
|
|
116
118
|
) -> tuple[dict[str, Any], dict[str, Any], dict[str, Any]] | None:
|
|
117
|
-
"""
|
|
119
|
+
"""Reconcile the bound parent and worker checkpoints into an unsealed scan draft.
|
|
120
|
+
|
|
121
|
+
Return the manifest, findings document, and coverage document, or None when there
|
|
122
|
+
is no saved input or the sealed parent already reflects the selected checkpoints.
|
|
123
|
+
Frozen digests and heads identify the inputs selected when the scan stopped.
|
|
124
|
+
Recovery appends diagnostics to the caller's warnings list.
|
|
125
|
+
"""
|
|
118
126
|
initial_warnings = set(warnings)
|
|
119
127
|
if frozen_source_digests is None:
|
|
120
128
|
checkpoint_heads = {}
|
|
@@ -254,7 +262,7 @@ def merge_saved_results(
|
|
|
254
262
|
reducer_paths: set[str] = set()
|
|
255
263
|
current_results: set[str] = set()
|
|
256
264
|
reducer_outputs: list[tuple[Any, str, list[str], int]] = []
|
|
257
|
-
reducer =
|
|
265
|
+
reducer = _latest_iteration(workers)
|
|
258
266
|
latest_reducer: str | None = None
|
|
259
267
|
if reducer is not None:
|
|
260
268
|
try:
|
|
@@ -619,18 +627,16 @@ def merge_saved_results(
|
|
|
619
627
|
if previous is not None and isinstance(previous.get("id"), str):
|
|
620
628
|
result["id"] = previous["id"]
|
|
621
629
|
else:
|
|
622
|
-
surfaces = coverage.get("surfaces", [])
|
|
623
630
|
if any(
|
|
624
631
|
isinstance(row, dict) and row.get("id") == result["id"]
|
|
625
|
-
for row in (
|
|
632
|
+
for row in _coverage_rows(coverage, "surfaces")
|
|
626
633
|
):
|
|
627
634
|
result["id"] = f"{result['id']}-{_digest(result)[:16]}"
|
|
628
635
|
elif field == "deferred":
|
|
629
636
|
result["id"] = f"{prefix}-deferred-{index}"
|
|
630
637
|
if isinstance(item.get("surfaceIds"), list):
|
|
631
638
|
surface_ids: dict[str, str] = {}
|
|
632
|
-
|
|
633
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
639
|
+
for surface in _coverage_rows(projected_coverage, "surfaces"):
|
|
634
640
|
if not isinstance(surface, dict) or not isinstance(surface.get("id"), str):
|
|
635
641
|
continue
|
|
636
642
|
provenance = surface.get("provenance", {})
|
|
@@ -641,9 +647,8 @@ def merge_saved_results(
|
|
|
641
647
|
and isinstance(provenance.get("sourceId"), str)
|
|
642
648
|
):
|
|
643
649
|
surface_ids.setdefault(provenance["sourceId"], surface["id"])
|
|
644
|
-
surfaces = source.get("surfaces", [])
|
|
645
650
|
source_surface_ids: dict[str, tuple[int, dict[str, Any]]] = {}
|
|
646
|
-
for offset, surface in enumerate(
|
|
651
|
+
for offset, surface in enumerate(_coverage_rows(source, "surfaces"), 1):
|
|
647
652
|
if isinstance(surface, dict) and isinstance(surface.get("id"), str):
|
|
648
653
|
source_surface_ids.setdefault(surface["id"], (offset, surface))
|
|
649
654
|
for (owner, source_id), accepted in accepted_surfaces.items():
|
|
@@ -678,7 +683,7 @@ def merge_saved_results(
|
|
|
678
683
|
|
|
679
684
|
workers_by_id = {worker["id"]: worker for worker in workers}
|
|
680
685
|
latest_reducer_key = (
|
|
681
|
-
(reducer
|
|
686
|
+
(_iteration_order(reducer), int(reducer["attempt"] or 0))
|
|
682
687
|
if reducer is not None and latest_reducer in drafts_by_path
|
|
683
688
|
else None
|
|
684
689
|
)
|
|
@@ -691,7 +696,7 @@ def merge_saved_results(
|
|
|
691
696
|
):
|
|
692
697
|
continue
|
|
693
698
|
current_results.add(result_path)
|
|
694
|
-
candidate_key = (worker
|
|
699
|
+
candidate_key = (_iteration_order(worker), attempt)
|
|
695
700
|
if latest_reducer_key is None or candidate_key > latest_reducer_key:
|
|
696
701
|
latest_reducer_key = candidate_key
|
|
697
702
|
latest_reducer = result_path
|
|
@@ -730,29 +735,16 @@ def merge_saved_results(
|
|
|
730
735
|
parent_model_source = latest_reducer
|
|
731
736
|
|
|
732
737
|
projected_coverage = saved_parent["reviewState"] if saved_parent else {}
|
|
733
|
-
reviews = projected_coverage.get("reviews")
|
|
734
|
-
reviewed_attempts = {
|
|
735
|
-
(review.get("workerId"), review.get("attempt"))
|
|
736
|
-
for review in (reviews if isinstance(reviews, list) else [])
|
|
737
|
-
if isinstance(review, dict)
|
|
738
|
-
and isinstance(review.get("workerId"), str)
|
|
739
|
-
and isinstance(review.get("attempt"), int)
|
|
740
|
-
}
|
|
741
738
|
# Reconcile raw source IDs and timestamps before projecting accepted outputs.
|
|
742
739
|
accepted_sources = {
|
|
743
|
-
relative
|
|
740
|
+
(worker_id, relative): draft
|
|
744
741
|
for relative, draft, worker_id in sources
|
|
745
742
|
if (worker := workers_by_id.get(worker_id)) is not None
|
|
746
743
|
and worker["status"] == "succeeded"
|
|
747
744
|
and worker["result_manifest_path"] == str(scan_dir / relative)
|
|
748
745
|
and draft.get("complete") is not False
|
|
749
746
|
}
|
|
750
|
-
|
|
751
|
-
(worker_id, workers_by_id[worker_id]["attempt"])
|
|
752
|
-
for relative, _, worker_id in sources
|
|
753
|
-
if relative in accepted_sources
|
|
754
|
-
)
|
|
755
|
-
projection = prepare_saved_coverage_projection(
|
|
747
|
+
project_worker_coverage, legacy_surface_links = prepare_saved_coverage_projection(
|
|
756
748
|
sources,
|
|
757
749
|
parent,
|
|
758
750
|
source_order,
|
|
@@ -762,7 +754,6 @@ def merge_saved_results(
|
|
|
762
754
|
scan_dir, row, workers_by_id[owner], relative
|
|
763
755
|
),
|
|
764
756
|
)
|
|
765
|
-
project_worker_coverage = projection.project_worker_coverage
|
|
766
757
|
|
|
767
758
|
def retain_coverage_row(output, item, owner, field, original=None, qualified=False):
|
|
768
759
|
retained = projection.retain_coverage_row(output, item, owner, field, original, qualified)
|
|
@@ -776,15 +767,12 @@ def merge_saved_results(
|
|
|
776
767
|
retained_surface_rows.add(id(source))
|
|
777
768
|
return retained
|
|
778
769
|
|
|
779
|
-
accepted_coverage_sources = {
|
|
780
|
-
|
|
781
|
-
}
|
|
770
|
+
accepted_coverage_sources = {id(draft["reviewState"]) for draft in accepted_sources.values()}
|
|
771
|
+
accepted_by_worker = {}
|
|
782
772
|
accepted_surfaces: dict[tuple[str, str], list[tuple[int, dict[str, Any]]]] = {}
|
|
783
|
-
for relative, draft
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
surfaces = draft["reviewState"].get("surfaces", [])
|
|
787
|
-
for index, surface in enumerate(surfaces if isinstance(surfaces, list) else [], 1):
|
|
773
|
+
for (worker_id, relative), draft in accepted_sources.items():
|
|
774
|
+
accepted_by_worker.setdefault(worker_id, (relative, draft["reviewState"]))
|
|
775
|
+
for index, surface in enumerate(_coverage_rows(draft["reviewState"], "surfaces"), 1):
|
|
788
776
|
if isinstance(surface, dict) and isinstance(surface.get("id"), str):
|
|
789
777
|
accepted_surfaces.setdefault((worker_id, surface["id"]), []).append(
|
|
790
778
|
(index, surface)
|
|
@@ -800,15 +788,14 @@ def merge_saved_results(
|
|
|
800
788
|
id(item): (worker_id, relative, field, index, draft["reviewState"])
|
|
801
789
|
for relative, draft, worker_id in sources
|
|
802
790
|
for field in ("surfaces", "explicitExclusions", "deferred", "openQuestions")
|
|
803
|
-
for index, item in enumerate(
|
|
804
|
-
draft["reviewState"].get(field, [])
|
|
805
|
-
if isinstance(draft["reviewState"].get(field, []), list)
|
|
806
|
-
else [],
|
|
807
|
-
1,
|
|
808
|
-
)
|
|
791
|
+
for index, item in enumerate(_coverage_rows(draft["reviewState"], field), 1)
|
|
809
792
|
if isinstance(item, dict)
|
|
810
793
|
}
|
|
811
794
|
|
|
795
|
+
projection = SavedCoverageProjection(
|
|
796
|
+
project_worker_coverage, legacy_surface_links, projection_origins
|
|
797
|
+
)
|
|
798
|
+
|
|
812
799
|
def project_record(
|
|
813
800
|
field: str,
|
|
814
801
|
item: dict[str, Any],
|
|
@@ -821,7 +808,7 @@ def merge_saved_results(
|
|
|
821
808
|
if origin is None:
|
|
822
809
|
return item
|
|
823
810
|
worker_id, relative, _, index, source = origin
|
|
824
|
-
if relative not in accepted_sources:
|
|
811
|
+
if (worker_id, relative) not in accepted_sources:
|
|
825
812
|
directory = Path(relative).parent
|
|
826
813
|
if directory.name == "checkpoints":
|
|
827
814
|
directory = directory.parent
|
|
@@ -833,14 +820,7 @@ def merge_saved_results(
|
|
|
833
820
|
return item
|
|
834
821
|
# Reproduced outputs and links from omitted checkpoints use the
|
|
835
822
|
# accepted worker's surface namespace.
|
|
836
|
-
accepted =
|
|
837
|
-
(
|
|
838
|
-
(path, draft["reviewState"])
|
|
839
|
-
for path, draft, owner in sources
|
|
840
|
-
if owner == worker_id and path in accepted_sources
|
|
841
|
-
),
|
|
842
|
-
None,
|
|
843
|
-
)
|
|
823
|
+
accepted = accepted_by_worker.get(worker_id)
|
|
844
824
|
if accepted is not None and source == accepted[1]:
|
|
845
825
|
relative, source = accepted
|
|
846
826
|
elif relative not in selected_observations or accepted is None:
|
|
@@ -861,7 +841,6 @@ def merge_saved_results(
|
|
|
861
841
|
return result
|
|
862
842
|
|
|
863
843
|
all_sources = ([("parent", parent, None)] if parent else []) + sources
|
|
864
|
-
source_owners = {relative: owner for relative, _, owner in all_sources}
|
|
865
844
|
inferred_coverage_ids: set[int] = set()
|
|
866
845
|
# Older checkpoints can omit IDs already assigned in their published output.
|
|
867
846
|
for field in ("deferred", "surfaces"):
|
|
@@ -907,11 +886,7 @@ def merge_saved_results(
|
|
|
907
886
|
surface_ids_by_source: dict[tuple[str, str], list[str]] = {
|
|
908
887
|
(relative, row["id"]): []
|
|
909
888
|
for relative, draft, _ in all_sources
|
|
910
|
-
for row in (
|
|
911
|
-
draft["reviewState"].get("surfaces", [])
|
|
912
|
-
if isinstance(draft["reviewState"].get("surfaces"), list)
|
|
913
|
-
else []
|
|
914
|
-
)
|
|
889
|
+
for row in _coverage_rows(draft["reviewState"], "surfaces")
|
|
915
890
|
if isinstance(row, dict) and isinstance(row.get("id"), str)
|
|
916
891
|
}
|
|
917
892
|
discarded_coverage_sources: set[str] = set()
|
|
@@ -1169,8 +1144,7 @@ def merge_saved_results(
|
|
|
1169
1144
|
retained_surface_rows: set[int] = set()
|
|
1170
1145
|
for relative, draft, _ in all_sources:
|
|
1171
1146
|
for field in ("surfaces", "deferred"):
|
|
1172
|
-
|
|
1173
|
-
for row in rows if isinstance(rows, list) else []:
|
|
1147
|
+
for row in _coverage_rows(draft["reviewState"], field):
|
|
1174
1148
|
if isinstance(row, dict):
|
|
1175
1149
|
paths_for_row = coverage_sources.setdefault(id(row), (row, []))[1]
|
|
1176
1150
|
if relative not in paths_for_row:
|
|
@@ -1320,9 +1294,7 @@ def merge_saved_results(
|
|
|
1320
1294
|
selected_reported_candidates.get(key, source_order[relative]),
|
|
1321
1295
|
source_order[relative],
|
|
1322
1296
|
)
|
|
1323
|
-
for relative, draft
|
|
1324
|
-
if relative not in accepted_sources:
|
|
1325
|
-
continue
|
|
1297
|
+
for (worker_id, relative), draft in accepted_sources.items():
|
|
1326
1298
|
worker = workers_by_id[worker_id]
|
|
1327
1299
|
reported = {
|
|
1328
1300
|
finding_candidate_id(finding)
|
|
@@ -1330,8 +1302,7 @@ def merge_saved_results(
|
|
|
1330
1302
|
if isinstance(finding, dict) and valid_finding(finding)
|
|
1331
1303
|
}
|
|
1332
1304
|
for field in ("surfaces", "deferred", "explicitExclusions"):
|
|
1333
|
-
|
|
1334
|
-
for index, row in enumerate(rows if isinstance(rows, list) else [], 1):
|
|
1305
|
+
for index, row in enumerate(_coverage_rows(draft["reviewState"], field), 1):
|
|
1335
1306
|
if not isinstance(row, dict):
|
|
1336
1307
|
continue
|
|
1337
1308
|
if (
|
|
@@ -1453,8 +1424,7 @@ def merge_saved_results(
|
|
|
1453
1424
|
|
|
1454
1425
|
pending_surface_orders: dict[tuple[str | None, str], tuple[int, int]] = {}
|
|
1455
1426
|
for relative, draft, owner in all_sources:
|
|
1456
|
-
|
|
1457
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
1427
|
+
for surface in _coverage_rows(draft["reviewState"], "surfaces"):
|
|
1458
1428
|
if (
|
|
1459
1429
|
isinstance(surface, dict)
|
|
1460
1430
|
and surface.get("disposition") == "needs_follow_up"
|
|
@@ -2675,7 +2645,7 @@ def merge_saved_results(
|
|
|
2675
2645
|
projection = type(initial_projection)(
|
|
2676
2646
|
initial_projection.project_worker_coverage,
|
|
2677
2647
|
initial_projection.legacy_surface_links,
|
|
2678
|
-
|
|
2648
|
+
projection_origins,
|
|
2679
2649
|
)
|
|
2680
2650
|
# Apply reconciled outcomes to coverage already copied from the parent too.
|
|
2681
2651
|
for field in ("surfaces", "deferred"):
|
|
@@ -2955,16 +2925,10 @@ def merge_saved_results(
|
|
|
2955
2925
|
worker = workers_by_id.get(worker_id)
|
|
2956
2926
|
# Only the accepted current output belongs to this worker attempt. An
|
|
2957
2927
|
# unsuperseded archive can remain evidence after that output is lost.
|
|
2958
|
-
project_coverage = (
|
|
2959
|
-
worker is not None
|
|
2960
|
-
and worker["status"] == "succeeded"
|
|
2961
|
-
and worker["result_manifest_path"] == str(scan_dir / relative)
|
|
2962
|
-
and draft.get("complete") is not False
|
|
2963
|
-
)
|
|
2928
|
+
project_coverage = (worker_id, relative) in accepted_sources
|
|
2964
2929
|
if coverage_superseded and not selected_candidates and not retain_pending:
|
|
2965
2930
|
continue
|
|
2966
2931
|
if project_coverage:
|
|
2967
|
-
reviewed_attempts.add((worker_id, worker["attempt"]))
|
|
2968
2932
|
reviews = coverage.setdefault("reviews", [])
|
|
2969
2933
|
if isinstance(reviews, list) and not any(
|
|
2970
2934
|
isinstance(review, dict)
|
|
@@ -3189,8 +3153,7 @@ def merge_saved_results(
|
|
|
3189
3153
|
item = {"id": "scan-stopped", "reason": reason}
|
|
3190
3154
|
if item not in coverage["deferred"]:
|
|
3191
3155
|
coverage["deferred"].append(item)
|
|
3192
|
-
|
|
3193
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
3156
|
+
for surface in _coverage_rows(coverage, "surfaces"):
|
|
3194
3157
|
if isinstance(surface, dict) and isinstance(surface.get("provenance"), dict):
|
|
3195
3158
|
surface["provenance"].pop("scanReceiptRefs", None)
|
|
3196
3159
|
if (
|
|
@@ -17,10 +17,10 @@ from finalize_scan_contract import (
|
|
|
17
17
|
_recover_unsealed_coverage,
|
|
18
18
|
_recover_unsealed_findings,
|
|
19
19
|
_require_safe_json_value,
|
|
20
|
-
_validate_current_findings,
|
|
21
20
|
_validate_schema_node,
|
|
22
21
|
finding_candidate_id,
|
|
23
22
|
)
|
|
23
|
+
from finalize_scan_contract import _schema_values_equal as same_raw_value
|
|
24
24
|
from workbench.saved_coverage import _coverage_rows, _saved_coverage_id
|
|
25
25
|
from workbench.saved_sources import _digest, _encoded
|
|
26
26
|
from workbench_coverage_receipts import resolve_coverage_receipts
|
|
@@ -243,6 +243,7 @@ def _append_previous_finding(
|
|
|
243
243
|
def _recover_preserved_worker_source(
|
|
244
244
|
scan_dir, relative, scan_id, binding, worker_id, worker, draft, warnings
|
|
245
245
|
):
|
|
246
|
+
"""Normalize findings and receipt references in the draft and return diagnostics for discarded findings."""
|
|
246
247
|
discarded_findings = []
|
|
247
248
|
# Recover imported records without relaxing canonical parent validation.
|
|
248
249
|
if "complete" in draft and not isinstance(draft["complete"], bool):
|
|
@@ -280,15 +281,8 @@ def _recover_preserved_worker_source(
|
|
|
280
281
|
schema_dir,
|
|
281
282
|
scan_dir / directory,
|
|
282
283
|
source_warnings,
|
|
284
|
+
current_contract=True,
|
|
283
285
|
)
|
|
284
|
-
if recovered["findings"]:
|
|
285
|
-
try:
|
|
286
|
-
_validate_current_findings(recovered, schema_dir)
|
|
287
|
-
except ContractError as exc:
|
|
288
|
-
warning = f"Skipped malformed finding: {exc}."
|
|
289
|
-
source_warnings.append(warning)
|
|
290
|
-
discarded.append(warning)
|
|
291
|
-
recovered["findings"] = []
|
|
292
286
|
if discarded:
|
|
293
287
|
discarded_findings.extend(discarded)
|
|
294
288
|
for recovered_finding in recovered["findings"]:
|
|
@@ -328,10 +322,10 @@ def _recover_preserved_worker_source(
|
|
|
328
322
|
def _recover_preserved_worker_coverage(
|
|
329
323
|
scan_dir, relative, worker_id, draft, discarded_findings, warnings
|
|
330
324
|
):
|
|
325
|
+
"""Repair coverage in the draft, append source warnings, and return whether coverage was discarded."""
|
|
331
326
|
discarded_coverage = False
|
|
332
327
|
for field in ("surfaces", "explicitExclusions", "deferred"):
|
|
333
|
-
|
|
334
|
-
for row in rows if isinstance(rows, list) else []:
|
|
328
|
+
for row in _coverage_rows(draft["reviewState"], field):
|
|
335
329
|
if isinstance(row, dict):
|
|
336
330
|
row.setdefault("id", _saved_coverage_id(row))
|
|
337
331
|
if field == "surfaces":
|
|
@@ -360,6 +354,7 @@ def _recover_preserved_worker_coverage(
|
|
|
360
354
|
|
|
361
355
|
|
|
362
356
|
def identifiers(value: dict[str, Any]) -> tuple[Any, Any]:
|
|
357
|
+
"""Return the report ID and ledger row ID from extensions, using None for missing or blank IDs."""
|
|
363
358
|
extensions = value.get("extensions")
|
|
364
359
|
return tuple(
|
|
365
360
|
identifier if _has_identity_text(identifier) else None
|
|
@@ -371,6 +366,7 @@ def identifiers(value: dict[str, Any]) -> tuple[Any, Any]:
|
|
|
371
366
|
|
|
372
367
|
|
|
373
368
|
def distinct_reports(left: dict[str, Any] | None, right: dict[str, Any] | None) -> bool:
|
|
369
|
+
"""Check the latest observations for conflicting report IDs or ledger row IDs."""
|
|
374
370
|
return (
|
|
375
371
|
left is not None
|
|
376
372
|
and right is not None
|
|
@@ -382,6 +378,7 @@ def distinct_reports(left: dict[str, Any] | None, right: dict[str, Any] | None)
|
|
|
382
378
|
|
|
383
379
|
|
|
384
380
|
def raw_owner(value: dict[str, Any], source_owner: str | None) -> str | None:
|
|
381
|
+
"""Return the source owner, falling back to the worker ID recorded in finding provenance."""
|
|
385
382
|
if source_owner is not None:
|
|
386
383
|
return source_owner
|
|
387
384
|
provenance = value.get("provenance", {})
|
|
@@ -390,6 +387,7 @@ def raw_owner(value: dict[str, Any], source_owner: str | None) -> str | None:
|
|
|
390
387
|
|
|
391
388
|
|
|
392
389
|
def raw_scope(value: dict[str, Any]) -> tuple[Any, ...]:
|
|
390
|
+
"""Return the rule, path, and line range of the first location used to match anonymous reports."""
|
|
393
391
|
# Match scanFindingIdentity's primary location for anonymous reports.
|
|
394
392
|
location = value["locations"][0]
|
|
395
393
|
return (
|
|
@@ -401,6 +399,7 @@ def raw_scope(value: dict[str, Any]) -> tuple[Any, ...]:
|
|
|
401
399
|
|
|
402
400
|
|
|
403
401
|
def same_raw_finding(left: dict[str, Any], right: dict[str, Any]) -> bool:
|
|
402
|
+
"""Check whether semantic identities match or, in their absence, whether candidate and report IDs are compatible."""
|
|
404
403
|
if isinstance(left.get("identity"), dict) and isinstance(right.get("identity"), dict):
|
|
405
404
|
return _semantic_identity_key(left, _finding_identity(left)) == _semantic_identity_key(
|
|
406
405
|
right, _finding_identity(right)
|
|
@@ -417,24 +416,9 @@ def same_raw_finding(left: dict[str, Any], right: dict[str, Any]) -> bool:
|
|
|
417
416
|
return True
|
|
418
417
|
|
|
419
418
|
|
|
420
|
-
def same_raw_value(left: Any, right: Any) -> bool:
|
|
421
|
-
if isinstance(left, dict):
|
|
422
|
-
return (
|
|
423
|
-
isinstance(right, dict)
|
|
424
|
-
and left.keys() == right.keys()
|
|
425
|
-
and all(same_raw_value(value, right[key]) for key, value in left.items())
|
|
426
|
-
)
|
|
427
|
-
if isinstance(left, list):
|
|
428
|
-
return (
|
|
429
|
-
isinstance(right, list)
|
|
430
|
-
and len(left) == len(right)
|
|
431
|
-
and all(same_raw_value(a, b) for a, b in zip(left, right, strict=True))
|
|
432
|
-
)
|
|
433
|
-
# JSON numbers compare by value, but booleans are a distinct scalar type.
|
|
434
|
-
return isinstance(left, bool) == isinstance(right, bool) and left == right
|
|
435
|
-
|
|
436
|
-
|
|
437
419
|
def same_raw_content(left: dict[str, Any], right: dict[str, Any]) -> bool:
|
|
420
|
+
"""Compare substantive finding fields while ignoring identity, provenance, and report-tracking IDs."""
|
|
421
|
+
|
|
438
422
|
def content(value: dict[str, Any]) -> dict[str, Any]:
|
|
439
423
|
result = _finding_content(value)
|
|
440
424
|
if isinstance(result.get("extensions"), dict):
|
|
@@ -451,6 +435,10 @@ def same_raw_content(left: dict[str, Any], right: dict[str, Any]) -> bool:
|
|
|
451
435
|
|
|
452
436
|
|
|
453
437
|
def contains_raw_value(current: Any, previous: Any) -> bool:
|
|
438
|
+
"""Check whether the current JSON value retains every part of the previous value.
|
|
439
|
+
|
|
440
|
+
Match dictionary values by key and list elements by content, regardless of order.
|
|
441
|
+
"""
|
|
454
442
|
if isinstance(previous, dict):
|
|
455
443
|
return isinstance(current, dict) and all(
|
|
456
444
|
key in current and contains_raw_value(current[key], value)
|
|
@@ -529,6 +517,7 @@ def _saved_candidate_outcomes(
|
|
|
529
517
|
workers_by_id,
|
|
530
518
|
coverage_schema,
|
|
531
519
|
):
|
|
520
|
+
"""Return saved candidate outcomes with their evidence and the ordering of pending candidates by owner."""
|
|
532
521
|
pending_candidate_orders: dict[tuple[str | None, str], tuple[int, int]] = {}
|
|
533
522
|
outcomes = []
|
|
534
523
|
for relative, draft, owner in current_drafts:
|
|
@@ -539,8 +528,7 @@ def _saved_candidate_outcomes(
|
|
|
539
528
|
}
|
|
540
529
|
pending_candidates = set()
|
|
541
530
|
for field in ("deferred", "surfaces"):
|
|
542
|
-
|
|
543
|
-
for item in items if isinstance(items, list) else []:
|
|
531
|
+
for item in _coverage_rows(draft["reviewState"], field):
|
|
544
532
|
if isinstance(item, dict) and (
|
|
545
533
|
field == "deferred" or item.get("disposition") == "needs_follow_up"
|
|
546
534
|
):
|