@openai/codex-security 0.8.3 → 0.10.0
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 +36 -746
- package/_bundled_plugin/.codex-plugin/plugin.json +2 -0
- package/_bundled_plugin/.mcp.json +7 -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 +5 -2
- 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/baseline-auditor.md +18 -0
- package/_bundled_plugin/references/core-scan.md +5 -42
- package/_bundled_plugin/references/default-severity-rubric.md +9 -4
- package/_bundled_plugin/references/final-report.md +5 -3
- package/_bundled_plugin/references/finding-detail-fields.md +18 -18
- package/_bundled_plugin/references/focused-investigator.md +13 -0
- 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/scan-prologue.md +2 -2
- package/_bundled_plugin/references/scan-runtime.md +4 -2
- package/_bundled_plugin/references/security-guidance.md +14 -1
- package/_bundled_plugin/references/validate-scan-findings.md +3 -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 +192 -352
- package/_bundled_plugin/scripts/dispatch_inventory_tool +7 -0
- package/_bundled_plugin/scripts/filesystem_identity.py +1 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +182 -230
- package/_bundled_plugin/scripts/finding_preview.py +20 -0
- package/_bundled_plugin/scripts/launch_codex_security_mcp +55 -16
- package/_bundled_plugin/scripts/legacy_findings.py +148 -0
- package/_bundled_plugin/scripts/posix_scan_local_files.py +37 -1
- package/_bundled_plugin/scripts/read_codex_session.mjs +21 -0
- package/_bundled_plugin/scripts/report_projection.py +81 -43
- 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 +9 -2
- package/_bundled_plugin/scripts/threat_model_projection.py +22 -26
- package/_bundled_plugin/scripts/validate_scan_contract.py +7 -1
- package/_bundled_plugin/scripts/windows_scan_local_files.py +582 -20
- package/_bundled_plugin/scripts/workbench/__init__.py +1 -1
- package/_bundled_plugin/scripts/workbench/handoff.py +100 -23
- package/_bundled_plugin/scripts/workbench/retained_coverage.py +30 -51
- 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 +9 -17
- 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 +91 -7
- package/_bundled_plugin/scripts/workbench_cli.py +54 -14
- package/_bundled_plugin/scripts/workbench_constants.py +12 -0
- package/_bundled_plugin/scripts/workbench_coverage_receipts.py +3 -3
- package/_bundled_plugin/scripts/workbench_db.py +562 -303
- package/_bundled_plugin/scripts/workbench_feedback.py +57 -11
- package/_bundled_plugin/scripts/workbench_finding_index.py +1 -0
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +4 -0
- package/_bundled_plugin/scripts/workbench_native_indexes.py +238 -41
- package/_bundled_plugin/scripts/workbench_progress.py +169 -4
- package/_bundled_plugin/scripts/workbench_publication.py +16 -13
- package/_bundled_plugin/scripts/workbench_remediation.py +155 -2
- package/_bundled_plugin/scripts/workbench_saved_results.py +176 -81
- package/_bundled_plugin/scripts/workbench_scan_history.py +398 -174
- package/_bundled_plugin/scripts/workbench_scan_start.py +224 -31
- package/_bundled_plugin/scripts/workbench_scan_usage.py +675 -73
- package/_bundled_plugin/scripts/workbench_schema.py +258 -63
- package/_bundled_plugin/scripts/workbench_setup.py +14 -2
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +13 -0
- package/_bundled_plugin/scripts/workbench_source_scopes.py +18 -0
- package/_bundled_plugin/scripts/workbench_target.py +594 -136
- package/_bundled_plugin/scripts/workbench_target_state.py +1110 -21
- package/_bundled_plugin/scripts/workbench_validation.py +43 -3
- package/_bundled_plugin/shared/workbench-history-repairs.json +77 -35
- package/_bundled_plugin/shared/workbench-migrations.json +100 -0
- package/_bundled_plugin/skills/cloud-findings/SKILL.md +5 -5
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +7 -50
- package/_bundled_plugin/skills/fix-finding/SKILL.md +2 -1
- package/_bundled_plugin/skills/publish-findings/SKILL.md +24 -153
- package/_bundled_plugin/skills/publish-findings/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/publish-findings/references/checkmarx-import.md +37 -0
- package/_bundled_plugin/skills/publish-findings/references/wiz-import.md +3 -3
- package/_bundled_plugin/skills/publish-findings/scripts/collect_checkmarx.py +409 -0
- package/_bundled_plugin/skills/publish-findings/scripts/collect_continuum.py +224 -0
- package/_bundled_plugin/skills/publish-findings/scripts/collector_paths.py +63 -0
- package/_bundled_plugin/skills/security-scan/SKILL.md +9 -46
- package/_bundled_plugin/skills/security-scan/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/security-scan/references/desktop-scan.md +3 -21
- package/_bundled_plugin/skills/security-scan/references/managed-scan.md +11 -0
- package/_bundled_plugin/skills/security-scan/references/scan-results.md +15 -0
- package/_bundled_plugin/skills/security-scan/references/scoped-paths.md +23 -0
- package/_bundled_plugin/skills/security-scan/references/sdk-files.md +24 -0
- package/_bundled_plugin/skills/threat-model-visualize/scripts/build_explorer.py +22 -1
- package/_bundled_plugin/skills/triage-finding/references/ticket-intake.md +6 -2
- package/bin/codex-security.mjs +2 -2
- package/dist/api.d.ts +45 -5
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +1192 -427
- package/dist/api.js.map +1 -1
- package/dist/armorcode-findings.d.ts +9 -0
- package/dist/armorcode-findings.d.ts.map +1 -0
- package/dist/armorcode-findings.js +145 -0
- package/dist/armorcode-findings.js.map +1 -0
- package/dist/artifact-export.d.ts +2 -0
- package/dist/artifact-export.d.ts.map +1 -1
- package/dist/artifact-export.js +29 -13
- package/dist/artifact-export.js.map +1 -1
- package/dist/auth.d.ts +6 -2
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +37 -18
- package/dist/auth.js.map +1 -1
- package/dist/batch-cost.d.ts +18 -0
- package/dist/batch-cost.d.ts.map +1 -0
- package/dist/batch-cost.js +41 -0
- package/dist/batch-cost.js.map +1 -0
- 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 +1 -1
- package/dist/blackduck-findings.d.ts.map +1 -1
- package/dist/blackduck-findings.js +24 -22
- package/dist/blackduck-findings.js.map +1 -1
- package/dist/bulk-scan-discovery.d.ts.map +1 -1
- package/dist/bulk-scan-discovery.js +4 -4
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/bundled-plugin.d.ts +4 -0
- package/dist/bundled-plugin.d.ts.map +1 -0
- package/dist/bundled-plugin.js +23 -0
- package/dist/bundled-plugin.js.map +1 -0
- 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-scan-severity.d.ts +1 -1
- package/dist/classify-scan-severity.d.ts.map +1 -1
- package/dist/classify-scan-severity.js +11 -3
- package/dist/classify-scan-severity.js.map +1 -1
- package/dist/classify-severity-records.d.ts +1 -9
- package/dist/classify-severity-records.d.ts.map +1 -1
- package/dist/classify-severity-records.js +3 -13
- package/dist/classify-severity-records.js.map +1 -1
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +11 -10
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli-argument.d.ts +4 -0
- package/dist/cli-argument.d.ts.map +1 -0
- package/dist/cli-argument.js +17 -0
- package/dist/cli-argument.js.map +1 -0
- package/dist/cli-help.d.ts +1 -1
- package/dist/cli-help.d.ts.map +1 -1
- package/dist/cli-help.js +71 -29
- package/dist/cli-help.js.map +1 -1
- package/dist/cli-hook.d.ts +3 -0
- package/dist/cli-hook.d.ts.map +1 -0
- package/dist/cli-hook.js +87 -0
- package/dist/cli-hook.js.map +1 -0
- package/dist/cli-integrations.d.ts +13 -0
- package/dist/cli-integrations.d.ts.map +1 -0
- package/dist/cli-integrations.js +333 -0
- package/dist/cli-integrations.js.map +1 -0
- package/dist/cli-mcp.d.ts +15 -0
- package/dist/cli-mcp.d.ts.map +1 -0
- package/dist/cli-mcp.js +178 -0
- package/dist/cli-mcp.js.map +1 -0
- package/dist/cli-token-view.d.ts +10 -0
- package/dist/cli-token-view.d.ts.map +1 -0
- package/dist/cli-token-view.js +41 -0
- package/dist/cli-token-view.js.map +1 -0
- package/dist/cli.d.ts +16 -8
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +3382 -2017
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.d.ts.map +1 -1
- package/dist/cloud-publish.js +35 -33
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codex-sdk-environment.d.ts +6 -0
- package/dist/codex-sdk-environment.d.ts.map +1 -1
- package/dist/codex-sdk-environment.js +19 -0
- package/dist/codex-sdk-environment.js.map +1 -1
- package/dist/command-words.d.ts +3 -0
- package/dist/command-words.d.ts.map +1 -0
- package/dist/command-words.js +46 -0
- package/dist/command-words.js.map +1 -0
- package/dist/component-scan.d.ts +19 -4
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +67 -9
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +130 -67
- package/dist/config.js.map +1 -1
- package/dist/continuum-findings.d.ts +1 -1
- package/dist/continuum-findings.d.ts.map +1 -1
- package/dist/continuum-findings.js +149 -19
- package/dist/continuum-findings.js.map +1 -1
- package/dist/contract-values.d.ts +2 -0
- package/dist/contract-values.d.ts.map +1 -1
- package/dist/contract-values.js +12 -9
- package/dist/contract-values.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 -112
- package/dist/cost-model.js.map +1 -1
- package/dist/cost.d.ts +42 -3
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +484 -149
- 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 +29 -19
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/deduplication/local.d.ts +4 -2
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +9 -2
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/refusal.d.ts.map +1 -1
- package/dist/deduplication/refusal.js +26 -5
- package/dist/deduplication/refusal.js.map +1 -1
- package/dist/deduplication/scan.d.ts +5 -0
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +24 -7
- 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 +2 -0
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +44 -19
- package/dist/deep-scan.js.map +1 -1
- package/dist/default-severity-rubric.d.ts +1 -1
- package/dist/default-severity-rubric.d.ts.map +1 -1
- package/dist/default-severity-rubric.js +1 -1
- 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 +86 -45
- package/dist/endor-findings.js.map +1 -1
- package/dist/errors.d.ts +4 -2
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +15 -4
- package/dist/errors.js.map +1 -1
- package/dist/executable-path.d.ts +3 -0
- package/dist/executable-path.d.ts.map +1 -1
- package/dist/executable-path.js +26 -0
- package/dist/executable-path.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 +19 -7
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +69 -5
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +537 -108
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +13 -6
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +895 -1142
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +21 -2
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +130 -68
- package/dist/external-findings-read.js.map +1 -1
- package/dist/external-findings.d.ts +15 -3
- package/dist/external-findings.d.ts.map +1 -1
- package/dist/external-findings.js +54 -2
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-contract.d.ts +8 -12
- package/dist/external-import-contract.d.ts.map +1 -1
- package/dist/external-import-contract.js +51 -184
- 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/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/github-advisories.d.ts.map +1 -1
- package/dist/github-advisories.js +0 -2
- package/dist/github-advisories.js.map +1 -1
- package/dist/github-dependabot-findings.d.ts.map +1 -1
- package/dist/github-dependabot-findings.js +18 -8
- 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 +73 -316
- package/dist/github-findings.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-remediation.d.ts +1 -0
- package/dist/hosted-remediation.d.ts.map +1 -1
- package/dist/hosted-remediation.js +23 -3
- package/dist/hosted-remediation.js.map +1 -1
- package/dist/hosted-scan-protocol.js +2 -2
- package/dist/hosted-scan-protocol.js.map +1 -1
- package/dist/hosted-scan.d.ts.map +1 -1
- package/dist/hosted-scan.js +16 -11
- 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/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 +21 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -3
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts.map +1 -1
- package/dist/inspector-findings.js +52 -86
- package/dist/inspector-findings.js.map +1 -1
- package/dist/knowledge-base.d.ts +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +102 -32
- package/dist/knowledge-base.js.map +1 -1
- package/dist/linear.d.ts +11 -0
- package/dist/linear.d.ts.map +1 -1
- package/dist/linear.js.map +1 -1
- package/dist/local-git-metadata.d.ts +5 -2
- package/dist/local-git-metadata.d.ts.map +1 -1
- package/dist/local-git-metadata.js +8 -5
- package/dist/local-git-metadata.js.map +1 -1
- package/dist/multiscan.d.ts +10 -4
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +217 -102
- 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 +5 -2
- package/dist/opengrep-findings.d.ts.map +1 -1
- package/dist/opengrep-findings.js +54 -33
- 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/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 +99 -9
- package/dist/private-finding-import.d.ts.map +1 -1
- package/dist/private-finding-import.js +116 -152
- package/dist/private-finding-import.js.map +1 -1
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +53 -13
- package/dist/project-config.js.map +1 -1
- package/dist/prompt-files.d.ts +7 -2
- package/dist/prompt-files.d.ts.map +1 -1
- package/dist/prompt-files.js +42 -20
- package/dist/prompt-files.js.map +1 -1
- package/dist/provider-profile.d.ts +1 -1
- package/dist/provider-profile.d.ts.map +1 -1
- package/dist/provider-profile.js +12 -10
- 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.d.ts +1 -1
- package/dist/publication.d.ts.map +1 -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/record.d.ts +1 -5
- package/dist/record.d.ts.map +1 -1
- package/dist/record.js +3 -51
- package/dist/record.js.map +1 -1
- package/dist/remediation.d.ts +1 -4
- package/dist/remediation.d.ts.map +1 -1
- package/dist/remediation.js +6 -8
- 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 +4 -0
- package/dist/result.d.ts.map +1 -1
- package/dist/result.js +1 -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 +54 -6
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +1084 -256
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +7 -1
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +269 -114
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-activity.d.ts.map +1 -1
- package/dist/scan-activity.js +141 -56
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-archive-path.d.ts +2 -0
- package/dist/scan-archive-path.d.ts.map +1 -0
- package/dist/scan-archive-path.js +5 -0
- package/dist/scan-archive-path.js.map +1 -0
- package/dist/scan-comparison.d.ts +10 -5
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +66 -17
- 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 +92 -43
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts +10 -1
- package/dist/scan-executor.d.ts.map +1 -1
- package/dist/scan-executor.js +24 -2
- package/dist/scan-executor.js.map +1 -1
- package/dist/scan-history-renderer.d.ts +1 -0
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +34 -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 +131 -78
- 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 +25 -13
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +216 -97
- package/dist/scanner-import.js.map +1 -1
- package/dist/scanner-repository-url.d.ts +4 -1
- package/dist/scanner-repository-url.d.ts.map +1 -1
- package/dist/scanner-repository-url.js +10 -6
- package/dist/scanner-repository-url.js.map +1 -1
- package/dist/security-policy.d.ts +1 -1
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js +26 -6
- 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 +72 -42
- 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 +157 -6
- package/dist/semgrep-platform-findings.d.ts.map +1 -1
- package/dist/semgrep-platform-findings.js +766 -103
- package/dist/semgrep-platform-findings.js.map +1 -1
- 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/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 +9 -2
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +90 -70
- package/dist/snyk-findings.js.map +1 -1
- package/dist/snyk-rest-findings.d.ts +59 -0
- package/dist/snyk-rest-findings.d.ts.map +1 -0
- package/dist/snyk-rest-findings.js +879 -0
- package/dist/snyk-rest-findings.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.map +1 -1
- package/dist/sonar-collector.js +0 -3
- package/dist/sonar-collector.js.map +1 -1
- package/dist/sonar-findings.d.ts +1 -1
- package/dist/sonar-findings.d.ts.map +1 -1
- package/dist/sonar-findings.js +2 -4
- package/dist/sonar-findings.js.map +1 -1
- package/dist/sonar-import.d.ts +3 -0
- package/dist/sonar-import.d.ts.map +1 -1
- package/dist/sonar-import.js +30 -34
- package/dist/sonar-import.js.map +1 -1
- package/dist/stored-finding-projection.d.ts +6 -0
- package/dist/stored-finding-projection.d.ts.map +1 -0
- package/dist/stored-finding-projection.js +104 -0
- package/dist/stored-finding-projection.js.map +1 -0
- package/dist/stored-findings-publication.d.ts +23 -0
- package/dist/stored-findings-publication.d.ts.map +1 -0
- package/dist/stored-findings-publication.js +169 -0
- package/dist/stored-findings-publication.js.map +1 -0
- 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 +8 -1
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +131 -42
- package/dist/targets.js.map +1 -1
- package/dist/tenable-findings.d.ts +6 -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-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 +424 -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/trusted-executable.d.ts +6 -0
- package/dist/trusted-executable.d.ts.map +1 -1
- package/dist/trusted-executable.js +140 -37
- package/dist/trusted-executable.js.map +1 -1
- package/dist/validation-records.js +1 -1
- package/dist/validation-records.js.map +1 -1
- package/dist/veracode-findings.d.ts +1 -1
- package/dist/veracode-findings.d.ts.map +1 -1
- package/dist/veracode-findings.js +19 -6
- package/dist/veracode-findings.js.map +1 -1
- package/dist/version.d.ts +3 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +184 -32
- package/dist/version.js.map +1 -1
- 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 +26 -1
- package/dist/windows-path.js.map +1 -1
- package/dist/wiz-findings.d.ts +6 -2
- package/dist/wiz-findings.d.ts.map +1 -1
- package/dist/wiz-findings.js +65 -89
- package/dist/wiz-findings.js.map +1 -1
- package/docs/classify-severity-records.md +27 -12
- package/docs/cli.md +853 -639
- package/docs/dedupe-records.md +44 -24
- package/docs/findings-service.md +84 -44
- package/docs/hosted-remediation.md +27 -11
- package/docs/hosted-scans.md +50 -42
- package/docs/sdk.md +903 -0
- package/docs/telemetry.md +236 -0
- package/docs/validate-records.md +78 -44
- package/package.json +23 -16
- package/schemas/external-findings.schema.json +4 -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/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 -155
- package/dist/finding-normalization.js.map +0 -1
- package/dist/reader-selection.d.ts +0 -13
- package/dist/reader-selection.d.ts.map +0 -1
- package/dist/reader-selection.js +0 -81
- package/dist/reader-selection.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
"""
|
|
1
|
+
"""Persist workbench state, transfer scan ownership, and recover results from saved artifacts."""
|
|
@@ -12,18 +12,46 @@ 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
|
+
completed_import = scan["launch_kind"] == "import" and scan["status"] == "complete"
|
|
42
|
+
if not completed_import:
|
|
43
|
+
raise SystemExit("This scan is awaiting its owning Codex thread.")
|
|
44
|
+
elif owner != model_thread_id:
|
|
45
|
+
raise SystemExit("This scan requires its owning Codex thread.")
|
|
46
|
+
|
|
47
|
+
|
|
21
48
|
def require_current_continuation(
|
|
22
49
|
scan: sqlite3.Row,
|
|
23
50
|
claim_token: str | None,
|
|
24
51
|
*,
|
|
25
52
|
error_message: str,
|
|
26
53
|
) -> None:
|
|
54
|
+
"""Require the current claim token, allowing a tokenless continuation for legacy delivered scans."""
|
|
27
55
|
if (
|
|
28
56
|
scan["handoff_status"] == "delivered"
|
|
29
57
|
and scan["handoff_claim_token"] is None
|
|
@@ -41,6 +69,7 @@ def validate_handoff_delivery_thread(
|
|
|
41
69
|
requesting_thread_id: str,
|
|
42
70
|
claim_token: str,
|
|
43
71
|
) -> None:
|
|
72
|
+
"""Require the owning thread for delivery unless the caller presents a recovery claim token."""
|
|
44
73
|
if owning_thread_id != requesting_thread_id and not claim_token.startswith(
|
|
45
74
|
RECOVERY_HANDOFF_TOKEN_PREFIX
|
|
46
75
|
):
|
|
@@ -54,6 +83,12 @@ def claim_handoff_delivery(
|
|
|
54
83
|
connection: sqlite3.Connection,
|
|
55
84
|
args: argparse.Namespace,
|
|
56
85
|
) -> dict[str, Any]:
|
|
86
|
+
"""Claim a pending handoff and return the current workspace state.
|
|
87
|
+
|
|
88
|
+
The first claim wins. When take_over_stale is requested, replacing an expired
|
|
89
|
+
claim also clears the continuation and deep scan owner. Retrying the same claim
|
|
90
|
+
or losing a competing claim returns the workspace state without changing ownership.
|
|
91
|
+
"""
|
|
57
92
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
58
93
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
59
94
|
timestamp = wb.now()
|
|
@@ -102,6 +137,7 @@ def release_handoff_delivery(
|
|
|
102
137
|
connection: sqlite3.Connection,
|
|
103
138
|
args: argparse.Namespace,
|
|
104
139
|
) -> dict[str, Any]:
|
|
140
|
+
"""Release a matching pending claim, detach its continuation, and return the workspace state."""
|
|
105
141
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
106
142
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
107
143
|
timestamp = wb.now()
|
|
@@ -126,6 +162,11 @@ def attach_scan_continuation_thread(
|
|
|
126
162
|
connection: sqlite3.Connection,
|
|
127
163
|
args: argparse.Namespace,
|
|
128
164
|
) -> dict[str, Any]:
|
|
165
|
+
"""Bind the claimed scan to a continuation and return its workspace state.
|
|
166
|
+
|
|
167
|
+
An immediate transaction serializes ownership changes. Reattaching the same
|
|
168
|
+
thread is idempotent. A different thread or mismatched claim token raises SystemExit.
|
|
169
|
+
"""
|
|
129
170
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
130
171
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
131
172
|
thread_id = optional_text(args.thread_id, maximum=512)
|
|
@@ -165,6 +206,11 @@ def mark_handoff_delivered(
|
|
|
165
206
|
connection: sqlite3.Connection,
|
|
166
207
|
args: argparse.Namespace,
|
|
167
208
|
) -> dict[str, Any]:
|
|
209
|
+
"""Record delivery for the pending claim and return the workspace state.
|
|
210
|
+
|
|
211
|
+
For standard scans this resets preflight progress. The same claim can confirm
|
|
212
|
+
delivery again. A conflicting claim or invalid requesting thread raises SystemExit.
|
|
213
|
+
"""
|
|
168
214
|
scan_id = require_uuid(args.scan_id, "scan-id")
|
|
169
215
|
claim_token = require_handoff_claim_token(args.claim_token)
|
|
170
216
|
thread_id = optional_text(args.thread_id, maximum=512)
|
|
@@ -184,30 +230,61 @@ def mark_handoff_delivered(
|
|
|
184
230
|
raise SystemExit(
|
|
185
231
|
"Codex Security handoff delivery is owned by another continuation."
|
|
186
232
|
)
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
updated = connection.execute(
|
|
190
|
-
"""
|
|
191
|
-
UPDATE scans
|
|
192
|
-
SET handoff_status = 'delivered', handoff_claimed_at = NULL,
|
|
193
|
-
updated_at = ?
|
|
194
|
-
WHERE id = ? AND handoff_status = 'pending'
|
|
195
|
-
AND handoff_claim_token = ?
|
|
196
|
-
""",
|
|
197
|
-
(timestamp, scan["id"], claim_token),
|
|
198
|
-
)
|
|
199
|
-
if updated.rowcount != 1:
|
|
200
|
-
raise SystemExit("Codex Security handoff delivery could not be recorded.")
|
|
201
|
-
if scan["mode"] != "deep":
|
|
202
|
-
connection.execute(
|
|
233
|
+
else:
|
|
234
|
+
updated = connection.execute(
|
|
203
235
|
"""
|
|
204
|
-
UPDATE
|
|
205
|
-
SET
|
|
206
|
-
phase_progress_unit = 'checks',
|
|
207
|
-
preflight_checks_total = 0, preflight_checks_completed = 0,
|
|
236
|
+
UPDATE scans
|
|
237
|
+
SET handoff_status = 'delivered', handoff_claimed_at = NULL,
|
|
208
238
|
updated_at = ?
|
|
209
|
-
WHERE
|
|
239
|
+
WHERE id = ? AND handoff_status = 'pending'
|
|
240
|
+
AND handoff_claim_token = ?
|
|
210
241
|
""",
|
|
211
|
-
(timestamp, scan["id"]),
|
|
242
|
+
(timestamp, scan["id"], claim_token),
|
|
212
243
|
)
|
|
213
|
-
|
|
244
|
+
if updated.rowcount != 1:
|
|
245
|
+
raise SystemExit("Codex Security handoff delivery could not be recorded.")
|
|
246
|
+
if scan["mode"] != "deep":
|
|
247
|
+
connection.execute(
|
|
248
|
+
"""
|
|
249
|
+
UPDATE scan_progress
|
|
250
|
+
SET phase_items_total = 0, phase_items_completed = 0,
|
|
251
|
+
phase_progress_unit = 'checks',
|
|
252
|
+
preflight_checks_total = 0, preflight_checks_completed = 0,
|
|
253
|
+
updated_at = ?
|
|
254
|
+
WHERE scan_id = ?
|
|
255
|
+
""",
|
|
256
|
+
(timestamp, scan["id"]),
|
|
257
|
+
)
|
|
258
|
+
began_review = (
|
|
259
|
+
args.return_context
|
|
260
|
+
and thread_id is not None
|
|
261
|
+
and args.occurrence_id is None
|
|
262
|
+
and scan["mode"] == "standard"
|
|
263
|
+
and scan["status"] == "running"
|
|
264
|
+
and scan["canceled_at"] is None
|
|
265
|
+
and scan["phase"] == "preflight"
|
|
266
|
+
)
|
|
267
|
+
if began_review:
|
|
268
|
+
connection.execute(
|
|
269
|
+
"UPDATE scans SET phase = 'threat_model', updated_at = ? WHERE id = ?",
|
|
270
|
+
(timestamp, scan_id),
|
|
271
|
+
)
|
|
272
|
+
connection.execute(
|
|
273
|
+
"""UPDATE scan_progress SET phase_items_total = 0, phase_items_completed = 0,
|
|
274
|
+
phase_progress_unit = NULL, updated_at = ? WHERE scan_id = ?""",
|
|
275
|
+
(timestamp, scan_id),
|
|
276
|
+
)
|
|
277
|
+
if not args.return_context:
|
|
278
|
+
return wb.workspace_state(connection, scan["workspace_id"])
|
|
279
|
+
context = wb.get_scan(
|
|
280
|
+
connection,
|
|
281
|
+
argparse.Namespace(
|
|
282
|
+
scan_id=scan_id,
|
|
283
|
+
occurrence_id=args.occurrence_id,
|
|
284
|
+
model_thread_id=thread_id or "",
|
|
285
|
+
context_claim_token=claim_token,
|
|
286
|
+
),
|
|
287
|
+
)
|
|
288
|
+
if began_review:
|
|
289
|
+
context["beganStandardReview"] = True
|
|
290
|
+
return context
|
|
@@ -70,7 +70,8 @@ from workbench.saved_sources import (
|
|
|
70
70
|
_frozen_checkpoint_heads,
|
|
71
71
|
_frozen_source_times,
|
|
72
72
|
_is_source_order_snapshot,
|
|
73
|
-
|
|
73
|
+
_iteration_order,
|
|
74
|
+
_latest_iteration,
|
|
74
75
|
_model_capture,
|
|
75
76
|
_parent_publication_ancestors,
|
|
76
77
|
_read_saved_parent_result,
|
|
@@ -115,7 +116,13 @@ def merge_saved_results(
|
|
|
115
116
|
current_contract: bool = False,
|
|
116
117
|
recovery_snapshot_error: _CheckpointSnapshotError | None = None,
|
|
117
118
|
) -> tuple[dict[str, Any], dict[str, Any], dict[str, Any]] | None:
|
|
118
|
-
"""
|
|
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
|
+
"""
|
|
119
126
|
initial_warnings = set(warnings)
|
|
120
127
|
if frozen_source_digests is None:
|
|
121
128
|
checkpoint_heads = {}
|
|
@@ -255,7 +262,7 @@ def merge_saved_results(
|
|
|
255
262
|
reducer_paths: set[str] = set()
|
|
256
263
|
current_results: set[str] = set()
|
|
257
264
|
reducer_outputs: list[tuple[Any, str, list[str], int]] = []
|
|
258
|
-
reducer =
|
|
265
|
+
reducer = _latest_iteration(workers)
|
|
259
266
|
latest_reducer: str | None = None
|
|
260
267
|
if reducer is not None:
|
|
261
268
|
try:
|
|
@@ -620,18 +627,16 @@ def merge_saved_results(
|
|
|
620
627
|
if previous is not None and isinstance(previous.get("id"), str):
|
|
621
628
|
result["id"] = previous["id"]
|
|
622
629
|
else:
|
|
623
|
-
surfaces = coverage.get("surfaces", [])
|
|
624
630
|
if any(
|
|
625
631
|
isinstance(row, dict) and row.get("id") == result["id"]
|
|
626
|
-
for row in (
|
|
632
|
+
for row in _coverage_rows(coverage, "surfaces")
|
|
627
633
|
):
|
|
628
634
|
result["id"] = f"{result['id']}-{_digest(result)[:16]}"
|
|
629
635
|
elif field == "deferred":
|
|
630
636
|
result["id"] = f"{prefix}-deferred-{index}"
|
|
631
637
|
if isinstance(item.get("surfaceIds"), list):
|
|
632
638
|
surface_ids: dict[str, str] = {}
|
|
633
|
-
|
|
634
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
639
|
+
for surface in _coverage_rows(projected_coverage, "surfaces"):
|
|
635
640
|
if not isinstance(surface, dict) or not isinstance(surface.get("id"), str):
|
|
636
641
|
continue
|
|
637
642
|
provenance = surface.get("provenance", {})
|
|
@@ -642,9 +647,8 @@ def merge_saved_results(
|
|
|
642
647
|
and isinstance(provenance.get("sourceId"), str)
|
|
643
648
|
):
|
|
644
649
|
surface_ids.setdefault(provenance["sourceId"], surface["id"])
|
|
645
|
-
surfaces = source.get("surfaces", [])
|
|
646
650
|
source_surface_ids: dict[str, tuple[int, dict[str, Any]]] = {}
|
|
647
|
-
for offset, surface in enumerate(
|
|
651
|
+
for offset, surface in enumerate(_coverage_rows(source, "surfaces"), 1):
|
|
648
652
|
if isinstance(surface, dict) and isinstance(surface.get("id"), str):
|
|
649
653
|
source_surface_ids.setdefault(surface["id"], (offset, surface))
|
|
650
654
|
for (owner, source_id), accepted in accepted_surfaces.items():
|
|
@@ -679,7 +683,7 @@ def merge_saved_results(
|
|
|
679
683
|
|
|
680
684
|
workers_by_id = {worker["id"]: worker for worker in workers}
|
|
681
685
|
latest_reducer_key = (
|
|
682
|
-
(reducer
|
|
686
|
+
(_iteration_order(reducer), int(reducer["attempt"] or 0))
|
|
683
687
|
if reducer is not None and latest_reducer in drafts_by_path
|
|
684
688
|
else None
|
|
685
689
|
)
|
|
@@ -692,7 +696,7 @@ def merge_saved_results(
|
|
|
692
696
|
):
|
|
693
697
|
continue
|
|
694
698
|
current_results.add(result_path)
|
|
695
|
-
candidate_key = (worker
|
|
699
|
+
candidate_key = (_iteration_order(worker), attempt)
|
|
696
700
|
if latest_reducer_key is None or candidate_key > latest_reducer_key:
|
|
697
701
|
latest_reducer_key = candidate_key
|
|
698
702
|
latest_reducer = result_path
|
|
@@ -733,7 +737,7 @@ def merge_saved_results(
|
|
|
733
737
|
projected_coverage = saved_parent["reviewState"] if saved_parent else {}
|
|
734
738
|
# Reconcile raw source IDs and timestamps before projecting accepted outputs.
|
|
735
739
|
accepted_sources = {
|
|
736
|
-
relative
|
|
740
|
+
(worker_id, relative): draft
|
|
737
741
|
for relative, draft, worker_id in sources
|
|
738
742
|
if (worker := workers_by_id.get(worker_id)) is not None
|
|
739
743
|
and worker["status"] == "succeeded"
|
|
@@ -763,15 +767,12 @@ def merge_saved_results(
|
|
|
763
767
|
retained_surface_rows.add(id(source))
|
|
764
768
|
return retained
|
|
765
769
|
|
|
766
|
-
accepted_coverage_sources = {
|
|
767
|
-
|
|
768
|
-
}
|
|
770
|
+
accepted_coverage_sources = {id(draft["reviewState"]) for draft in accepted_sources.values()}
|
|
771
|
+
accepted_by_worker = {}
|
|
769
772
|
accepted_surfaces: dict[tuple[str, str], list[tuple[int, dict[str, Any]]]] = {}
|
|
770
|
-
for relative, draft
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
surfaces = draft["reviewState"].get("surfaces", [])
|
|
774
|
-
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):
|
|
775
776
|
if isinstance(surface, dict) and isinstance(surface.get("id"), str):
|
|
776
777
|
accepted_surfaces.setdefault((worker_id, surface["id"]), []).append(
|
|
777
778
|
(index, surface)
|
|
@@ -807,7 +808,7 @@ def merge_saved_results(
|
|
|
807
808
|
if origin is None:
|
|
808
809
|
return item
|
|
809
810
|
worker_id, relative, _, index, source = origin
|
|
810
|
-
if relative not in accepted_sources:
|
|
811
|
+
if (worker_id, relative) not in accepted_sources:
|
|
811
812
|
directory = Path(relative).parent
|
|
812
813
|
if directory.name == "checkpoints":
|
|
813
814
|
directory = directory.parent
|
|
@@ -819,14 +820,7 @@ def merge_saved_results(
|
|
|
819
820
|
return item
|
|
820
821
|
# Reproduced outputs and links from omitted checkpoints use the
|
|
821
822
|
# accepted worker's surface namespace.
|
|
822
|
-
accepted =
|
|
823
|
-
(
|
|
824
|
-
(path, draft["reviewState"])
|
|
825
|
-
for path, draft, owner in sources
|
|
826
|
-
if owner == worker_id and path in accepted_sources
|
|
827
|
-
),
|
|
828
|
-
None,
|
|
829
|
-
)
|
|
823
|
+
accepted = accepted_by_worker.get(worker_id)
|
|
830
824
|
if accepted is not None and source == accepted[1]:
|
|
831
825
|
relative, source = accepted
|
|
832
826
|
elif relative not in selected_observations or accepted is None:
|
|
@@ -892,11 +886,7 @@ def merge_saved_results(
|
|
|
892
886
|
surface_ids_by_source: dict[tuple[str, str], list[str]] = {
|
|
893
887
|
(relative, row["id"]): []
|
|
894
888
|
for relative, draft, _ in all_sources
|
|
895
|
-
for row in (
|
|
896
|
-
draft["reviewState"].get("surfaces", [])
|
|
897
|
-
if isinstance(draft["reviewState"].get("surfaces"), list)
|
|
898
|
-
else []
|
|
899
|
-
)
|
|
889
|
+
for row in _coverage_rows(draft["reviewState"], "surfaces")
|
|
900
890
|
if isinstance(row, dict) and isinstance(row.get("id"), str)
|
|
901
891
|
}
|
|
902
892
|
discarded_coverage_sources: set[str] = set()
|
|
@@ -1154,8 +1144,7 @@ def merge_saved_results(
|
|
|
1154
1144
|
retained_surface_rows: set[int] = set()
|
|
1155
1145
|
for relative, draft, _ in all_sources:
|
|
1156
1146
|
for field in ("surfaces", "deferred"):
|
|
1157
|
-
|
|
1158
|
-
for row in rows if isinstance(rows, list) else []:
|
|
1147
|
+
for row in _coverage_rows(draft["reviewState"], field):
|
|
1159
1148
|
if isinstance(row, dict):
|
|
1160
1149
|
paths_for_row = coverage_sources.setdefault(id(row), (row, []))[1]
|
|
1161
1150
|
if relative not in paths_for_row:
|
|
@@ -1305,9 +1294,7 @@ def merge_saved_results(
|
|
|
1305
1294
|
selected_reported_candidates.get(key, source_order[relative]),
|
|
1306
1295
|
source_order[relative],
|
|
1307
1296
|
)
|
|
1308
|
-
for relative, draft
|
|
1309
|
-
if relative not in accepted_sources:
|
|
1310
|
-
continue
|
|
1297
|
+
for (worker_id, relative), draft in accepted_sources.items():
|
|
1311
1298
|
worker = workers_by_id[worker_id]
|
|
1312
1299
|
reported = {
|
|
1313
1300
|
finding_candidate_id(finding)
|
|
@@ -1315,8 +1302,7 @@ def merge_saved_results(
|
|
|
1315
1302
|
if isinstance(finding, dict) and valid_finding(finding)
|
|
1316
1303
|
}
|
|
1317
1304
|
for field in ("surfaces", "deferred", "explicitExclusions"):
|
|
1318
|
-
|
|
1319
|
-
for index, row in enumerate(rows if isinstance(rows, list) else [], 1):
|
|
1305
|
+
for index, row in enumerate(_coverage_rows(draft["reviewState"], field), 1):
|
|
1320
1306
|
if not isinstance(row, dict):
|
|
1321
1307
|
continue
|
|
1322
1308
|
if (
|
|
@@ -1438,8 +1424,7 @@ def merge_saved_results(
|
|
|
1438
1424
|
|
|
1439
1425
|
pending_surface_orders: dict[tuple[str | None, str], tuple[int, int]] = {}
|
|
1440
1426
|
for relative, draft, owner in all_sources:
|
|
1441
|
-
|
|
1442
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
1427
|
+
for surface in _coverage_rows(draft["reviewState"], "surfaces"):
|
|
1443
1428
|
if (
|
|
1444
1429
|
isinstance(surface, dict)
|
|
1445
1430
|
and surface.get("disposition") == "needs_follow_up"
|
|
@@ -2940,12 +2925,7 @@ def merge_saved_results(
|
|
|
2940
2925
|
worker = workers_by_id.get(worker_id)
|
|
2941
2926
|
# Only the accepted current output belongs to this worker attempt. An
|
|
2942
2927
|
# unsuperseded archive can remain evidence after that output is lost.
|
|
2943
|
-
project_coverage = (
|
|
2944
|
-
worker is not None
|
|
2945
|
-
and worker["status"] == "succeeded"
|
|
2946
|
-
and worker["result_manifest_path"] == str(scan_dir / relative)
|
|
2947
|
-
and draft.get("complete") is not False
|
|
2948
|
-
)
|
|
2928
|
+
project_coverage = (worker_id, relative) in accepted_sources
|
|
2949
2929
|
if coverage_superseded and not selected_candidates and not retain_pending:
|
|
2950
2930
|
continue
|
|
2951
2931
|
if project_coverage:
|
|
@@ -3173,8 +3153,7 @@ def merge_saved_results(
|
|
|
3173
3153
|
item = {"id": "scan-stopped", "reason": reason}
|
|
3174
3154
|
if item not in coverage["deferred"]:
|
|
3175
3155
|
coverage["deferred"].append(item)
|
|
3176
|
-
|
|
3177
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
3156
|
+
for surface in _coverage_rows(coverage, "surfaces"):
|
|
3178
3157
|
if isinstance(surface, dict) and isinstance(surface.get("provenance"), dict):
|
|
3179
3158
|
surface["provenance"].pop("scanReceiptRefs", None)
|
|
3180
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
|
):
|
|
@@ -250,7 +250,7 @@ def prepare_saved_coverage_projection(
|
|
|
250
250
|
|
|
251
251
|
|
|
252
252
|
class SavedCoverageProjection:
|
|
253
|
-
"""
|
|
253
|
+
"""Track which worker supplied a coverage row so reconstructed links can resolve to the retained surface."""
|
|
254
254
|
|
|
255
255
|
def __init__(self, project_worker_coverage, legacy_surface_links, projection_origins):
|
|
256
256
|
self.project_worker_coverage = project_worker_coverage
|
|
@@ -293,8 +293,7 @@ class SavedCoverageProjection:
|
|
|
293
293
|
if field == "surfaces":
|
|
294
294
|
# Canonical IDs can change while source content and ownership stay the same.
|
|
295
295
|
item = {key: value for key, value in item.items() if key != "id"}
|
|
296
|
-
|
|
297
|
-
for record in records if isinstance(records, list) else []:
|
|
296
|
+
for record in _coverage_rows(coverage, field):
|
|
298
297
|
if not isinstance(record, dict):
|
|
299
298
|
continue
|
|
300
299
|
original = dict(canonical_record(field, record))
|
|
@@ -329,12 +328,11 @@ class SavedCoverageProjection:
|
|
|
329
328
|
or worker["merge_state"] != "merged"
|
|
330
329
|
):
|
|
331
330
|
return False
|
|
332
|
-
reviews = canonical.get("reviews", [])
|
|
333
331
|
return any(
|
|
334
332
|
isinstance(review, dict)
|
|
335
333
|
and review.get("workerId") == worker["id"]
|
|
336
334
|
and review.get("attempt") == worker["attempt"]
|
|
337
|
-
for review in (
|
|
335
|
+
for review in _coverage_rows(canonical, "reviews")
|
|
338
336
|
)
|
|
339
337
|
|
|
340
338
|
def repair_reviewed_surface(self, coverage, canonical, worker, source, surface):
|
|
@@ -446,11 +444,8 @@ class SavedCoverageProjection:
|
|
|
446
444
|
retained_legacy_surface_links: dict[
|
|
447
445
|
int, tuple[dict[str, Any], dict[str, dict[str, Any]]]
|
|
448
446
|
] = {}
|
|
449
|
-
output_tasks = coverage
|
|
450
|
-
task_candidates = [
|
|
451
|
-
(self.worker_row_owners.get(id(row)), row)
|
|
452
|
-
for row in (output_tasks if isinstance(output_tasks, list) else [])
|
|
453
|
-
]
|
|
447
|
+
output_tasks = _coverage_rows(coverage, "deferred")
|
|
448
|
+
task_candidates = [(self.worker_row_owners.get(id(row)), row) for row in output_tasks]
|
|
454
449
|
for task, published_id, surface, _ in self.task_surface_links(task_candidates):
|
|
455
450
|
retained_surface = self.linked_surface(
|
|
456
451
|
surface,
|
|
@@ -481,8 +476,7 @@ class SavedCoverageProjection:
|
|
|
481
476
|
named_surface_outputs = {
|
|
482
477
|
identity for outputs in self.worker_surface_outputs.values() for identity in outputs
|
|
483
478
|
}
|
|
484
|
-
|
|
485
|
-
for surface in surfaces if isinstance(surfaces, list) else []:
|
|
479
|
+
for surface in _coverage_rows(coverage, "surfaces"):
|
|
486
480
|
if not isinstance(surface, dict):
|
|
487
481
|
continue
|
|
488
482
|
owner, identity = self.worker_row_owners.get(id(surface)), surface.get("id")
|
|
@@ -496,7 +490,7 @@ class SavedCoverageProjection:
|
|
|
496
490
|
and id(existing) not in named_surface_outputs
|
|
497
491
|
):
|
|
498
492
|
worker_surfaces[key] = surface
|
|
499
|
-
for task in output_tasks
|
|
493
|
+
for task in output_tasks:
|
|
500
494
|
if (
|
|
501
495
|
not isinstance(task, dict)
|
|
502
496
|
or (owner := self.worker_row_owners.get(id(task))) is None
|
|
@@ -610,8 +604,7 @@ class SavedCoverageProjection:
|
|
|
610
604
|
# tasks. Preserve their original links, even when the outcome changes ID
|
|
611
605
|
# or a distinct retained surface shares the old source-local ID.
|
|
612
606
|
for relative, draft, owner in all_sources:
|
|
613
|
-
|
|
614
|
-
for original in originals if isinstance(originals, list) else []:
|
|
607
|
+
for original in _coverage_rows(draft["reviewState"], "surfaces"):
|
|
615
608
|
if (
|
|
616
609
|
not isinstance(original, dict)
|
|
617
610
|
or id(original) in retained_surface_rows
|
|
@@ -652,8 +645,7 @@ class SavedCoverageProjection:
|
|
|
652
645
|
prospective_surfaces = {}
|
|
653
646
|
prospective_named = {}
|
|
654
647
|
for relative, draft, owner in all_sources:
|
|
655
|
-
|
|
656
|
-
for row in rows if isinstance(rows, list) else []:
|
|
648
|
+
for row in _coverage_rows(draft["reviewState"], "surfaces"):
|
|
657
649
|
if owner is None or not isinstance(row, dict):
|
|
658
650
|
continue
|
|
659
651
|
emitted = surface_is_retained(relative, owner, row)
|
|
@@ -26,6 +26,11 @@ _PUBLISHED_OUTPUTS = (
|
|
|
26
26
|
def _snapshot_published_outputs(
|
|
27
27
|
scan_dir: Path, relative_paths: tuple[str, ...] = _PUBLISHED_OUTPUTS
|
|
28
28
|
) -> dict[str, tuple[bytes, os.stat_result] | None]:
|
|
29
|
+
"""Capture each artifact's bytes and stat metadata before publication.
|
|
30
|
+
|
|
31
|
+
A None entry records an absent artifact. An unsafe optional threatmodel.md is
|
|
32
|
+
omitted so rollback leaves it alone. Other unreadable existing outputs raise ContractError.
|
|
33
|
+
"""
|
|
29
34
|
snapshots: dict[str, tuple[bytes, os.stat_result] | None] = {}
|
|
30
35
|
for relative in relative_paths:
|
|
31
36
|
descriptor = -1
|
|
@@ -56,6 +61,10 @@ def _restore_published_outputs(
|
|
|
56
61
|
snapshots: dict[str, tuple[bytes, os.stat_result] | None],
|
|
57
62
|
created_paths: set[str] | None = None,
|
|
58
63
|
) -> None:
|
|
64
|
+
"""Restore the captured bytes and timestamps after a publication failure.
|
|
65
|
+
|
|
66
|
+
Remove outputs that were originally absent and paths journaled as newly created by the caller.
|
|
67
|
+
"""
|
|
59
68
|
for relative, snapshot in snapshots.items():
|
|
60
69
|
if snapshot is None:
|
|
61
70
|
path = scan_dir / relative
|