@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
package/dist/multiscan.js
CHANGED
|
@@ -4,25 +4,29 @@ import { randomUUID } from "node:crypto";
|
|
|
4
4
|
import { realpathSync } from "node:fs";
|
|
5
5
|
import { lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, rmdir, truncate, utimes, writeFile, } from "node:fs/promises";
|
|
6
6
|
import { hostname } from "node:os";
|
|
7
|
-
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
7
|
+
import { basename, dirname, isAbsolute, join, relative, resolve, sep, } from "node:path";
|
|
8
8
|
import { promisify } from "node:util";
|
|
9
9
|
import Papa from "papaparse";
|
|
10
|
-
import { ContractSchemaError, loadContract } from "./contract.js";
|
|
10
|
+
import { ContractSchemaError, loadContract, readScanFile } from "./contract.js";
|
|
11
|
+
import { BatchCostPool, batchScanBudget } from "./batch-cost.js";
|
|
11
12
|
import { deepScanOptions } from "./deep-config.js";
|
|
12
13
|
import { readThreatModelPath } from "./artifact-export.js";
|
|
13
14
|
import { OutputDirectoryNotEmptyError, errorMessage, ScanCostLimitExceededError, } from "./errors.js";
|
|
14
15
|
import { readKnowledgeBaseSnapshot, } from "./knowledge-base.js";
|
|
15
16
|
import { resolveScanPrompts } from "./prompt-files.js";
|
|
16
|
-
import { requireSecureOutputAncestry, resolvePluginPath, validateOutputDir, } from "./runtime.js";
|
|
17
|
-
import { DiffTarget, UNSUPPORTED_GIT_ENVIRONMENT, } from "./targets.js";
|
|
17
|
+
import { canonicalConfigPath, createWindowsOutputDirectory, requireSecureOutputAncestry, requireWindowsOutputPath, resolvePluginPath, validateOutputDir, } from "./runtime.js";
|
|
18
|
+
import { DiffTarget, gitOutput, gitProtectionRoots, nullIfMissingPath, UNSUPPORTED_GIT_ENVIRONMENT, resolveTargetPath, } from "./targets.js";
|
|
18
19
|
import { meetsSeverity, } from "./scan-settings.js";
|
|
19
20
|
import { workflowDigest } from "./finding-workflow.js";
|
|
20
|
-
import { resolveTrustedExecutable } from "./trusted-executable.js";
|
|
21
|
+
import { resolveTrustedExecutable, withProtectedExecutableRoots, } from "./trusted-executable.js";
|
|
21
22
|
const execFile = promisify(execFileCallback);
|
|
23
|
+
const CHECKOUT_MARKER = ".git/codex-security-campaign-attempt";
|
|
22
24
|
const REQUIRED_ARTIFACTS = ["scan-manifest.json", "findings.json", "report.md"];
|
|
23
25
|
const LOCK_LEASE_MS = 30_000;
|
|
24
26
|
const LOCK_HEARTBEAT_MS = 5_000;
|
|
25
27
|
const WINDOWS_DEVICE_PATH_NAME = /^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/iu;
|
|
28
|
+
class AttemptNumberExhaustedError extends Error {
|
|
29
|
+
}
|
|
26
30
|
export async function runMultiscan(options) {
|
|
27
31
|
options.signal?.throwIfAborted();
|
|
28
32
|
if (!Number.isSafeInteger(options.workers) || options.workers < 1) {
|
|
@@ -31,7 +35,7 @@ export async function runMultiscan(options) {
|
|
|
31
35
|
if (!Number.isSafeInteger(options.maxAttempts) || options.maxAttempts < 1) {
|
|
32
36
|
throw new Error("Multiscan max attempts must be a positive integer.");
|
|
33
37
|
}
|
|
34
|
-
const tasks = parseInventory(await readFile(options.inputPath, "utf8"), dirname(
|
|
38
|
+
const tasks = parseInventory(await readFile(options.inputPath, "utf8"), dirname(resolveTargetPath(options.inputPath)), options.mode);
|
|
35
39
|
for (const mode of new Set(tasks.map((task) => task.mode))) {
|
|
36
40
|
deepScanOptions({ ...options.scanOptionsByMode?.[mode], mode });
|
|
37
41
|
}
|
|
@@ -39,29 +43,21 @@ export async function runMultiscan(options) {
|
|
|
39
43
|
options.scanOptionsByMode?.[task.mode]?.target instanceof DiffTarget)) {
|
|
40
44
|
throw new Error("Bulk scans do not support diff or working-tree scopes because their checkouts are clean, shallow snapshots. Use repository or path scopes instead.");
|
|
41
45
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
if (code !== "ENOENT" && code !== "ENOTDIR")
|
|
58
|
-
throw error;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
// Shared inputs use actual local CSV sources as directory-link boundaries,
|
|
63
|
-
// not the invocation directory, and are read once before any scan starts.
|
|
64
|
-
const prompts = await resolveScanPrompts(options, repositories);
|
|
46
|
+
// Direct input paths need no source discovery. Prompts and knowledge share the result.
|
|
47
|
+
let pendingRoots;
|
|
48
|
+
const documentRoots = () => (pendingRoots ??= bulkDocumentRoots(tasks, options.signal));
|
|
49
|
+
const requestedOutput = resolve(options.outputDir);
|
|
50
|
+
const localSources = [
|
|
51
|
+
...new Set(tasks.map((task) => task.repository).filter(isAbsolute)),
|
|
52
|
+
];
|
|
53
|
+
const worktrees = await Promise.all(localSources.map((source) => gitProtectionRoots(source, options.signal)));
|
|
54
|
+
const executableRoots = (output) => [
|
|
55
|
+
...localSources,
|
|
56
|
+
...worktrees.flat(),
|
|
57
|
+
join(output, "checkouts"),
|
|
58
|
+
join(output, "recovery-checkouts"),
|
|
59
|
+
];
|
|
60
|
+
const prompts = await resolveScanPrompts(options, () => withProtectedExecutableRoots(executableRoots(requestedOutput), documentRoots));
|
|
65
61
|
const resolvedOptions = {
|
|
66
62
|
...options,
|
|
67
63
|
...prompts,
|
|
@@ -75,14 +71,14 @@ export async function runMultiscan(options) {
|
|
|
75
71
|
tasks.some((task) => task.mode === "deep")) {
|
|
76
72
|
throw new Error("Custom validation is not supported for Deep scans.");
|
|
77
73
|
}
|
|
78
|
-
const requestedOutput = resolve(options.outputDir);
|
|
79
74
|
if (options.recoverScan !== undefined) {
|
|
80
75
|
const manifest = await lstat(join(requestedOutput, "manifest.json")).catch(undefinedIfMissingFile);
|
|
81
76
|
if (!manifest?.isFile())
|
|
82
77
|
throw new Error("Bulk recovery requires an existing campaign manifest.");
|
|
83
78
|
}
|
|
84
|
-
const output = await ensureOutputDirectory(requestedOutput);
|
|
85
|
-
|
|
79
|
+
const output = await ensureOutputDirectory(requestedOutput, "artifacts");
|
|
80
|
+
if (process.platform !== "win32")
|
|
81
|
+
await requireSecureOutputAncestry(output);
|
|
86
82
|
const unlock = await acquireLock(output);
|
|
87
83
|
let pluginWorkspace;
|
|
88
84
|
let pluginRoot;
|
|
@@ -93,7 +89,7 @@ export async function runMultiscan(options) {
|
|
|
93
89
|
return await resolvePluginPath(options.config.pluginPath, pluginWorkspace ?? output, options.signal);
|
|
94
90
|
})());
|
|
95
91
|
try {
|
|
96
|
-
const result = await runCampaign(resolvedOptions, tasks, output, resumePluginRoot);
|
|
92
|
+
const result = await withProtectedExecutableRoots(executableRoots(output), () => runCampaign(resolvedOptions, tasks, output, resumePluginRoot, documentRoots));
|
|
97
93
|
return (await realpath(requestedOutput).catch(() => undefined)) === output
|
|
98
94
|
? { ...result, resultsPath: join(requestedOutput, "results.jsonl") }
|
|
99
95
|
: result;
|
|
@@ -107,20 +103,49 @@ export async function runMultiscan(options) {
|
|
|
107
103
|
]);
|
|
108
104
|
}
|
|
109
105
|
}
|
|
110
|
-
async function
|
|
106
|
+
async function bulkDocumentRoots(tasks, signal) {
|
|
107
|
+
const roots = [];
|
|
108
|
+
for (const repository of new Set(tasks.map((task) => task.repository))) {
|
|
109
|
+
if (!isAbsolute(repository))
|
|
110
|
+
continue;
|
|
111
|
+
const source = await realpath(repository).catch(nullIfMissingPath);
|
|
112
|
+
if (source === null) {
|
|
113
|
+
// Git also accepts an omitted .git suffix; wholly missing rows fail at checkout.
|
|
114
|
+
if (await lstat(repository + ".git").catch(nullIfMissingPath))
|
|
115
|
+
return null;
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
// Only an ordinary worktree and its own .git directory share one boundary.
|
|
119
|
+
const marker = await lstat(join(source, ".git")).catch(nullIfMissingPath);
|
|
120
|
+
if (!marker?.isDirectory())
|
|
121
|
+
return null;
|
|
122
|
+
const layout = await gitOutput(source, [
|
|
123
|
+
"rev-parse",
|
|
124
|
+
"--path-format=relative",
|
|
125
|
+
"--show-toplevel",
|
|
126
|
+
"--git-common-dir",
|
|
127
|
+
], signal, undefined, source, "utf8", process.cwd()).catch(() => null);
|
|
128
|
+
signal?.throwIfAborted();
|
|
129
|
+
if (layout !== "./\n.git" && layout !== "./\r\n.git")
|
|
130
|
+
return null;
|
|
131
|
+
roots.push(source);
|
|
132
|
+
}
|
|
133
|
+
return roots;
|
|
134
|
+
}
|
|
135
|
+
async function runCampaign(options, tasks, output, resumePluginRoot, documentRoots) {
|
|
111
136
|
const ledger = join(output, "results.jsonl");
|
|
112
137
|
await ensureOutputDirectory(join(output, "checkouts"));
|
|
113
138
|
await ensureOutputDirectory(join(output, "artifacts"));
|
|
114
139
|
const knowledgeByMode = {};
|
|
115
140
|
const sharedKnowledge = options.knowledgeBasePaths?.length
|
|
116
|
-
? readKnowledgeBaseSnapshot(options.knowledgeBasePaths, options.signal)
|
|
141
|
+
? readKnowledgeBaseSnapshot(options.knowledgeBasePaths, options.signal, documentRoots)
|
|
117
142
|
: undefined;
|
|
118
143
|
for (const mode of new Set(tasks.map((task) => task.mode))) {
|
|
119
144
|
try {
|
|
120
145
|
const paths = options.scanOptionsByMode?.[mode]?.knowledgeBasePaths;
|
|
121
146
|
const snapshot = await (sharedKnowledge ??
|
|
122
147
|
(paths?.length
|
|
123
|
-
? readKnowledgeBaseSnapshot(paths, options.signal)
|
|
148
|
+
? readKnowledgeBaseSnapshot(paths, options.signal, documentRoots)
|
|
124
149
|
: undefined));
|
|
125
150
|
if (snapshot !== undefined)
|
|
126
151
|
knowledgeByMode[mode] = { snapshot };
|
|
@@ -176,15 +201,10 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
176
201
|
continue;
|
|
177
202
|
}
|
|
178
203
|
if (artifactsPresent) {
|
|
179
|
-
if (receipt.status === "completed"
|
|
180
|
-
Number.isSafeInteger(receipt.attempt) &&
|
|
181
|
-
receipt.attempt > 0) {
|
|
204
|
+
if (receipt.status === "completed") {
|
|
182
205
|
try {
|
|
183
206
|
if (receipt.cleanupPending === "checkout") {
|
|
184
|
-
await
|
|
185
|
-
recursive: true,
|
|
186
|
-
force: true,
|
|
187
|
-
});
|
|
207
|
+
await removeCheckout(join(output, "checkouts", task.id), artifactOutput, options.signal);
|
|
188
208
|
}
|
|
189
209
|
else if (receipt.cleanupPending === "recovery-checkout") {
|
|
190
210
|
const recoveryRoot = join(output, "recovery-checkouts");
|
|
@@ -193,10 +213,7 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
193
213
|
const taskRoot = join(recoveryRoot, task.id);
|
|
194
214
|
await lstat(taskRoot);
|
|
195
215
|
await ensureOutputDirectory(taskRoot);
|
|
196
|
-
await
|
|
197
|
-
recursive: true,
|
|
198
|
-
force: true,
|
|
199
|
-
});
|
|
216
|
+
await removeCheckout(join(taskRoot, `attempt-${receipt.attempt}`), artifactOutput, options.signal);
|
|
200
217
|
}
|
|
201
218
|
}
|
|
202
219
|
catch { }
|
|
@@ -233,6 +250,9 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
233
250
|
});
|
|
234
251
|
if (pending.length === 0)
|
|
235
252
|
return summarize();
|
|
253
|
+
const pool = options.maxTotalCostUsd === undefined
|
|
254
|
+
? undefined
|
|
255
|
+
: new BatchCostPool(options.maxTotalCostUsd, pending.length * options.maxAttempts);
|
|
236
256
|
let next = 0;
|
|
237
257
|
let receiptTail = Promise.resolve();
|
|
238
258
|
const worker = async (security) => {
|
|
@@ -242,8 +262,19 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
242
262
|
if (task === undefined)
|
|
243
263
|
return;
|
|
244
264
|
const knowledge = knowledgeByMode[task.mode];
|
|
265
|
+
const scanSettings = options.scanOptionsByMode?.[task.mode];
|
|
266
|
+
const budget = batchScanBudget(pool?.share, {
|
|
267
|
+
...options,
|
|
268
|
+
maxCostUsd: options.maxCostUsd ?? scanSettings?.maxCostUsd,
|
|
269
|
+
});
|
|
245
270
|
const history = receipts.get(task.id.toLowerCase());
|
|
271
|
+
let operationId = history?.scan?.operationId;
|
|
246
272
|
let maxAttempt = history?.maxAttempt ?? 0;
|
|
273
|
+
const nextAttempt = () => {
|
|
274
|
+
if (maxAttempt === Number.MAX_SAFE_INTEGER)
|
|
275
|
+
throw new AttemptNumberExhaustedError(`No more attempt numbers are available for ${task.id}. Start a separate campaign in a new --output-dir.`);
|
|
276
|
+
return ++maxAttempt;
|
|
277
|
+
};
|
|
247
278
|
let recoveryAttempt = history?.scan?.attempt ?? 0;
|
|
248
279
|
const artifactRoot = join(output, "artifacts", task.id);
|
|
249
280
|
if (options.recoverScan !== undefined) {
|
|
@@ -260,7 +291,7 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
260
291
|
options.signal?.throwIfAborted();
|
|
261
292
|
let attempt = maxAttempt;
|
|
262
293
|
if (options.recoverScan === undefined)
|
|
263
|
-
attempt =
|
|
294
|
+
attempt = nextAttempt();
|
|
264
295
|
else if (retry === 0)
|
|
265
296
|
attempt = recoveryAttempt;
|
|
266
297
|
let scanDir = join(artifactRoot, `attempt-${attempt}`);
|
|
@@ -272,11 +303,27 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
272
303
|
const runWarnings = [];
|
|
273
304
|
let attemptPolicyFailed;
|
|
274
305
|
let cost = null;
|
|
306
|
+
let measurement = null;
|
|
307
|
+
let reservation;
|
|
308
|
+
let savedUsage;
|
|
309
|
+
const observers = {
|
|
310
|
+
onMeasurement: (value) => {
|
|
311
|
+
reservation?.record(value.cost);
|
|
312
|
+
measurement = value;
|
|
313
|
+
cost = value.cost;
|
|
314
|
+
},
|
|
315
|
+
onTelemetry: (event) => {
|
|
316
|
+
operationId = event.operationId;
|
|
317
|
+
},
|
|
318
|
+
};
|
|
275
319
|
let threatModelPath;
|
|
276
320
|
let exhaustedBudget = false;
|
|
277
321
|
let requiresRecovery = false;
|
|
278
322
|
let knowledgeBaseFailure = false;
|
|
323
|
+
let checkoutOccupied = false;
|
|
279
324
|
try {
|
|
325
|
+
reservation = pool?.reserve(budget.maxCostUsd);
|
|
326
|
+
const maxCostUsd = reservation?.maxCostUsd ?? budget.maxCostUsd;
|
|
280
327
|
await ensureOutputDirectory(artifactRoot);
|
|
281
328
|
let result;
|
|
282
329
|
if (options.recoverScan !== undefined &&
|
|
@@ -299,6 +346,7 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
299
346
|
repository: task.id,
|
|
300
347
|
attempt,
|
|
301
348
|
status: "started",
|
|
349
|
+
maxCostUsd,
|
|
302
350
|
});
|
|
303
351
|
if (knowledge?.failure !== undefined) {
|
|
304
352
|
knowledgeBaseFailure = true;
|
|
@@ -306,20 +354,27 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
306
354
|
}
|
|
307
355
|
result = await options.recoverScan(scanDir, {
|
|
308
356
|
...options,
|
|
357
|
+
...(options.maxTotalCostUsd === undefined
|
|
358
|
+
? {}
|
|
359
|
+
: { maxTotalCostShareUsd: maxCostUsd }),
|
|
309
360
|
knowledgeBaseSnapshot: knowledge?.snapshot,
|
|
361
|
+
...observers,
|
|
362
|
+
...(operationId === undefined
|
|
363
|
+
? {}
|
|
364
|
+
: { telemetryContext: { operationId } }),
|
|
310
365
|
});
|
|
311
366
|
attemptedResume = result !== undefined;
|
|
312
367
|
}
|
|
313
368
|
}
|
|
314
|
-
const scanSettings = options.scanOptionsByMode?.[task.mode];
|
|
315
369
|
if (result === undefined) {
|
|
316
370
|
if (options.recoverScan !== undefined)
|
|
317
|
-
attempt =
|
|
371
|
+
attempt = nextAttempt();
|
|
318
372
|
scanDir = join(artifactRoot, `attempt-${attempt}`);
|
|
319
373
|
notifyProgress(options, {
|
|
320
374
|
repository: task.id,
|
|
321
375
|
attempt,
|
|
322
376
|
status: "started",
|
|
377
|
+
maxCostUsd,
|
|
323
378
|
});
|
|
324
379
|
if (options.recoverScan === undefined)
|
|
325
380
|
await validateOutputDir(scanDir);
|
|
@@ -336,11 +391,26 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
336
391
|
await mkdir(checkout, { mode: 0o700 });
|
|
337
392
|
}
|
|
338
393
|
else {
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
394
|
+
const destination = join(output, "checkouts", task.id);
|
|
395
|
+
try {
|
|
396
|
+
await mkdir(destination, { mode: 0o700 });
|
|
397
|
+
checkout = destination;
|
|
398
|
+
}
|
|
399
|
+
catch (error) {
|
|
400
|
+
if (error.code !== "EEXIST")
|
|
401
|
+
throw error;
|
|
402
|
+
checkoutOccupied = true;
|
|
403
|
+
throw new Error(`Bulk checkout is already occupied: ${destination}. Retry with --recover to use a fresh checkout, or inspect and move the retained checkout before an ordinary retry.`);
|
|
404
|
+
}
|
|
342
405
|
}
|
|
343
406
|
protectedRoot = checkout;
|
|
407
|
+
// Claim the fresh checkout before Git or the scanner can fail.
|
|
408
|
+
const marker = await checkoutMarker(checkout, scanDir);
|
|
409
|
+
await mkdir(join(checkout, ".git"), { mode: 0o700 });
|
|
410
|
+
await writeFile(join(checkout, CHECKOUT_MARKER), marker, {
|
|
411
|
+
flag: "wx",
|
|
412
|
+
mode: 0o600,
|
|
413
|
+
});
|
|
344
414
|
await checkoutRevision(task, checkout, options.signal, options.githubHost);
|
|
345
415
|
if (task.scope !== undefined) {
|
|
346
416
|
const scoped = await realpath(join(checkout, task.scope));
|
|
@@ -354,6 +424,7 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
354
424
|
const scanPrompt = [options.scanPrompt?.trim(), task.prompt]
|
|
355
425
|
.filter(Boolean)
|
|
356
426
|
.join("\n\n");
|
|
427
|
+
operationId ??= randomUUID();
|
|
357
428
|
result = await security.run(checkout, {
|
|
358
429
|
...scanSettings,
|
|
359
430
|
knowledgeBaseSnapshot: knowledge?.snapshot,
|
|
@@ -364,6 +435,7 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
364
435
|
? { knowledgeBasePaths: options.knowledgeBasePaths }
|
|
365
436
|
: {}),
|
|
366
437
|
mode: task.mode,
|
|
438
|
+
telemetryContext: { operationId },
|
|
367
439
|
outputDir: scanDir,
|
|
368
440
|
...(scanPrompt ? { scanPrompt } : {}),
|
|
369
441
|
...(options.validationPrompt === undefined
|
|
@@ -372,9 +444,9 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
372
444
|
...(options.postScanPrompt === undefined
|
|
373
445
|
? {}
|
|
374
446
|
: { postScanPrompt: options.postScanPrompt }),
|
|
375
|
-
...
|
|
376
|
-
|
|
377
|
-
|
|
447
|
+
...budget,
|
|
448
|
+
maxCostUsd,
|
|
449
|
+
...observers,
|
|
378
450
|
onWarning: (warning) => {
|
|
379
451
|
runWarnings.push(warning);
|
|
380
452
|
notifyProgress(options, {
|
|
@@ -391,6 +463,9 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
391
463
|
}
|
|
392
464
|
threatModelPath = result.threatModelPath;
|
|
393
465
|
cost = result.cost;
|
|
466
|
+
if (!result.alreadyCompleted)
|
|
467
|
+
reservation?.record(cost);
|
|
468
|
+
savedUsage = result.usage;
|
|
394
469
|
const failureSeverity = scanSettings?.failureSeverity;
|
|
395
470
|
if (failureSeverity !== undefined) {
|
|
396
471
|
attemptPolicyFailed = result.findings.findings.some((finding) => meetsSeverity(finding, failureSeverity));
|
|
@@ -399,20 +474,26 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
399
474
|
throw new Error(`Multiscan scan ${result.manifest.scan.status}.`);
|
|
400
475
|
}
|
|
401
476
|
catch (error) {
|
|
402
|
-
if (
|
|
477
|
+
if (error instanceof AttemptNumberExhaustedError)
|
|
478
|
+
throw error;
|
|
479
|
+
// Recovery retains its resumable attempt and checkout; SDK telemetry records cancellation.
|
|
480
|
+
if (options.signal?.aborted && options.recoverScan !== undefined)
|
|
403
481
|
options.signal.throwIfAborted();
|
|
482
|
+
if (pool && !reservation)
|
|
483
|
+
exhaustedBudget = true;
|
|
404
484
|
if (error instanceof ScanCostLimitExceededError) {
|
|
405
485
|
cost = error.cost;
|
|
486
|
+
reservation?.record(cost);
|
|
406
487
|
exhaustedBudget = true;
|
|
407
488
|
}
|
|
408
489
|
requiresRecovery = error instanceof OutputDirectoryNotEmptyError;
|
|
409
490
|
failure = requiresRecovery
|
|
410
|
-
? `Bulk attempt directory is not empty: ${scanDir}. Existing artifacts
|
|
491
|
+
? `Bulk attempt directory is not empty: ${scanDir}. Existing artifacts were preserved. Run the same bulk-scan command with --recover to recover interrupted scans or retry failed scans in new attempt directories.`
|
|
411
492
|
: errorMessage(error);
|
|
412
493
|
}
|
|
413
494
|
finally {
|
|
414
495
|
if (options.recoverScan === undefined && checkout !== undefined) {
|
|
415
|
-
cleanupFailure = await removeCheckout(checkout);
|
|
496
|
+
cleanupFailure = await removeCheckout(checkout, scanDir);
|
|
416
497
|
}
|
|
417
498
|
}
|
|
418
499
|
const reportedErrors = [failure, cleanupFailure].filter((message) => message !== undefined);
|
|
@@ -422,7 +503,7 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
422
503
|
threatModelPath = await readThreatModelPath(scanDir, {
|
|
423
504
|
pythonPath: options.config.pythonPath,
|
|
424
505
|
protectedRoot,
|
|
425
|
-
signal: options.signal,
|
|
506
|
+
signal: options.signal?.aborted ? undefined : options.signal,
|
|
426
507
|
});
|
|
427
508
|
const recoveryCheckout = options.recoverScan !== undefined && failure === undefined
|
|
428
509
|
? checkout
|
|
@@ -431,9 +512,13 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
431
512
|
...task,
|
|
432
513
|
status,
|
|
433
514
|
attempt,
|
|
515
|
+
...(operationId === undefined ? {} : { operationId }),
|
|
434
516
|
outputDir: scanDir,
|
|
435
517
|
...(threatModelPath === null ? {} : { threatModelPath }),
|
|
436
518
|
...(cost === null ? {} : { cost }),
|
|
519
|
+
...(measurement === null ? {} : { measurement }),
|
|
520
|
+
...(savedUsage === undefined ? {} : { usage: savedUsage }),
|
|
521
|
+
outcome: options.signal?.aborted ? "canceled" : status,
|
|
437
522
|
...(reportedError === undefined ? {} : { error: reportedError }),
|
|
438
523
|
...(recoveryCheckout !== undefined
|
|
439
524
|
? { cleanupPending: "recovery-checkout" }
|
|
@@ -441,14 +526,16 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
441
526
|
? { cleanupPending: "checkout" }
|
|
442
527
|
: {}),
|
|
443
528
|
...(knowledgeBaseFailure ? { knowledgeBaseFailure: true } : {}),
|
|
529
|
+
...(checkoutOccupied ? { checkoutOccupied: true } : {}),
|
|
444
530
|
...(runWarnings.length === 0 ? {} : { warnings: runWarnings }),
|
|
445
531
|
policyFailed: attemptPolicyFailed,
|
|
446
532
|
};
|
|
447
533
|
const receiptLine = `${JSON.stringify(receipt)}\n`;
|
|
448
534
|
receiptTail = receiptTail.then(() => appendReceipt(ledger, receiptLine));
|
|
449
535
|
await receiptTail;
|
|
536
|
+
options.signal?.throwIfAborted();
|
|
450
537
|
if (recoveryCheckout !== undefined) {
|
|
451
|
-
reportedError = await removeCheckout(recoveryCheckout);
|
|
538
|
+
reportedError = await removeCheckout(recoveryCheckout, scanDir);
|
|
452
539
|
}
|
|
453
540
|
notifyProgress(options, {
|
|
454
541
|
repository: task.id,
|
|
@@ -464,7 +551,10 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
464
551
|
completed += 1;
|
|
465
552
|
break;
|
|
466
553
|
}
|
|
467
|
-
if (exhaustedBudget ||
|
|
554
|
+
if (exhaustedBudget ||
|
|
555
|
+
attemptedResume ||
|
|
556
|
+
requiresRecovery ||
|
|
557
|
+
checkoutOccupied) {
|
|
468
558
|
failed += 1;
|
|
469
559
|
break;
|
|
470
560
|
}
|
|
@@ -490,33 +580,69 @@ async function runCampaign(options, tasks, output, resumePluginRoot) {
|
|
|
490
580
|
function notifyProgress(options, event) {
|
|
491
581
|
notify(() => options.onProgress?.(event));
|
|
492
582
|
}
|
|
493
|
-
|
|
494
|
-
|
|
583
|
+
// A completed attempt can be revisited after its checkout path was reused.
|
|
584
|
+
async function checkoutMarker(checkout, scanDir) {
|
|
585
|
+
const directory = await lstat(checkout, { bigint: true });
|
|
586
|
+
if (!directory.isDirectory())
|
|
587
|
+
throw new Error("The campaign checkout is no longer a directory.");
|
|
588
|
+
return JSON.stringify([
|
|
589
|
+
scanDir,
|
|
590
|
+
String(directory.dev),
|
|
591
|
+
String(directory.ino),
|
|
592
|
+
]);
|
|
495
593
|
}
|
|
496
|
-
async function
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
594
|
+
async function removeCheckout(checkout, scanDir, signal) {
|
|
595
|
+
try {
|
|
596
|
+
const marker = await lstat(join(checkout, CHECKOUT_MARKER)).catch(undefinedIfMissingFile);
|
|
597
|
+
if (!marker?.isFile())
|
|
598
|
+
return undefined;
|
|
599
|
+
const expected = Buffer.from(await checkoutMarker(checkout, scanDir));
|
|
600
|
+
if (marker.size === expected.length &&
|
|
601
|
+
(await readScanFile(checkout, CHECKOUT_MARKER, "campaign checkout marker", signal)).equals(expected)) {
|
|
602
|
+
await rm(checkout, { recursive: true, force: true });
|
|
603
|
+
}
|
|
500
604
|
}
|
|
501
|
-
|
|
502
|
-
|
|
605
|
+
catch (error) {
|
|
606
|
+
return `Multiscan checkout cleanup failed: ${errorMessage(error)}`;
|
|
503
607
|
}
|
|
504
|
-
|
|
608
|
+
}
|
|
609
|
+
async function ensureOutputDirectory(path, retainedDirectory) {
|
|
610
|
+
const linkedOutput = "Multiscan output directories must not be symbolic links.";
|
|
611
|
+
let metadata = await lstat(path, { bigint: true }).catch(undefinedIfMissingFile);
|
|
505
612
|
if (metadata === undefined) {
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
613
|
+
if (process.platform === "win32") {
|
|
614
|
+
// Resolve parent aliases while leaving the leaf for lstat to verify.
|
|
615
|
+
path = join(await canonicalConfigPath(dirname(path)), basename(path));
|
|
616
|
+
try {
|
|
617
|
+
await createWindowsOutputDirectory(path, true);
|
|
618
|
+
}
|
|
619
|
+
catch (error) {
|
|
620
|
+
if ((await lstat(path).catch(() => undefined))?.isSymbolicLink()) {
|
|
621
|
+
throw new Error(linkedOutput, { cause: error });
|
|
622
|
+
}
|
|
623
|
+
throw error;
|
|
624
|
+
}
|
|
625
|
+
}
|
|
626
|
+
else {
|
|
627
|
+
await mkdir(path, { recursive: true, mode: 0o700 });
|
|
628
|
+
}
|
|
629
|
+
metadata = await lstat(path, { bigint: true });
|
|
630
|
+
}
|
|
631
|
+
if (metadata.isSymbolicLink()) {
|
|
632
|
+
throw new Error(linkedOutput);
|
|
633
|
+
}
|
|
634
|
+
if (!metadata.isDirectory()) {
|
|
635
|
+
throw new Error("Multiscan output paths must be directories.");
|
|
511
636
|
}
|
|
512
|
-
const canonical = await realpath(
|
|
637
|
+
const canonical = await realpath(path);
|
|
513
638
|
const directory = await lstat(canonical, { bigint: true });
|
|
514
|
-
if (metadata !==
|
|
515
|
-
(directory.dev !== metadata.dev || directory.ino !== metadata.ino)) {
|
|
639
|
+
if (directory.dev !== metadata.dev || directory.ino !== metadata.ino) {
|
|
516
640
|
throw new Error("Multiscan output directories changed during preparation.");
|
|
517
641
|
}
|
|
518
|
-
if (process.platform === "win32")
|
|
642
|
+
if (process.platform === "win32") {
|
|
643
|
+
await requireWindowsOutputPath(canonical, true, retainedDirectory);
|
|
519
644
|
return canonical;
|
|
645
|
+
}
|
|
520
646
|
if ((directory.mode & 18n) !== 0n) {
|
|
521
647
|
throw new Error("Multiscan output directories must not be group- or world-writable.");
|
|
522
648
|
}
|
|
@@ -526,22 +652,6 @@ async function ensureOutputDirectory(path) {
|
|
|
526
652
|
}
|
|
527
653
|
return canonical;
|
|
528
654
|
}
|
|
529
|
-
async function canonicalWindowsCreationPath(path) {
|
|
530
|
-
let ancestor = dirname(path);
|
|
531
|
-
for (;;) {
|
|
532
|
-
try {
|
|
533
|
-
return resolve(await realpath(ancestor), relative(ancestor, path));
|
|
534
|
-
}
|
|
535
|
-
catch (error) {
|
|
536
|
-
if (error.code !== "ENOENT")
|
|
537
|
-
throw error;
|
|
538
|
-
const parent = dirname(ancestor);
|
|
539
|
-
if (parent === ancestor)
|
|
540
|
-
throw error;
|
|
541
|
-
ancestor = parent;
|
|
542
|
-
}
|
|
543
|
-
}
|
|
544
|
-
}
|
|
545
655
|
async function appendReceipt(path, receipt) {
|
|
546
656
|
const file = await open(path, "a", 0o600);
|
|
547
657
|
try {
|
|
@@ -636,7 +746,7 @@ async function inspectLock(path) {
|
|
|
636
746
|
}
|
|
637
747
|
let identity;
|
|
638
748
|
try {
|
|
639
|
-
identity = JSON.parse(owner);
|
|
749
|
+
identity = (JSON.parse(owner) ?? {});
|
|
640
750
|
}
|
|
641
751
|
catch {
|
|
642
752
|
return { owner, stale: Date.now() - modifiedAt > LOCK_LEASE_MS };
|
|
@@ -809,6 +919,8 @@ async function readReceipts(path, preserveInterrupted = false) {
|
|
|
809
919
|
saved = JSON.parse(line);
|
|
810
920
|
if (typeof saved?.id !== "string")
|
|
811
921
|
throw new Error("Expected a receipt with a string id");
|
|
922
|
+
if (!Number.isSafeInteger(saved.attempt) || saved.attempt < 1)
|
|
923
|
+
throw new Error("Expected a positive integer receipt attempt");
|
|
812
924
|
}
|
|
813
925
|
catch (cause) {
|
|
814
926
|
throw new Error(`${path}:${index + 1}: ${errorMessage(cause)}. Restore a complete ledger backup that includes every committed attempt, or start a separate campaign in a new --output-dir.`, { cause });
|
|
@@ -820,8 +932,10 @@ async function readReceipts(path, preserveInterrupted = false) {
|
|
|
820
932
|
const previous = receipts.get(id);
|
|
821
933
|
receipts.set(id, {
|
|
822
934
|
maxAttempt: Math.max(previous?.maxAttempt ?? 0, receipt.attempt),
|
|
823
|
-
//
|
|
824
|
-
scan: receipt.knowledgeBaseFailure
|
|
935
|
+
// Pre-scan failures reserve an attempt but leave the last scan recoverable.
|
|
936
|
+
scan: receipt.knowledgeBaseFailure || receipt.checkoutOccupied
|
|
937
|
+
? previous?.scan
|
|
938
|
+
: receipt,
|
|
825
939
|
});
|
|
826
940
|
}
|
|
827
941
|
if (contents.at(-1) !== 10) {
|
|
@@ -871,7 +985,7 @@ function parseInventory(source, directory, defaultMode) {
|
|
|
871
985
|
if (errors.length > 0) {
|
|
872
986
|
throw new Error(`Multiscan CSV could not be parsed: ${errors[0].message}`);
|
|
873
987
|
}
|
|
874
|
-
const headers = rows.shift();
|
|
988
|
+
const headers = rows.shift()?.map((header) => header.trim());
|
|
875
989
|
if (headers === undefined ||
|
|
876
990
|
!["id", "repository", "revision"].every((name) => headers.includes(name)) ||
|
|
877
991
|
new Set(headers).size !== headers.length) {
|
|
@@ -912,9 +1026,10 @@ function parseInventory(source, directory, defaultMode) {
|
|
|
912
1026
|
scope.includes("\0"))) {
|
|
913
1027
|
throw new Error("Multiscan scope must stay inside its repository.");
|
|
914
1028
|
}
|
|
1029
|
+
const repository = normalizeRepository(get("repository"), directory);
|
|
915
1030
|
return {
|
|
916
1031
|
id,
|
|
917
|
-
repository
|
|
1032
|
+
repository,
|
|
918
1033
|
revision,
|
|
919
1034
|
mode: mode,
|
|
920
1035
|
...(scope ? { scope } : {}),
|
|
@@ -929,7 +1044,7 @@ function normalizeRepository(repository, directory) {
|
|
|
929
1044
|
if (/^[^@\s/:]+@[^:\s/]+:.+$/u.test(repository))
|
|
930
1045
|
return repository;
|
|
931
1046
|
if (!repository.includes("://")) {
|
|
932
|
-
const path =
|
|
1047
|
+
const path = resolveTargetPath(repository, directory);
|
|
933
1048
|
if (process.platform !== "win32")
|
|
934
1049
|
return path;
|
|
935
1050
|
try {
|