@openai/codex-security 0.2.0 → 0.4.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 +437 -2692
- package/_bundled_plugin/.app.json +5 -1
- package/_bundled_plugin/.codex-plugin/plugin.json +4 -0
- package/_bundled_plugin/.mcp.json +2 -0
- package/_bundled_plugin/examples/completed-scan/coverage.json +0 -1
- package/_bundled_plugin/examples/completed-scan/report.md +28 -26
- package/_bundled_plugin/examples/completed-scan/scan-manifest.json +1 -1
- package/_bundled_plugin/mcp/helpers.mjs +1 -0
- package/_bundled_plugin/mcp/helpers.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/native/THIRD_PARTY_NOTICES.txt +6 -213
- 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/permission-profile-preflight.mjs +556 -0
- package/_bundled_plugin/mcp/server.mjs +1 -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/preflight/capability-profiles.toml +0 -13
- package/_bundled_plugin/references/artifact-storage.md +2 -2
- package/_bundled_plugin/references/config-preflight.md +0 -4
- package/_bundled_plugin/references/core-scan.md +21 -9
- package/_bundled_plugin/references/final-report.md +11 -13
- package/_bundled_plugin/references/finding-detail-fields.md +90 -80
- package/_bundled_plugin/references/sarif-adapter.md +1 -1
- package/_bundled_plugin/references/scan-artifacts.md +1 -2
- package/_bundled_plugin/references/scan-contract.md +9 -4
- package/_bundled_plugin/references/scan-prologue.md +12 -0
- package/_bundled_plugin/references/security-guidance.md +2 -2
- package/_bundled_plugin/references/standalone-validation.md +11 -0
- package/_bundled_plugin/references/threat-model.md +1 -1
- package/_bundled_plugin/schemas/coverage.schema.json +43 -170
- package/_bundled_plugin/schemas/definitions/artifact-common.schema.json +2 -24
- package/_bundled_plugin/schemas/definitions/discovery-candidate.schema.json +49 -25
- package/_bundled_plugin/schemas/findings.schema.json +159 -567
- package/_bundled_plugin/schemas/patch-risk-assessment.schema.json +106 -119
- package/_bundled_plugin/schemas/scan-manifest.schema.json +78 -220
- package/_bundled_plugin/schemas/tools/candidate-attack-paths.schema.json +91 -83
- package/_bundled_plugin/schemas/tools/candidate-validations.schema.json +35 -64
- package/_bundled_plugin/schemas/tools/deep-reducer.schema.json +5 -2
- package/_bundled_plugin/schemas/tools/discovery-candidates.schema.json +6 -55
- package/_bundled_plugin/schemas/tools/review-items.schema.json +2 -38
- package/_bundled_plugin/schemas/tools/scan-draft.schema.json +169 -294
- package/_bundled_plugin/scripts/codex_profile.mjs +239 -0
- package/_bundled_plugin/scripts/codex_session.mjs +53 -0
- package/_bundled_plugin/scripts/config_preflight.py +26 -62
- package/_bundled_plugin/scripts/deep_scan_config.py +9 -11
- package/_bundled_plugin/scripts/deep_scan_workbench.py +129 -150
- package/_bundled_plugin/scripts/finalize_scan_contract.py +321 -237
- package/_bundled_plugin/scripts/finding_preview.py +39 -9
- package/_bundled_plugin/scripts/generate_in_scope_files.py +27 -77
- package/_bundled_plugin/scripts/generate_rank_input.py +115 -926
- package/_bundled_plugin/scripts/launch_codex_security_mcp +35 -10
- package/_bundled_plugin/scripts/launch_codex_security_mcp.cmd +5 -5
- package/_bundled_plugin/scripts/rank_preview.py +42 -918
- package/_bundled_plugin/scripts/report_projection.py +150 -183
- package/_bundled_plugin/scripts/snapshot_sqlite.py +6 -1
- package/_bundled_plugin/scripts/threat_model_projection.py +4 -7
- package/_bundled_plugin/scripts/validate_scan_contract.py +4 -34
- package/_bundled_plugin/scripts/validate_tracking_source.py +3 -13
- package/_bundled_plugin/scripts/windows_scan_local_files.py +48 -3
- package/_bundled_plugin/scripts/workbench/handoff.py +25 -50
- package/_bundled_plugin/scripts/workbench/runtime_toml.py +22 -0
- package/_bundled_plugin/scripts/workbench/storage.py +10 -6
- package/_bundled_plugin/scripts/workbench_cli.py +102 -184
- package/_bundled_plugin/scripts/workbench_db.py +463 -464
- package/_bundled_plugin/scripts/workbench_feedback.py +6 -3
- package/_bundled_plugin/scripts/workbench_finding_index.py +19 -1
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +18 -4
- package/_bundled_plugin/scripts/workbench_local_dedupe.py +136 -0
- package/_bundled_plugin/scripts/workbench_native_indexes.py +27 -14
- package/_bundled_plugin/scripts/workbench_progress.py +14 -58
- package/_bundled_plugin/scripts/workbench_publication.py +234 -289
- package/_bundled_plugin/scripts/workbench_remediation.py +12 -0
- package/_bundled_plugin/scripts/workbench_saved_results.py +172 -49
- package/_bundled_plugin/scripts/workbench_scan_history.py +57 -57
- package/_bundled_plugin/scripts/workbench_scan_start.py +105 -41
- package/_bundled_plugin/scripts/workbench_scan_usage.py +194 -42
- package/_bundled_plugin/scripts/workbench_schema.py +37 -1151
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +11 -1
- package/_bundled_plugin/scripts/workbench_target.py +430 -142
- package/_bundled_plugin/scripts/workbench_validation.py +31 -28
- package/_bundled_plugin/shared/workbench-history-repairs.json +218 -0
- package/_bundled_plugin/shared/workbench-migrations.json +414 -0
- package/_bundled_plugin/skills/assess-patch-risk/SKILL.md +15 -4
- package/_bundled_plugin/skills/attack-path-analysis/SKILL.md +1 -0
- package/_bundled_plugin/skills/cloud-findings/SKILL.md +54 -0
- package/_bundled_plugin/skills/cloud-findings/agents/openai.yaml +4 -0
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +3 -3
- package/_bundled_plugin/skills/finding-discovery/SKILL.md +3 -3
- package/_bundled_plugin/skills/propose-security-hardening/references/proposal-format.md +50 -20
- package/_bundled_plugin/skills/security-diff-scan/SKILL.md +8 -14
- package/_bundled_plugin/skills/security-scan/SKILL.md +22 -7
- package/_bundled_plugin/skills/security-scan/references/desktop-scan.md +2 -2
- package/_bundled_plugin/skills/security-scan/references/scan-artifacts-and-ledger.md +15 -1
- package/_bundled_plugin/skills/threat-model/SKILL.md +1 -1
- package/_bundled_plugin/skills/track-findings/SKILL.md +48 -176
- package/_bundled_plugin/skills/track-findings/references/github-security-advisories.md +16 -24
- package/_bundled_plugin/skills/track-findings/references/jira.md +15 -61
- package/_bundled_plugin/skills/triage-finding/SKILL.md +50 -289
- package/_bundled_plugin/skills/triage-finding/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/triage-finding/references/ticket-intake.md +23 -43
- package/_bundled_plugin/skills/triage-finding/references/triage-result-contract.md +7 -1
- package/bin/codex-security.mjs +9 -2
- package/dist/api.d.ts +63 -10
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +1015 -383
- package/dist/api.js.map +1 -1
- package/dist/artifact-export.d.ts +1 -1
- package/dist/artifact-export.d.ts.map +1 -1
- package/dist/artifact-export.js +28 -13
- package/dist/artifact-export.js.map +1 -1
- package/dist/auth.d.ts +2 -6
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +19 -9
- package/dist/auth.js.map +1 -1
- package/dist/bulk-scan-discovery.d.ts.map +1 -1
- package/dist/bulk-scan-discovery.js +1 -0
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/classify-severity.d.ts +26 -9
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +13 -30
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli-help.d.ts.map +1 -1
- package/dist/cli-help.js +17 -13
- package/dist/cli-help.js.map +1 -1
- package/dist/cli-signals.d.ts +8 -0
- package/dist/cli-signals.d.ts.map +1 -0
- package/dist/cli-signals.js +28 -0
- package/dist/cli-signals.js.map +1 -0
- package/dist/cli.d.ts +4 -3
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1102 -905
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.d.ts.map +1 -1
- package/dist/cloud-publish.js +10 -9
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codeowners.d.ts +19 -0
- package/dist/codeowners.d.ts.map +1 -0
- package/dist/codeowners.js +138 -0
- package/dist/codeowners.js.map +1 -0
- package/dist/codex-sdk-environment.d.ts +1 -0
- package/dist/codex-sdk-environment.d.ts.map +1 -1
- package/dist/codex-sdk-environment.js +40 -2
- package/dist/codex-sdk-environment.js.map +1 -1
- package/dist/component-plan.d.ts +2 -5
- package/dist/component-plan.d.ts.map +1 -1
- package/dist/component-plan.js +39 -31
- package/dist/component-plan.js.map +1 -1
- package/dist/component-scan.d.ts +6 -5
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +25 -36
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +64 -74
- package/dist/config.js.map +1 -1
- package/dist/contract.d.ts +16 -3
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +91 -255
- package/dist/contract.js.map +1 -1
- package/dist/cost-model.d.ts +13 -6
- package/dist/cost-model.d.ts.map +1 -1
- package/dist/cost-model.js +14 -4
- package/dist/cost-model.js.map +1 -1
- package/dist/cost.d.ts +10 -2
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +102 -104
- package/dist/cost.js.map +1 -1
- package/dist/custom-validation-prompt.d.ts.map +1 -1
- package/dist/custom-validation-prompt.js +6 -5
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/custom-validation.d.ts +1 -2
- package/dist/custom-validation.d.ts.map +1 -1
- package/dist/custom-validation.js +9 -3
- package/dist/custom-validation.js.map +1 -1
- package/dist/deduplication/checkpointed-review.d.ts +4 -2
- package/dist/deduplication/checkpointed-review.d.ts.map +1 -1
- package/dist/deduplication/checkpointed-review.js +23 -9
- package/dist/deduplication/checkpointed-review.js.map +1 -1
- package/dist/deduplication/codex-review.d.ts +8 -6
- package/dist/deduplication/codex-review.d.ts.map +1 -1
- package/dist/deduplication/codex-review.js +128 -19
- package/dist/deduplication/codex-review.js.map +1 -1
- package/dist/deduplication/deduplication-prompts.d.ts +5 -2
- package/dist/deduplication/deduplication-prompts.d.ts.map +1 -1
- package/dist/deduplication/deduplication-prompts.js +18 -4
- package/dist/deduplication/deduplication-prompts.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts +27 -5
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +58 -48
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/deduplication.d.ts.map +1 -1
- package/dist/deduplication/deduplication.js +19 -51
- package/dist/deduplication/deduplication.js.map +1 -1
- package/dist/deduplication/diagnostics.d.ts +17 -0
- package/dist/deduplication/diagnostics.d.ts.map +1 -0
- package/dist/deduplication/diagnostics.js +5 -0
- package/dist/deduplication/diagnostics.js.map +1 -0
- package/dist/deduplication/finding-schema.d.ts.map +1 -1
- package/dist/deduplication/finding-schema.js +7 -1
- package/dist/deduplication/finding-schema.js.map +1 -1
- package/dist/deduplication/local.d.ts +31 -0
- package/dist/deduplication/local.d.ts.map +1 -0
- package/dist/deduplication/local.js +166 -0
- package/dist/deduplication/local.js.map +1 -0
- package/dist/deduplication/records-protocol.d.ts +3 -8
- package/dist/deduplication/records-protocol.d.ts.map +1 -1
- package/dist/deduplication/records-protocol.js +11 -184
- package/dist/deduplication/records-protocol.js.map +1 -1
- package/dist/deduplication/records.d.ts +186 -11
- package/dist/deduplication/records.d.ts.map +1 -1
- package/dist/deduplication/records.js +10 -18
- package/dist/deduplication/records.js.map +1 -1
- package/dist/deduplication/scan.d.ts +9 -3
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +158 -39
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-config.d.ts +2 -1
- package/dist/deep-config.d.ts.map +1 -1
- package/dist/deep-config.js +4 -4
- package/dist/deep-config.js.map +1 -1
- package/dist/deep-progress.d.ts +17 -1
- package/dist/deep-progress.d.ts.map +1 -1
- package/dist/deep-progress.js +19 -17
- package/dist/deep-progress.js.map +1 -1
- package/dist/deep-scan.d.ts +20 -0
- package/dist/deep-scan.d.ts.map +1 -0
- package/dist/deep-scan.js +113 -0
- package/dist/deep-scan.js.map +1 -0
- package/dist/errors.d.ts +2 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +2 -0
- package/dist/errors.js.map +1 -1
- package/dist/executable-path.d.ts +2 -0
- package/dist/executable-path.d.ts.map +1 -0
- package/dist/executable-path.js +12 -0
- package/dist/executable-path.js.map +1 -0
- package/dist/feedback.d.ts +1 -4
- package/dist/feedback.d.ts.map +1 -1
- package/dist/feedback.js +54 -22
- package/dist/feedback.js.map +1 -1
- package/dist/finding-catalogue.d.ts.map +1 -1
- package/dist/finding-catalogue.js +4 -8
- package/dist/finding-catalogue.js.map +1 -1
- package/dist/finding-normalization.d.ts +5 -0
- package/dist/finding-normalization.d.ts.map +1 -0
- package/dist/finding-normalization.js +120 -0
- package/dist/finding-normalization.js.map +1 -0
- package/dist/finding-retrieval.d.ts +9 -0
- package/dist/finding-retrieval.d.ts.map +1 -1
- package/dist/finding-retrieval.js.map +1 -1
- package/dist/finding-workflow.d.ts +13 -8
- package/dist/finding-workflow.d.ts.map +1 -1
- package/dist/finding-workflow.js +14 -6
- package/dist/finding-workflow.js.map +1 -1
- package/dist/findings-client.d.ts +2 -1
- package/dist/findings-client.d.ts.map +1 -1
- package/dist/findings-client.js +36 -9
- package/dist/findings-client.js.map +1 -1
- package/dist/findings-errors.d.ts +16 -0
- package/dist/findings-errors.d.ts.map +1 -0
- package/dist/findings-errors.js +24 -0
- package/dist/findings-errors.js.map +1 -0
- package/dist/findings-import.d.ts +1 -1
- package/dist/findings-import.d.ts.map +1 -1
- package/dist/findings-import.js +12 -30
- package/dist/findings-import.js.map +1 -1
- package/dist/github.d.ts.map +1 -1
- package/dist/github.js +7 -1
- package/dist/github.js.map +1 -1
- package/dist/host-protocol.d.ts +19 -0
- package/dist/host-protocol.d.ts.map +1 -0
- package/dist/host-protocol.js +270 -0
- package/dist/host-protocol.js.map +1 -0
- package/dist/hosted-scan-protocol.d.ts +4 -0
- package/dist/hosted-scan-protocol.d.ts.map +1 -0
- package/dist/hosted-scan-protocol.js +25 -0
- package/dist/hosted-scan-protocol.js.map +1 -0
- package/dist/hosted-scan.d.ts +117 -0
- package/dist/hosted-scan.d.ts.map +1 -0
- package/dist/hosted-scan.js +260 -0
- package/dist/hosted-scan.js.map +1 -0
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +48 -38
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +11 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/knowledge-base.d.ts +7 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +114 -46
- package/dist/knowledge-base.js.map +1 -1
- package/dist/linear.d.ts.map +1 -1
- package/dist/linear.js +2 -7
- package/dist/linear.js.map +1 -1
- package/dist/mock-scan.d.ts.map +1 -1
- package/dist/mock-scan.js +0 -1
- package/dist/mock-scan.js.map +1 -1
- package/dist/models.d.ts +0 -2
- package/dist/models.d.ts.map +1 -1
- package/dist/models.js.map +1 -1
- package/dist/multiscan.d.ts +9 -3
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +240 -135
- package/dist/multiscan.js.map +1 -1
- package/dist/owner-evidence.d.ts +10 -2
- package/dist/owner-evidence.d.ts.map +1 -1
- package/dist/owner-evidence.js +67 -8
- package/dist/owner-evidence.js.map +1 -1
- package/dist/patch-tui.d.ts.map +1 -1
- package/dist/patch-tui.js +3 -2
- package/dist/patch-tui.js.map +1 -1
- package/dist/project-config.js +3 -3
- package/dist/project-config.js.map +1 -1
- package/dist/provider-profile.d.ts +21 -0
- package/dist/provider-profile.d.ts.map +1 -0
- package/dist/provider-profile.js +133 -0
- package/dist/provider-profile.js.map +1 -0
- package/dist/publication-events.d.ts +6 -8
- package/dist/publication-events.d.ts.map +1 -1
- package/dist/publication-events.js +25 -50
- package/dist/publication-events.js.map +1 -1
- package/dist/publication-store.d.ts.map +1 -1
- package/dist/publication-store.js +95 -109
- package/dist/publication-store.js.map +1 -1
- package/dist/publication.d.ts +1 -4
- package/dist/publication.d.ts.map +1 -1
- package/dist/publication.js +2 -13
- package/dist/publication.js.map +1 -1
- package/dist/publish.d.ts +1 -5
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +109 -160
- package/dist/publish.js.map +1 -1
- package/dist/request-metadata.d.ts +9 -0
- package/dist/request-metadata.d.ts.map +1 -0
- package/dist/request-metadata.js +13 -0
- package/dist/request-metadata.js.map +1 -0
- package/dist/runtime.d.ts +20 -6
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +407 -148
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +14 -0
- package/dist/saved-scan-bootstrap.d.ts.map +1 -0
- package/dist/saved-scan-bootstrap.js +261 -0
- package/dist/saved-scan-bootstrap.js.map +1 -0
- package/dist/saved-scan.d.ts +1 -1
- package/dist/saved-scan.d.ts.map +1 -1
- package/dist/saved-scan.js +6 -12
- package/dist/saved-scan.js.map +1 -1
- package/dist/scan-activity.js +11 -8
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-comparison.d.ts +28 -15
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +276 -281
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +3 -0
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +345 -77
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts +104 -0
- package/dist/scan-executor.d.ts.map +1 -0
- package/dist/scan-executor.js +62 -0
- package/dist/scan-executor.js.map +1 -0
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +54 -13
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-inputs.d.ts +6 -0
- package/dist/scan-inputs.d.ts.map +1 -0
- package/dist/scan-inputs.js +71 -0
- package/dist/scan-inputs.js.map +1 -0
- package/dist/scan-logs.d.ts +2 -3
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +12 -6
- package/dist/scan-logs.js.map +1 -1
- package/dist/scan-sessions.d.ts +4 -0
- package/dist/scan-sessions.d.ts.map +1 -1
- package/dist/scan-sessions.js +17 -0
- package/dist/scan-sessions.js.map +1 -1
- package/dist/scan-skill-paths.d.ts +8 -0
- package/dist/scan-skill-paths.d.ts.map +1 -0
- package/dist/scan-skill-paths.js +47 -0
- package/dist/scan-skill-paths.js.map +1 -0
- package/dist/security-policy-cli.d.ts.map +1 -1
- package/dist/security-policy-cli.js +7 -27
- package/dist/security-policy-cli.js.map +1 -1
- package/dist/security-policy.d.ts +9 -5
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js +33 -14
- package/dist/security-policy.js.map +1 -1
- package/dist/server/api.d.ts +0 -1
- package/dist/server/api.d.ts.map +1 -1
- package/dist/server/api.js +0 -1
- package/dist/server/api.js.map +1 -1
- package/dist/server/embeddings.d.ts +3 -1
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +10 -3
- package/dist/server/embeddings.js.map +1 -1
- package/dist/server/errors.d.ts +5 -2
- package/dist/server/errors.d.ts.map +1 -1
- package/dist/server/errors.js +7 -0
- package/dist/server/errors.js.map +1 -1
- package/dist/server/sqlite-store.d.ts +0 -2
- package/dist/server/sqlite-store.d.ts.map +1 -1
- package/dist/server/sqlite-store.js +54 -44
- package/dist/server/sqlite-store.js.map +1 -1
- package/dist/server/storage.d.ts +0 -2
- package/dist/server/storage.d.ts.map +1 -1
- package/dist/server/storage.js.map +1 -1
- package/dist/severity-store.js +19 -24
- package/dist/severity-store.js.map +1 -1
- package/dist/standalone-validation-prompt.d.ts +2 -0
- package/dist/standalone-validation-prompt.d.ts.map +1 -0
- package/dist/standalone-validation-prompt.js +10 -0
- package/dist/standalone-validation-prompt.js.map +1 -0
- package/dist/suggest-owners.d.ts +4 -2
- package/dist/suggest-owners.d.ts.map +1 -1
- package/dist/suggest-owners.js +11 -5
- package/dist/suggest-owners.js.map +1 -1
- package/dist/targets.d.ts +11 -0
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +123 -72
- package/dist/targets.js.map +1 -1
- package/dist/trusted-executable.d.ts +2 -2
- package/dist/trusted-executable.d.ts.map +1 -1
- package/dist/trusted-executable.js +8 -6
- package/dist/trusted-executable.js.map +1 -1
- package/dist/value.js +7 -0
- package/dist/value.js.map +1 -1
- package/dist/version.js.map +1 -1
- package/dist/workbench-arguments.d.ts +3 -0
- package/dist/workbench-arguments.d.ts.map +1 -0
- package/dist/workbench-arguments.js +15 -0
- package/dist/workbench-arguments.js.map +1 -0
- package/dist/worker-progress.d.ts +44 -11
- package/dist/worker-progress.d.ts.map +1 -1
- package/dist/worker-progress.js +48 -49
- package/dist/worker-progress.js.map +1 -1
- package/docs/cli.md +1788 -0
- package/docs/findings-service.md +402 -0
- package/docs/hosted-scans.md +242 -0
- package/package.json +23 -22
- package/schemas/hosted-scan-v2.fixture.json +145 -0
- package/_bundled_plugin/schemas/tools/worker-threat-model.schema.json +0 -18
- package/_bundled_plugin/scripts/workbench_dashboard.py +0 -159
- package/_bundled_plugin/scripts/workbench_findings.py +0 -221
- package/_bundled_plugin/scripts/workbench_severity.py +0 -122
- package/_bundled_plugin/skills/assess-patch-risk/scripts/validate_patch_risk_assessment.py +0 -163
- package/dist/server/dashboard/THIRD_PARTY_NOTICES.txt +0 -276
- package/dist/server/dashboard/app.css +0 -2
- package/dist/server/dashboard/app.js +0 -66
- package/dist/server/dashboard/index.html +0 -18
- package/dist/server/dashboard-types.d.ts +0 -48
- package/dist/server/dashboard-types.d.ts.map +0 -1
- package/dist/server/dashboard-types.js +0 -2
- package/dist/server/dashboard-types.js.map +0 -1
- package/dist/server/dashboard.d.ts +0 -6
- package/dist/server/dashboard.d.ts.map +0 -1
- package/dist/server/dashboard.js +0 -59
- package/dist/server/dashboard.js.map +0 -1
- package/dist/server/index.d.ts +0 -2
- package/dist/server/index.d.ts.map +0 -1
- package/dist/server/index.js +0 -6
- package/dist/server/index.js.map +0 -1
- package/dist/server/routes.d.ts +0 -7
- package/dist/server/routes.d.ts.map +0 -1
- package/dist/server/routes.js +0 -98
- package/dist/server/routes.js.map +0 -1
- package/dist/server/serve.d.ts +0 -2
- package/dist/server/serve.d.ts.map +0 -1
- package/dist/server/serve.js +0 -28
- package/dist/server/serve.js.map +0 -1
- package/dist/server/server.d.ts +0 -10
- package/dist/server/server.d.ts.map +0 -1
- package/dist/server/server.js +0 -16
- package/dist/server/server.js.map +0 -1
- package/dist/server/validation.d.ts +0 -17
- package/dist/server/validation.d.ts.map +0 -1
- package/dist/server/validation.js +0 -53
- package/dist/server/validation.js.map +0 -1
|
@@ -9,15 +9,15 @@ import os
|
|
|
9
9
|
import shutil
|
|
10
10
|
import sqlite3
|
|
11
11
|
import sys
|
|
12
|
-
import tempfile
|
|
13
12
|
import uuid
|
|
13
|
+
from contextlib import nullcontext
|
|
14
14
|
from datetime import datetime, timedelta
|
|
15
15
|
from pathlib import Path
|
|
16
16
|
from typing import Any, Callable
|
|
17
17
|
|
|
18
18
|
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
|
19
|
+
import workbench_saved_results as saved_results
|
|
19
20
|
from deep_scan_config import resolve_deep_scan_config
|
|
20
|
-
from finalize_scan_contract import _read_scan_local_json
|
|
21
21
|
from workbench.handoff import require_current_continuation
|
|
22
22
|
from workbench.storage import create_private_directory
|
|
23
23
|
from workbench_target import directory_snapshot_regular_file_count
|
|
@@ -199,7 +199,7 @@ def require_deep_scan_ready_for_parent_completion(
|
|
|
199
199
|
if scan["mode"] != "deep":
|
|
200
200
|
return
|
|
201
201
|
run = connection.execute(
|
|
202
|
-
"SELECT status, manifest_path FROM deep_scan_runs WHERE scan_id = ?",
|
|
202
|
+
"SELECT status, manifest_path, terminal_reason FROM deep_scan_runs WHERE scan_id = ?",
|
|
203
203
|
(scan["id"],),
|
|
204
204
|
).fetchone()
|
|
205
205
|
if run is None or run["status"] != "succeeded" or run["manifest_path"] is None:
|
|
@@ -207,6 +207,84 @@ def require_deep_scan_ready_for_parent_completion(
|
|
|
207
207
|
"Deep Scan discovery orchestration must finish and persist its manifest before "
|
|
208
208
|
"the parent scan can be completed."
|
|
209
209
|
)
|
|
210
|
+
if run["terminal_reason"] == "capped":
|
|
211
|
+
require_deep_scan_workers_finished(connection, scan["id"], "capped")
|
|
212
|
+
|
|
213
|
+
|
|
214
|
+
def require_deep_scan_workers_finished(
|
|
215
|
+
connection: sqlite3.Connection,
|
|
216
|
+
scan_id: str,
|
|
217
|
+
terminal_reason: str,
|
|
218
|
+
*,
|
|
219
|
+
has_omitted_workers: bool = False,
|
|
220
|
+
) -> None:
|
|
221
|
+
"""Check execution state for coordinator completion and resumed parent publication."""
|
|
222
|
+
failed_worker = connection.execute(
|
|
223
|
+
"""
|
|
224
|
+
SELECT 1 FROM deep_scan_workers AS failed
|
|
225
|
+
WHERE failed.scan_id = ? AND failed.status = 'failed'
|
|
226
|
+
AND (? != 'saturated' OR failed.kind != 'discovery')
|
|
227
|
+
AND (
|
|
228
|
+
failed.kind != 'dedup'
|
|
229
|
+
OR NOT EXISTS (
|
|
230
|
+
SELECT 1 FROM deep_scan_dedup_inputs AS failed_inputs
|
|
231
|
+
WHERE failed_inputs.dedup_worker_id = failed.id
|
|
232
|
+
)
|
|
233
|
+
OR EXISTS (
|
|
234
|
+
SELECT 1 FROM deep_scan_dedup_inputs AS failed_inputs
|
|
235
|
+
WHERE failed_inputs.dedup_worker_id = failed.id
|
|
236
|
+
AND NOT EXISTS (
|
|
237
|
+
SELECT 1
|
|
238
|
+
FROM deep_scan_dedup_inputs AS replacement_inputs
|
|
239
|
+
JOIN deep_scan_workers AS replacement
|
|
240
|
+
ON replacement.scan_id = replacement_inputs.scan_id
|
|
241
|
+
AND replacement.id = replacement_inputs.dedup_worker_id
|
|
242
|
+
WHERE replacement_inputs.scan_id = failed.scan_id
|
|
243
|
+
AND replacement_inputs.discovery_worker_id =
|
|
244
|
+
failed_inputs.discovery_worker_id
|
|
245
|
+
AND replacement.kind = 'dedup'
|
|
246
|
+
AND replacement.status = 'succeeded'
|
|
247
|
+
)
|
|
248
|
+
)
|
|
249
|
+
)
|
|
250
|
+
LIMIT 1
|
|
251
|
+
""",
|
|
252
|
+
(scan_id, terminal_reason),
|
|
253
|
+
).fetchone()
|
|
254
|
+
if failed_worker is not None:
|
|
255
|
+
raise SystemExit("Deep Scan cannot finish after a worker has failed.")
|
|
256
|
+
active_worker = connection.execute(
|
|
257
|
+
"""
|
|
258
|
+
SELECT 1 FROM deep_scan_workers
|
|
259
|
+
WHERE scan_id = ? AND status IN ('queued', 'running')
|
|
260
|
+
LIMIT 1
|
|
261
|
+
""",
|
|
262
|
+
(scan_id,),
|
|
263
|
+
).fetchone()
|
|
264
|
+
if active_worker is not None:
|
|
265
|
+
raise SystemExit("Deep Scan cannot finish while workers are active.")
|
|
266
|
+
merging_worker = connection.execute(
|
|
267
|
+
"""
|
|
268
|
+
SELECT 1 FROM deep_scan_workers
|
|
269
|
+
WHERE scan_id = ? AND merge_state = 'merging'
|
|
270
|
+
LIMIT 1
|
|
271
|
+
""",
|
|
272
|
+
(scan_id,),
|
|
273
|
+
).fetchone()
|
|
274
|
+
if merging_worker is not None:
|
|
275
|
+
raise SystemExit("Deep Scan cannot finish while discovery output is merging.")
|
|
276
|
+
if terminal_reason == "capped" and has_omitted_workers:
|
|
277
|
+
raise SystemExit("Deep Scan capped completion cannot declare omitted buffered workers.")
|
|
278
|
+
if (
|
|
279
|
+
terminal_reason == "capped"
|
|
280
|
+
and connection.execute(
|
|
281
|
+
"SELECT 1 FROM deep_scan_workers WHERE scan_id = ? "
|
|
282
|
+
"AND kind = 'discovery' AND merge_state = 'buffered' LIMIT 1",
|
|
283
|
+
(scan_id,),
|
|
284
|
+
).fetchone()
|
|
285
|
+
is not None
|
|
286
|
+
):
|
|
287
|
+
raise SystemExit("Deep Scan cannot finish capped while discovery output remains buffered.")
|
|
210
288
|
|
|
211
289
|
|
|
212
290
|
def require_owned_scan(
|
|
@@ -372,7 +450,13 @@ def deep_scan_state(connection: sqlite3.Connection, scan_id: str) -> dict[str, A
|
|
|
372
450
|
"scanId": run["scan_id"],
|
|
373
451
|
"targetPath": scan["target_path"],
|
|
374
452
|
"scope": scan["scope"],
|
|
375
|
-
"
|
|
453
|
+
"includePaths": dependencies().requested_scan_paths(scan),
|
|
454
|
+
"filePaths": dependencies().requested_scan_file_paths(scan),
|
|
455
|
+
"userContext": (
|
|
456
|
+
json.loads(run["discovery_user_context_json"])
|
|
457
|
+
if run["discovery_user_context_json"] is not None
|
|
458
|
+
else scan["user_context"]
|
|
459
|
+
),
|
|
376
460
|
"scanDir": scan["scan_dir"],
|
|
377
461
|
"schemaVersion": run["schema_version"],
|
|
378
462
|
"workflowVersion": run["workflow_version"],
|
|
@@ -438,7 +522,7 @@ def independent_review_progress(
|
|
|
438
522
|
"active": int(active),
|
|
439
523
|
"completed": int(run["completion_sequence"]),
|
|
440
524
|
"maximum": int(run["max_discovery_runs"]),
|
|
441
|
-
"consolidating": run["phase"]
|
|
525
|
+
"consolidating": run["phase"] in {"reducing", "terminal"},
|
|
442
526
|
"updatedAt": str(run["updated_at"]),
|
|
443
527
|
}
|
|
444
528
|
|
|
@@ -501,9 +585,9 @@ def ensure_deep_scan_run(
|
|
|
501
585
|
INSERT INTO deep_scan_runs (
|
|
502
586
|
scan_id, schema_version, workflow_version, status, phase,
|
|
503
587
|
workers, subagents, stop_after_no_new, stop_after_consecutive_errors,
|
|
504
|
-
max_discovery_runs, max_time_hours,
|
|
588
|
+
max_discovery_runs, max_time_hours, discovery_user_context_json,
|
|
505
589
|
created_at, updated_at
|
|
506
|
-
) VALUES (?, 1, ?, 'running', 'setup', ?, ?, ?, ?, ?, ?, ?, ?)
|
|
590
|
+
) VALUES (?, 1, ?, 'running', 'setup', ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
507
591
|
""",
|
|
508
592
|
(
|
|
509
593
|
scan["id"],
|
|
@@ -514,6 +598,7 @@ def ensure_deep_scan_run(
|
|
|
514
598
|
config["stopAfterConsecutiveErrors"],
|
|
515
599
|
config["maxDiscoveryRuns"],
|
|
516
600
|
config["maxTimeHours"],
|
|
601
|
+
json.dumps(scan["user_context"]),
|
|
517
602
|
timestamp,
|
|
518
603
|
timestamp,
|
|
519
604
|
),
|
|
@@ -547,6 +632,7 @@ def terminal_deep_scan_for_target_snapshot(
|
|
|
547
632
|
thread_id: str,
|
|
548
633
|
target_path: str,
|
|
549
634
|
scope: str,
|
|
635
|
+
user_context: str | None,
|
|
550
636
|
revision: str,
|
|
551
637
|
snapshot_digest: str,
|
|
552
638
|
target_device: int | str,
|
|
@@ -556,7 +642,8 @@ def terminal_deep_scan_for_target_snapshot(
|
|
|
556
642
|
|
|
557
643
|
A continuation may safely consume a finished coordinator manifest while the
|
|
558
644
|
parent scan is still open. It must not adopt live orchestration owned by a
|
|
559
|
-
different thread, or reuse results
|
|
645
|
+
different thread, or reuse results for a different repository snapshot or
|
|
646
|
+
original discovery context.
|
|
560
647
|
"""
|
|
561
648
|
return connection.execute(
|
|
562
649
|
"""
|
|
@@ -566,6 +653,7 @@ def terminal_deep_scan_for_target_snapshot(
|
|
|
566
653
|
JOIN workspaces ON workspaces.id = scans.workspace_id
|
|
567
654
|
WHERE scans.target_path = ?
|
|
568
655
|
AND scans.scope = ?
|
|
656
|
+
AND deep_scan_runs.discovery_user_context_json = ?
|
|
569
657
|
AND scans.mode = 'deep'
|
|
570
658
|
AND scans.status = 'running'
|
|
571
659
|
AND scans.canceled_at IS NULL
|
|
@@ -589,6 +677,7 @@ def terminal_deep_scan_for_target_snapshot(
|
|
|
589
677
|
(
|
|
590
678
|
target_path,
|
|
591
679
|
scope,
|
|
680
|
+
json.dumps(user_context),
|
|
592
681
|
revision,
|
|
593
682
|
snapshot_digest,
|
|
594
683
|
target_device,
|
|
@@ -686,6 +775,7 @@ def begin_deep_scan_for_target(
|
|
|
686
775
|
existing = existing_deep_scan_for_target(connection, thread_id, target_path, scope)
|
|
687
776
|
if existing is not None:
|
|
688
777
|
return begin_deep_scan_for_scan(connection, existing["id"], thread_id, args)
|
|
778
|
+
user_context = user_context_argument(args)
|
|
689
779
|
target_metadata = target.stat()
|
|
690
780
|
target_identity = dependencies().scan_target_identity(target, None, metadata=target_metadata)
|
|
691
781
|
revision, target_snapshot_digest, target_device, target_inode = target_identity
|
|
@@ -727,6 +817,7 @@ def begin_deep_scan_for_target(
|
|
|
727
817
|
thread_id,
|
|
728
818
|
target_path,
|
|
729
819
|
scope,
|
|
820
|
+
user_context,
|
|
730
821
|
revision,
|
|
731
822
|
target_snapshot_digest,
|
|
732
823
|
target_device,
|
|
@@ -748,19 +839,12 @@ def begin_deep_scan_for_target(
|
|
|
748
839
|
if target_root == target or target in target_root.parents:
|
|
749
840
|
raise SystemExit("The scan artifact directory must be outside the selected target.")
|
|
750
841
|
create_private_directory(target_root)
|
|
751
|
-
user_context = user_context_argument(args)
|
|
752
842
|
model = optional_text(args.model, maximum=200)
|
|
753
843
|
reasoning_effort = optional_text(args.reasoning_effort, maximum=32)
|
|
754
844
|
workspace_id = str(uuid.uuid4())
|
|
755
845
|
scan_id = str(uuid.uuid4())
|
|
756
846
|
timestamp = dependencies().now()
|
|
757
847
|
target_id = dependencies().ensure_security_target(connection, target_path)
|
|
758
|
-
scan_dir = Path(
|
|
759
|
-
tempfile.mkdtemp(
|
|
760
|
-
prefix=f"{dependencies().safe_segment(revision)}_{dependencies().compact_timestamp()}_",
|
|
761
|
-
dir=target_root,
|
|
762
|
-
)
|
|
763
|
-
).resolve()
|
|
764
848
|
connection.execute(
|
|
765
849
|
"""
|
|
766
850
|
INSERT INTO workspaces (
|
|
@@ -798,7 +882,6 @@ def begin_deep_scan_for_target(
|
|
|
798
882
|
handoff_status="delivered",
|
|
799
883
|
model=model,
|
|
800
884
|
reasoning_effort=reasoning_effort,
|
|
801
|
-
scan_dir=scan_dir,
|
|
802
885
|
)
|
|
803
886
|
scan = dependencies().require_scan(connection, scan_id)
|
|
804
887
|
ensure_deep_scan_run(connection, scan, config, workflow_version, timestamp)
|
|
@@ -855,6 +938,7 @@ def coordinator_lease_is_live(
|
|
|
855
938
|
if heartbeat["coordinatorGeneration"] == run["coordinator_generation"]:
|
|
856
939
|
heartbeat_time = max(heartbeat_time, _parse_timestamp(heartbeat["updatedAt"]))
|
|
857
940
|
except (OSError, KeyError, TypeError, ValueError):
|
|
941
|
+
# Missing or invalid heartbeat files leave the persisted lease timestamp in effect.
|
|
858
942
|
pass
|
|
859
943
|
current_time = _parse_timestamp(timestamp)
|
|
860
944
|
return heartbeat_time > current_time - timedelta(seconds=DEEP_SCAN_COORDINATOR_LEASE_SECONDS)
|
|
@@ -1599,63 +1683,6 @@ def finish_deep_scan_locked(
|
|
|
1599
1683
|
)
|
|
1600
1684
|
standard_scan_manifest = manifest_path == str(Path(scan["scan_dir"]) / "scan-manifest.json")
|
|
1601
1685
|
|
|
1602
|
-
failure_capped = False
|
|
1603
|
-
if (
|
|
1604
|
-
standard_scan_manifest
|
|
1605
|
-
and args.terminal_reason == "capped"
|
|
1606
|
-
and (run["status"] == "running" or omitted_worker_ids)
|
|
1607
|
-
):
|
|
1608
|
-
for artifact_name in ("scan-manifest.json", "findings.json", "coverage.json"):
|
|
1609
|
-
deep_scan_path(
|
|
1610
|
-
scan,
|
|
1611
|
-
str(Path(scan["scan_dir"]) / artifact_name),
|
|
1612
|
-
f"Canonical parent {artifact_name}",
|
|
1613
|
-
kind="file",
|
|
1614
|
-
)
|
|
1615
|
-
coverage = _read_scan_local_json(
|
|
1616
|
-
Path(scan["scan_dir"]), "coverage.json", "Canonical parent coverage.json"
|
|
1617
|
-
)
|
|
1618
|
-
deferred = coverage.get("deferred")
|
|
1619
|
-
failure_capped = (
|
|
1620
|
-
coverage.get("completeness") == "partial"
|
|
1621
|
-
and isinstance(deferred, list)
|
|
1622
|
-
and any(
|
|
1623
|
-
isinstance(item, dict)
|
|
1624
|
-
and isinstance(item.get("reason"), str)
|
|
1625
|
-
and item["reason"].startswith("Deep Scan stopped before completion: ")
|
|
1626
|
-
for item in deferred
|
|
1627
|
-
)
|
|
1628
|
-
and connection.execute(
|
|
1629
|
-
"""
|
|
1630
|
-
SELECT 1 FROM deep_scan_workers
|
|
1631
|
-
WHERE scan_id = ? AND kind = 'dedup' AND status = 'succeeded'
|
|
1632
|
-
LIMIT 1
|
|
1633
|
-
""",
|
|
1634
|
-
(scan_id,),
|
|
1635
|
-
).fetchone()
|
|
1636
|
-
is not None
|
|
1637
|
-
)
|
|
1638
|
-
if failure_capped and run["status"] == "running":
|
|
1639
|
-
require_running_deep_scan(connection, scan_id)
|
|
1640
|
-
connection.execute(
|
|
1641
|
-
"""
|
|
1642
|
-
UPDATE deep_scan_workers
|
|
1643
|
-
SET merge_state = 'buffered', updated_at = ?
|
|
1644
|
-
WHERE scan_id = ? AND kind = 'discovery' AND status = 'succeeded'
|
|
1645
|
-
AND merge_state = 'merging'
|
|
1646
|
-
AND id IN (
|
|
1647
|
-
SELECT inputs.discovery_worker_id
|
|
1648
|
-
FROM deep_scan_dedup_inputs AS inputs
|
|
1649
|
-
JOIN deep_scan_workers AS reducers
|
|
1650
|
-
ON reducers.id = inputs.dedup_worker_id
|
|
1651
|
-
AND reducers.scan_id = inputs.scan_id
|
|
1652
|
-
WHERE inputs.scan_id = ?
|
|
1653
|
-
AND reducers.kind = 'dedup'
|
|
1654
|
-
AND reducers.status IN ('failed', 'canceled')
|
|
1655
|
-
)
|
|
1656
|
-
""",
|
|
1657
|
-
(dependencies().now(), scan_id, scan_id),
|
|
1658
|
-
)
|
|
1659
1686
|
buffered_worker_ids = [
|
|
1660
1687
|
row["id"]
|
|
1661
1688
|
for row in connection.execute(
|
|
@@ -1668,9 +1695,10 @@ def finish_deep_scan_locked(
|
|
|
1668
1695
|
(scan_id,),
|
|
1669
1696
|
)
|
|
1670
1697
|
]
|
|
1698
|
+
# Historical succeeded runs retain their exact omitted-worker replay contract.
|
|
1671
1699
|
omissions_match = (
|
|
1672
1700
|
set(omitted_worker_ids) == set(buffered_worker_ids)
|
|
1673
|
-
if args.terminal_reason == "saturated" or
|
|
1701
|
+
if args.terminal_reason == "saturated" or run["status"] == "succeeded"
|
|
1674
1702
|
else not omitted_worker_ids and not buffered_worker_ids
|
|
1675
1703
|
)
|
|
1676
1704
|
if run["status"] == "succeeded":
|
|
@@ -1702,7 +1730,6 @@ def finish_deep_scan_locked(
|
|
|
1702
1730
|
args.terminal_reason == "capped"
|
|
1703
1731
|
and run["discovery_runs_dispatched"] < run["max_discovery_runs"]
|
|
1704
1732
|
and not deep_scan_deadline_reached(run)
|
|
1705
|
-
and not failure_capped
|
|
1706
1733
|
):
|
|
1707
1734
|
raise SystemExit(
|
|
1708
1735
|
"Deep Scan cannot finish capped before reaching its configured maximum."
|
|
@@ -1743,71 +1770,16 @@ def finish_deep_scan_locked(
|
|
|
1743
1770
|
)
|
|
1744
1771
|
if successful_reducer is None and not zero_discovery_deadline:
|
|
1745
1772
|
raise SystemExit("Deep Scan cannot finish without a successful dedup worker.")
|
|
1746
|
-
failed_worker = connection.execute(
|
|
1747
|
-
"""
|
|
1748
|
-
SELECT 1 FROM deep_scan_workers AS failed
|
|
1749
|
-
WHERE failed.scan_id = ? AND failed.status = 'failed'
|
|
1750
|
-
AND (? != 'saturated' OR failed.kind != 'discovery')
|
|
1751
|
-
AND (
|
|
1752
|
-
failed.kind != 'dedup'
|
|
1753
|
-
OR NOT EXISTS (
|
|
1754
|
-
SELECT 1 FROM deep_scan_dedup_inputs AS failed_inputs
|
|
1755
|
-
WHERE failed_inputs.dedup_worker_id = failed.id
|
|
1756
|
-
)
|
|
1757
|
-
OR EXISTS (
|
|
1758
|
-
SELECT 1 FROM deep_scan_dedup_inputs AS failed_inputs
|
|
1759
|
-
WHERE failed_inputs.dedup_worker_id = failed.id
|
|
1760
|
-
AND NOT EXISTS (
|
|
1761
|
-
SELECT 1
|
|
1762
|
-
FROM deep_scan_dedup_inputs AS replacement_inputs
|
|
1763
|
-
JOIN deep_scan_workers AS replacement
|
|
1764
|
-
ON replacement.scan_id = replacement_inputs.scan_id
|
|
1765
|
-
AND replacement.id = replacement_inputs.dedup_worker_id
|
|
1766
|
-
WHERE replacement_inputs.scan_id = failed.scan_id
|
|
1767
|
-
AND replacement_inputs.discovery_worker_id =
|
|
1768
|
-
failed_inputs.discovery_worker_id
|
|
1769
|
-
AND replacement.kind = 'dedup'
|
|
1770
|
-
AND replacement.status = 'succeeded'
|
|
1771
|
-
)
|
|
1772
|
-
)
|
|
1773
|
-
)
|
|
1774
|
-
LIMIT 1
|
|
1775
|
-
""",
|
|
1776
|
-
(scan_id, args.terminal_reason),
|
|
1777
|
-
).fetchone()
|
|
1778
|
-
if failed_worker is not None and not failure_capped:
|
|
1779
|
-
raise SystemExit("Deep Scan cannot finish after a worker has failed.")
|
|
1780
1773
|
if args.terminal_reason == "saturated":
|
|
1781
|
-
#
|
|
1782
|
-
# cancellation writes failed, so they cannot block completion.
|
|
1774
|
+
# Saturation cancels surplus workers, including failed cancellation writes.
|
|
1783
1775
|
cancel_active_workers(connection, scan_id, dependencies().now())
|
|
1784
|
-
|
|
1785
|
-
|
|
1786
|
-
|
|
1787
|
-
|
|
1788
|
-
|
|
1789
|
-
|
|
1790
|
-
|
|
1791
|
-
).fetchone()
|
|
1792
|
-
if active_worker is not None:
|
|
1793
|
-
raise SystemExit("Deep Scan cannot finish while workers are active.")
|
|
1794
|
-
merging_worker = connection.execute(
|
|
1795
|
-
"""
|
|
1796
|
-
SELECT 1 FROM deep_scan_workers
|
|
1797
|
-
WHERE scan_id = ? AND merge_state = 'merging'
|
|
1798
|
-
LIMIT 1
|
|
1799
|
-
""",
|
|
1800
|
-
(scan_id,),
|
|
1801
|
-
).fetchone()
|
|
1802
|
-
if merging_worker is not None:
|
|
1803
|
-
raise SystemExit("Deep Scan cannot finish while discovery output is merging.")
|
|
1804
|
-
if args.terminal_reason == "capped" and omitted_worker_ids and not failure_capped:
|
|
1805
|
-
raise SystemExit("Deep Scan capped completion cannot declare omitted buffered workers.")
|
|
1806
|
-
if args.terminal_reason == "capped" and buffered_worker_ids and not failure_capped:
|
|
1807
|
-
raise SystemExit(
|
|
1808
|
-
"Deep Scan cannot finish capped while discovery output remains buffered."
|
|
1809
|
-
)
|
|
1810
|
-
if (args.terminal_reason == "saturated" or failure_capped) and not omissions_match:
|
|
1776
|
+
require_deep_scan_workers_finished(
|
|
1777
|
+
connection,
|
|
1778
|
+
scan_id,
|
|
1779
|
+
args.terminal_reason,
|
|
1780
|
+
has_omitted_workers=bool(omitted_worker_ids),
|
|
1781
|
+
)
|
|
1782
|
+
if args.terminal_reason == "saturated" and not omissions_match:
|
|
1811
1783
|
raise SystemExit(
|
|
1812
1784
|
f"Deep Scan {args.terminal_reason} completion must exactly identify all buffered discovery "
|
|
1813
1785
|
"workers with --omitted-worker-id."
|
|
@@ -1820,18 +1792,23 @@ def finish_deep_scan_locked(
|
|
|
1820
1792
|
kind="file",
|
|
1821
1793
|
)
|
|
1822
1794
|
promotion = promote_staged_file(staged_manifest_path, manifest_path)
|
|
1823
|
-
|
|
1824
|
-
|
|
1825
|
-
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
|
|
1831
|
-
|
|
1832
|
-
|
|
1833
|
-
|
|
1834
|
-
|
|
1795
|
+
with (
|
|
1796
|
+
saved_results.preserve_deep_deadline_draft(dependencies(), connection, scan)
|
|
1797
|
+
if zero_discovery_deadline and standard_scan_manifest
|
|
1798
|
+
else nullcontext()
|
|
1799
|
+
):
|
|
1800
|
+
timestamp = dependencies().now()
|
|
1801
|
+
connection.execute(
|
|
1802
|
+
"""
|
|
1803
|
+
UPDATE deep_scan_runs
|
|
1804
|
+
SET status = 'succeeded', phase = 'terminal', terminal_reason = ?,
|
|
1805
|
+
manifest_path = ?, completed_at = ?, updated_at = ?
|
|
1806
|
+
WHERE scan_id = ?
|
|
1807
|
+
""",
|
|
1808
|
+
(args.terminal_reason, manifest_path, timestamp, timestamp, scan_id),
|
|
1809
|
+
)
|
|
1810
|
+
cancel_active_workers(connection, scan_id, timestamp)
|
|
1811
|
+
connection.commit()
|
|
1835
1812
|
except BaseException:
|
|
1836
1813
|
connection.rollback()
|
|
1837
1814
|
if promotion is not None:
|
|
@@ -1872,6 +1849,8 @@ def fail_deep_scan_locked(
|
|
|
1872
1849
|
kind="file",
|
|
1873
1850
|
)
|
|
1874
1851
|
)
|
|
1852
|
+
elif run["manifest_path"] == str(Path(scan["scan_dir"]) / "scan-manifest.json"):
|
|
1853
|
+
manifest_path = run["manifest_path"]
|
|
1875
1854
|
if run["status"] in {"failed", "interrupted"} or scan["status"] == "failed":
|
|
1876
1855
|
if (
|
|
1877
1856
|
run["status"] == args.deep_status
|