@openai/codex-security 0.8.2 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +201 -178
- package/_bundled_plugin/.app.json +4 -0
- package/_bundled_plugin/.mcp.json +6 -1
- package/_bundled_plugin/examples/completed-scan/findings.json +16 -4
- package/_bundled_plugin/examples/completed-scan/report.md +11 -8
- package/_bundled_plugin/examples/completed-scan/scan-manifest.json +4 -2
- package/_bundled_plugin/mcp/fzstd-LICENSE.txt +21 -0
- package/_bundled_plugin/mcp/helpers.mjs +2 -11
- package/_bundled_plugin/mcp/helpers.mjs.br +0 -0
- package/_bundled_plugin/mcp/native/THIRD_PARTY_NOTICES.txt +3 -210
- package/_bundled_plugin/mcp/native/darwin-arm64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/darwin-x64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/win32-arm64/windows.node +0 -0
- package/_bundled_plugin/mcp/native/win32-x64/windows.node +0 -0
- package/_bundled_plugin/mcp/package.json +1 -0
- package/_bundled_plugin/mcp/permission-profile-preflight.mjs +51 -14
- package/_bundled_plugin/mcp/server.mjs +2 -11
- package/_bundled_plugin/mcp/server.mjs.br +0 -0
- package/_bundled_plugin/mcp/session-decompression.mjs +712 -0
- package/_bundled_plugin/references/artifact-storage.md +1 -1
- package/_bundled_plugin/references/core-scan.md +14 -5
- package/_bundled_plugin/references/default-severity-rubric.md +33 -0
- package/_bundled_plugin/references/final-report.md +5 -3
- package/_bundled_plugin/references/finding-detail-fields.md +19 -18
- package/_bundled_plugin/references/sarif-adapter.md +8 -2
- package/_bundled_plugin/references/scan-artifacts.md +21 -12
- package/_bundled_plugin/references/scan-contract.md +27 -33
- package/_bundled_plugin/references/threat-model.md +1 -0
- package/_bundled_plugin/schemas/tools/scan-draft.schema.json +2 -2
- package/_bundled_plugin/scripts/check_deep_scan_target.py +97 -0
- package/_bundled_plugin/scripts/codex_profile.mjs +7 -1
- package/_bundled_plugin/scripts/deep_scan_config.py +20 -1
- package/_bundled_plugin/scripts/deep_scan_workbench.py +188 -454
- package/_bundled_plugin/scripts/filesystem_identity.py +1 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +317 -377
- package/_bundled_plugin/scripts/finding_preview.py +25 -29
- package/_bundled_plugin/scripts/launch_codex_security_mcp +1 -0
- package/_bundled_plugin/scripts/legacy_findings.py +148 -0
- package/_bundled_plugin/scripts/posix_scan_local_files.py +198 -0
- package/_bundled_plugin/scripts/read_codex_session.mjs +21 -0
- package/_bundled_plugin/scripts/report_projection.py +167 -178
- package/_bundled_plugin/scripts/review_state.py +8 -2
- package/_bundled_plugin/scripts/servicenow_avit.py +20 -0
- package/_bundled_plugin/scripts/snapshot_sqlite.py +1 -0
- package/_bundled_plugin/scripts/threat_model_projection.py +22 -26
- package/_bundled_plugin/scripts/validate_scan_contract.py +9 -7
- package/_bundled_plugin/scripts/windows_scan_local_files.py +600 -72
- package/_bundled_plugin/scripts/workbench/__init__.py +1 -1
- package/_bundled_plugin/scripts/workbench/handoff.py +47 -0
- package/_bundled_plugin/scripts/workbench/retained_coverage.py +38 -75
- package/_bundled_plugin/scripts/workbench/retained_records.py +18 -30
- package/_bundled_plugin/scripts/workbench/runtime_toml.py +4 -1
- package/_bundled_plugin/scripts/workbench/saved_coverage.py +152 -248
- package/_bundled_plugin/scripts/workbench/saved_outputs.py +9 -0
- package/_bundled_plugin/scripts/workbench/saved_sources.py +47 -40
- package/_bundled_plugin/scripts/workbench/storage.py +71 -7
- package/_bundled_plugin/scripts/workbench_cli.py +121 -14
- package/_bundled_plugin/scripts/workbench_constants.py +19 -0
- package/_bundled_plugin/scripts/workbench_coverage_receipts.py +3 -3
- package/_bundled_plugin/scripts/workbench_db.py +550 -492
- package/_bundled_plugin/scripts/workbench_feedback.py +8 -7
- package/_bundled_plugin/scripts/workbench_finding_index.py +1 -0
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +90 -4
- package/_bundled_plugin/scripts/workbench_native_indexes.py +29 -33
- package/_bundled_plugin/scripts/workbench_progress.py +10 -1
- package/_bundled_plugin/scripts/workbench_publication.py +14 -10
- package/_bundled_plugin/scripts/workbench_remediation.py +508 -11
- package/_bundled_plugin/scripts/workbench_saved_results.py +132 -77
- package/_bundled_plugin/scripts/workbench_scan_history.py +139 -80
- package/_bundled_plugin/scripts/workbench_scan_start.py +84 -25
- package/_bundled_plugin/scripts/workbench_scan_usage.py +666 -117
- package/_bundled_plugin/scripts/workbench_schema.py +44 -55
- package/_bundled_plugin/scripts/workbench_setup.py +251 -0
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +13 -0
- package/_bundled_plugin/scripts/workbench_source_scopes.py +33 -23
- package/_bundled_plugin/scripts/workbench_target.py +330 -66
- package/_bundled_plugin/scripts/workbench_target_state.py +3 -0
- package/_bundled_plugin/scripts/workbench_validation.py +44 -12
- package/_bundled_plugin/shared/workbench-history-repairs.json +19 -16
- package/_bundled_plugin/shared/workbench-migrations.json +53 -0
- package/_bundled_plugin/skills/attack-path-analysis/SKILL.md +1 -1
- package/_bundled_plugin/skills/attack-path-analysis/references/severity-policy.md +4 -68
- package/_bundled_plugin/skills/check-skills/SKILL.md +43 -0
- package/_bundled_plugin/skills/check-skills/agents/openai.yaml +4 -0
- package/_bundled_plugin/skills/cloud-findings/SKILL.md +6 -4
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +7 -50
- package/_bundled_plugin/skills/fix-finding/SKILL.md +19 -2
- package/_bundled_plugin/skills/publish-findings/SKILL.md +81 -45
- package/_bundled_plugin/skills/publish-findings/references/checkmarx-import.md +37 -0
- package/_bundled_plugin/skills/publish-findings/references/wiz-import.md +5 -24
- package/_bundled_plugin/skills/publish-findings/scripts/collect_checkmarx.py +464 -0
- package/_bundled_plugin/skills/threat-model-visualize/scripts/build_explorer.py +36 -9
- package/_bundled_plugin/skills/track-findings/SKILL.md +5 -3
- package/_bundled_plugin/skills/triage-finding/references/github-rest-intake.md +22 -68
- package/_bundled_plugin/skills/triage-finding/references/ticket-intake.md +12 -6
- package/dist/api.d.ts +45 -5
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +1144 -411
- package/dist/api.js.map +1 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +10 -7
- package/dist/auth.js.map +1 -1
- package/dist/bedrock-oss-pricing.d.ts +6 -0
- package/dist/bedrock-oss-pricing.d.ts.map +1 -0
- package/dist/bedrock-oss-pricing.js +58 -0
- package/dist/bedrock-oss-pricing.js.map +1 -0
- package/dist/bedrock-pricing.d.ts +15 -0
- package/dist/bedrock-pricing.d.ts.map +1 -0
- package/dist/bedrock-pricing.js +117 -0
- package/dist/bedrock-pricing.js.map +1 -0
- package/dist/blackduck-findings.d.ts +8 -0
- package/dist/blackduck-findings.d.ts.map +1 -0
- package/dist/blackduck-findings.js +320 -0
- package/dist/blackduck-findings.js.map +1 -0
- package/dist/bulk-scan-discovery.d.ts.map +1 -1
- package/dist/bulk-scan-discovery.js +51 -36
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/checkmarx-evidence.d.ts +19 -0
- package/dist/checkmarx-evidence.d.ts.map +1 -0
- package/dist/checkmarx-evidence.js +36 -0
- package/dist/checkmarx-evidence.js.map +1 -0
- package/dist/checkmarx-findings.d.ts +4 -0
- package/dist/checkmarx-findings.d.ts.map +1 -0
- package/dist/checkmarx-findings.js +27 -0
- package/dist/checkmarx-findings.js.map +1 -0
- package/dist/checkmarx-one.d.ts +4 -0
- package/dist/checkmarx-one.d.ts.map +1 -0
- package/dist/checkmarx-one.js +53 -0
- package/dist/checkmarx-one.js.map +1 -0
- package/dist/checkmarx-repository.d.ts +12 -0
- package/dist/checkmarx-repository.d.ts.map +1 -0
- package/dist/checkmarx-repository.js +181 -0
- package/dist/checkmarx-repository.js.map +1 -0
- package/dist/checkmarx-xml.d.ts +12 -0
- package/dist/checkmarx-xml.d.ts.map +1 -0
- package/dist/checkmarx-xml.js +196 -0
- package/dist/checkmarx-xml.js.map +1 -0
- package/dist/classify-severity-records.d.ts +6 -9
- package/dist/classify-severity-records.d.ts.map +1 -1
- package/dist/classify-severity-records.js +9 -21
- package/dist/classify-severity-records.js.map +1 -1
- package/dist/classify-severity.d.ts +4 -1
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +30 -13
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli.d.ts +14 -5
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +2112 -1266
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.js +2 -2
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codex-prompt.d.ts +2 -0
- package/dist/codex-prompt.d.ts.map +1 -1
- package/dist/codex-prompt.js +6 -0
- package/dist/codex-prompt.js.map +1 -1
- package/dist/component-scan.d.ts +16 -3
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +32 -6
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts +2 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +221 -65
- package/dist/config.js.map +1 -1
- package/dist/continuum-findings.d.ts +7 -0
- package/dist/continuum-findings.d.ts.map +1 -0
- package/dist/continuum-findings.js +225 -0
- package/dist/continuum-findings.js.map +1 -0
- package/dist/contract-values.d.ts +30 -0
- package/dist/contract-values.d.ts.map +1 -0
- package/dist/contract-values.js +78 -0
- package/dist/contract-values.js.map +1 -0
- package/dist/contract.d.ts +2 -20
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +58 -669
- package/dist/contract.js.map +1 -1
- package/dist/cost-model.d.ts +13 -1
- package/dist/cost-model.d.ts.map +1 -1
- package/dist/cost-model.js +66 -115
- package/dist/cost-model.js.map +1 -1
- package/dist/cost.d.ts +61 -4
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +2560 -100
- package/dist/cost.js.map +1 -1
- package/dist/custom-publish.d.ts +4 -0
- package/dist/custom-publish.d.ts.map +1 -1
- package/dist/custom-publish.js +40 -3
- package/dist/custom-publish.js.map +1 -1
- package/dist/custom-validation-prompt.d.ts +1 -1
- package/dist/custom-validation-prompt.d.ts.map +1 -1
- package/dist/custom-validation-prompt.js +5 -0
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/custom-validation.d.ts +2 -0
- package/dist/custom-validation.d.ts.map +1 -1
- package/dist/custom-validation.js +4 -0
- package/dist/custom-validation.js.map +1 -1
- package/dist/deduplication/deduplication-prompts.d.ts +4 -4
- package/dist/deduplication/deduplication-prompts.d.ts.map +1 -1
- package/dist/deduplication/deduplication-prompts.js +2 -2
- package/dist/deduplication/deduplication-prompts.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts +14 -11
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +11 -4
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/deduplication.js.map +1 -1
- package/dist/deduplication/finding-schema.d.ts +19 -1
- package/dist/deduplication/finding-schema.d.ts.map +1 -1
- package/dist/deduplication/finding-schema.js +25 -0
- package/dist/deduplication/finding-schema.js.map +1 -1
- package/dist/deduplication/local.d.ts +2 -2
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +5 -10
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/records.d.ts +8 -2
- package/dist/deduplication/records.d.ts.map +1 -1
- package/dist/deduplication/records.js +36 -8
- package/dist/deduplication/records.js.map +1 -1
- package/dist/deduplication/refusal.d.ts.map +1 -1
- package/dist/deduplication/refusal.js +25 -5
- package/dist/deduplication/refusal.js.map +1 -1
- package/dist/deduplication/scan.d.ts +3 -0
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +1 -1
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-config.d.ts +0 -1
- package/dist/deep-config.d.ts.map +1 -1
- package/dist/deep-config.js +22 -33
- package/dist/deep-config.js.map +1 -1
- package/dist/deep-scan-defaults.d.ts +2 -0
- package/dist/deep-scan-defaults.d.ts.map +1 -1
- package/dist/deep-scan-defaults.js +28 -1
- package/dist/deep-scan-defaults.js.map +1 -1
- package/dist/deep-scan.d.ts +13 -0
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +262 -7
- package/dist/deep-scan.js.map +1 -1
- package/dist/default-severity-rubric.d.ts +1 -2
- package/dist/default-severity-rubric.d.ts.map +1 -1
- package/dist/default-severity-rubric.js +2 -66
- package/dist/default-severity-rubric.js.map +1 -1
- package/dist/endor-findings.d.ts +3 -1
- package/dist/endor-findings.d.ts.map +1 -1
- package/dist/endor-findings.js +108 -80
- package/dist/endor-findings.js.map +1 -1
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +9 -2
- package/dist/errors.js.map +1 -1
- package/dist/external-findings-import.d.ts +5 -3
- package/dist/external-findings-import.d.ts.map +1 -1
- package/dist/external-findings-import.js +11 -16
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +15 -4
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +619 -225
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +20 -6
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +2356 -308
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +28 -2
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +174 -81
- package/dist/external-findings-read.js.map +1 -1
- package/dist/external-findings.d.ts +17 -3
- package/dist/external-findings.d.ts.map +1 -1
- package/dist/external-findings.js +153 -1
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-contract.d.ts +33 -1
- package/dist/external-import-contract.d.ts.map +1 -1
- package/dist/external-import-contract.js +335 -51
- package/dist/external-import-contract.js.map +1 -1
- package/dist/external-import-models.d.ts +1 -1
- package/dist/external-import-models.d.ts.map +1 -1
- package/dist/external-import-models.js.map +1 -1
- package/dist/feedback.d.ts.map +1 -1
- package/dist/feedback.js +5 -4
- package/dist/feedback.js.map +1 -1
- package/dist/finding-prompt.d.ts +5 -0
- package/dist/finding-prompt.d.ts.map +1 -0
- package/dist/finding-prompt.js +32 -0
- package/dist/finding-prompt.js.map +1 -0
- package/dist/finding-retrieval.d.ts +3 -3
- package/dist/finding-retrieval.d.ts.map +1 -1
- package/dist/finding-retrieval.js.map +1 -1
- package/dist/finding-workflow.d.ts +6 -1
- package/dist/finding-workflow.d.ts.map +1 -1
- package/dist/finding-workflow.js +2 -2
- package/dist/finding-workflow.js.map +1 -1
- package/dist/findings-client.d.ts +1 -0
- package/dist/findings-client.d.ts.map +1 -1
- package/dist/findings-client.js +27 -3
- package/dist/findings-client.js.map +1 -1
- package/dist/git-remote.d.ts +4 -0
- package/dist/git-remote.d.ts.map +1 -1
- package/dist/git-remote.js +20 -0
- package/dist/git-remote.js.map +1 -1
- package/dist/github-advisories.d.ts +3 -12
- package/dist/github-advisories.d.ts.map +1 -1
- package/dist/github-advisories.js +9 -31
- package/dist/github-advisories.js.map +1 -1
- package/dist/github-dependabot-findings.d.ts.map +1 -1
- package/dist/github-dependabot-findings.js +22 -20
- package/dist/github-dependabot-findings.js.map +1 -1
- package/dist/github-findings.d.ts +4 -1
- package/dist/github-findings.d.ts.map +1 -1
- package/dist/github-findings.js +392 -79
- package/dist/github-findings.js.map +1 -1
- package/dist/github.d.ts +17 -7
- package/dist/github.d.ts.map +1 -1
- package/dist/github.js +43 -30
- package/dist/github.js.map +1 -1
- package/dist/host-protocol.d.ts +2 -2
- package/dist/host-protocol.d.ts.map +1 -1
- package/dist/host-protocol.js.map +1 -1
- package/dist/host-records-protocol.d.ts +10 -11
- package/dist/host-records-protocol.d.ts.map +1 -1
- package/dist/host-records-protocol.js +69 -9
- package/dist/host-records-protocol.js.map +1 -1
- package/dist/hosted-git-remotes.d.ts +5 -0
- package/dist/hosted-git-remotes.d.ts.map +1 -0
- package/dist/hosted-git-remotes.js +285 -0
- package/dist/hosted-git-remotes.js.map +1 -0
- package/dist/hosted-git-repository.d.ts +28 -0
- package/dist/hosted-git-repository.d.ts.map +1 -0
- package/dist/hosted-git-repository.js +222 -0
- package/dist/hosted-git-repository.js.map +1 -0
- package/dist/hosted-scan-protocol.js +2 -2
- package/dist/hosted-scan-protocol.js.map +1 -1
- package/dist/hosted-scan.d.ts +15 -0
- package/dist/hosted-scan.d.ts.map +1 -1
- package/dist/hosted-scan.js +71 -44
- package/dist/hosted-scan.js.map +1 -1
- package/dist/hosted-scanner-http.d.ts +21 -0
- package/dist/hosted-scanner-http.d.ts.map +1 -0
- package/dist/hosted-scanner-http.js +204 -0
- package/dist/hosted-scanner-http.js.map +1 -0
- package/dist/hosted-scanner-v1.d.ts +6 -0
- package/dist/hosted-scanner-v1.d.ts.map +1 -0
- package/dist/hosted-scanner-v1.js +60 -0
- package/dist/hosted-scanner-v1.js.map +1 -0
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +3 -0
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +24 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -1
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts.map +1 -1
- package/dist/inspector-findings.js +58 -81
- package/dist/inspector-findings.js.map +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +86 -10
- package/dist/knowledge-base.js.map +1 -1
- package/dist/local-git-metadata.d.ts +5 -0
- package/dist/local-git-metadata.d.ts.map +1 -0
- package/dist/local-git-metadata.js +130 -0
- package/dist/local-git-metadata.js.map +1 -0
- package/dist/multiscan.d.ts +6 -4
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +160 -77
- package/dist/multiscan.js.map +1 -1
- package/dist/native-json-findings.d.ts +2 -1
- package/dist/native-json-findings.d.ts.map +1 -1
- package/dist/native-json-findings.js +12 -2
- package/dist/native-json-findings.js.map +1 -1
- package/dist/opengrep-findings.d.ts +1 -0
- package/dist/opengrep-findings.d.ts.map +1 -1
- package/dist/opengrep-findings.js +49 -31
- package/dist/opengrep-findings.js.map +1 -1
- package/dist/operation-telemetry.d.ts +104 -0
- package/dist/operation-telemetry.d.ts.map +1 -0
- package/dist/operation-telemetry.js +293 -0
- package/dist/operation-telemetry.js.map +1 -0
- package/dist/patch-tui.d.ts.map +1 -1
- package/dist/patch-tui.js +90 -35
- package/dist/patch-tui.js.map +1 -1
- package/dist/plugin-python-probe.d.ts +4 -0
- package/dist/plugin-python-probe.d.ts.map +1 -0
- package/dist/plugin-python-probe.js +10 -0
- package/dist/plugin-python-probe.js.map +1 -0
- package/dist/private-finding-import.d.ts +341 -0
- package/dist/private-finding-import.d.ts.map +1 -0
- package/dist/private-finding-import.js +411 -0
- package/dist/private-finding-import.js.map +1 -0
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +2 -2
- package/dist/project-config.js.map +1 -1
- package/dist/provider-profile.d.ts +11 -3
- package/dist/provider-profile.d.ts.map +1 -1
- package/dist/provider-profile.js +80 -11
- package/dist/provider-profile.js.map +1 -1
- package/dist/publication-telemetry.d.ts +45 -0
- package/dist/publication-telemetry.d.ts.map +1 -0
- package/dist/publication-telemetry.js +50 -0
- package/dist/publication-telemetry.js.map +1 -0
- package/dist/publication.js +7 -1
- package/dist/publication.js.map +1 -1
- package/dist/publish.d.ts +4 -0
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +42 -2
- package/dist/publish.js.map +1 -1
- package/dist/reader-selection.d.ts +15 -0
- package/dist/reader-selection.d.ts.map +1 -0
- package/dist/reader-selection.js +89 -0
- package/dist/reader-selection.js.map +1 -0
- package/dist/record.d.ts +6 -1
- package/dist/record.d.ts.map +1 -1
- package/dist/record.js +53 -2
- package/dist/record.js.map +1 -1
- package/dist/remediation.d.ts +3 -1
- package/dist/remediation.d.ts.map +1 -1
- package/dist/remediation.js +28 -2
- package/dist/remediation.js.map +1 -1
- package/dist/request-metadata.d.ts +3 -0
- package/dist/request-metadata.d.ts.map +1 -1
- package/dist/request-metadata.js +9 -0
- package/dist/request-metadata.js.map +1 -1
- package/dist/result.d.ts +6 -0
- package/dist/result.d.ts.map +1 -1
- package/dist/result.js +3 -1
- package/dist/result.js.map +1 -1
- package/dist/retry-windows-rename.d.ts +8 -0
- package/dist/retry-windows-rename.d.ts.map +1 -0
- package/dist/retry-windows-rename.js +24 -0
- package/dist/retry-windows-rename.js.map +1 -0
- package/dist/runtime.d.ts +22 -1
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +408 -162
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +1 -0
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +18 -15
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-activity.d.ts.map +1 -1
- package/dist/scan-activity.js +172 -64
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-comparison.d.ts +10 -5
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +68 -25
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +7 -6
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +91 -79
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts +12 -1
- package/dist/scan-executor.d.ts.map +1 -1
- package/dist/scan-executor.js +22 -2
- package/dist/scan-executor.js.map +1 -1
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +31 -28
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-logs.d.ts +12 -0
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +106 -77
- package/dist/scan-logs.js.map +1 -1
- package/dist/scan-measurement.d.ts +26 -0
- package/dist/scan-measurement.d.ts.map +1 -0
- package/dist/scan-measurement.js +77 -0
- package/dist/scan-measurement.js.map +1 -0
- package/dist/scan-progress.d.ts +1 -0
- package/dist/scan-progress.d.ts.map +1 -1
- package/dist/scan-progress.js +3 -0
- package/dist/scan-progress.js.map +1 -1
- package/dist/scan-sessions.d.ts.map +1 -1
- package/dist/scan-sessions.js +4 -1
- package/dist/scan-sessions.js.map +1 -1
- package/dist/scan-settings.d.ts +1 -1
- package/dist/scan-settings.d.ts.map +1 -1
- package/dist/scan-settings.js +1 -24
- package/dist/scan-settings.js.map +1 -1
- package/dist/scanner-import.d.ts +64 -6
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +406 -48
- package/dist/scanner-import.js.map +1 -1
- package/dist/scanner-repository-url.d.ts +17 -0
- package/dist/scanner-repository-url.d.ts.map +1 -0
- package/dist/scanner-repository-url.js +71 -0
- package/dist/scanner-repository-url.js.map +1 -0
- package/dist/security-policy.d.ts +1 -1
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js.map +1 -1
- package/dist/semgrep-findings.d.ts +6 -3
- package/dist/semgrep-findings.d.ts.map +1 -1
- package/dist/semgrep-findings.js +124 -88
- package/dist/semgrep-findings.js.map +1 -1
- package/dist/semgrep-guardian-findings.d.ts +38 -0
- package/dist/semgrep-guardian-findings.d.ts.map +1 -0
- package/dist/semgrep-guardian-findings.js +165 -0
- package/dist/semgrep-guardian-findings.js.map +1 -0
- package/dist/semgrep-platform-collector.d.ts +26 -0
- package/dist/semgrep-platform-collector.d.ts.map +1 -0
- package/dist/semgrep-platform-collector.js +108 -0
- package/dist/semgrep-platform-collector.js.map +1 -0
- package/dist/semgrep-platform-findings.d.ts +213 -0
- package/dist/semgrep-platform-findings.d.ts.map +1 -0
- package/dist/semgrep-platform-findings.js +1078 -0
- package/dist/semgrep-platform-findings.js.map +1 -0
- package/dist/semgrep-platform-v1.d.ts +6 -0
- package/dist/semgrep-platform-v1.d.ts.map +1 -0
- package/dist/semgrep-platform-v1.js +83 -0
- package/dist/semgrep-platform-v1.js.map +1 -0
- package/dist/server/api.d.ts +1 -1
- package/dist/server/api.d.ts.map +1 -1
- package/dist/server/api.js.map +1 -1
- package/dist/server/embedding-tokenizer.cdx.json +33 -0
- package/dist/server/embedding-tokenizer.d.ts +2 -0
- package/dist/server/embedding-tokenizer.d.ts.map +1 -0
- package/dist/server/embedding-tokenizer.js +322 -0
- package/dist/server/embedding-tokenizer.js.map +6 -0
- package/dist/server/embeddings.d.ts +16 -2
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +35 -5
- package/dist/server/embeddings.js.map +1 -1
- package/dist/session-lines.d.ts +5 -0
- package/dist/session-lines.d.ts.map +1 -0
- package/dist/session-lines.js +60 -0
- package/dist/session-lines.js.map +1 -0
- package/dist/severity-review.d.ts +3 -1
- package/dist/severity-review.d.ts.map +1 -1
- package/dist/severity-review.js +3 -2
- package/dist/severity-review.js.map +1 -1
- package/dist/severity-rubric.d.ts +20 -0
- package/dist/severity-rubric.d.ts.map +1 -0
- package/dist/severity-rubric.js +73 -0
- package/dist/severity-rubric.js.map +1 -0
- package/dist/severity-store.js +15 -5
- package/dist/severity-store.js.map +1 -1
- package/dist/skill-authentication.d.ts +1 -0
- package/dist/skill-authentication.d.ts.map +1 -1
- package/dist/skill-authentication.js +1 -0
- package/dist/skill-authentication.js.map +1 -1
- package/dist/snyk-findings.d.ts +7 -2
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +108 -84
- package/dist/snyk-findings.js.map +1 -1
- package/dist/snyk-rest-findings.d.ts +76 -0
- package/dist/snyk-rest-findings.d.ts.map +1 -0
- package/dist/snyk-rest-findings.js +1051 -0
- package/dist/snyk-rest-findings.js.map +1 -0
- package/dist/snyk-rest-v1.d.ts +28 -0
- package/dist/snyk-rest-v1.d.ts.map +1 -0
- package/dist/snyk-rest-v1.js +132 -0
- package/dist/snyk-rest-v1.js.map +1 -0
- package/dist/snyk-token-origin.d.ts +4 -0
- package/dist/snyk-token-origin.d.ts.map +1 -0
- package/dist/snyk-token-origin.js +82 -0
- package/dist/snyk-token-origin.js.map +1 -0
- package/dist/sonar-collector.d.ts +16 -0
- package/dist/sonar-collector.d.ts.map +1 -0
- package/dist/sonar-collector.js +380 -0
- package/dist/sonar-collector.js.map +1 -0
- package/dist/sonar-findings.d.ts +49 -0
- package/dist/sonar-findings.d.ts.map +1 -0
- package/dist/sonar-findings.js +288 -0
- package/dist/sonar-findings.js.map +1 -0
- package/dist/sonar-import.d.ts +111 -0
- package/dist/sonar-import.d.ts.map +1 -0
- package/dist/sonar-import.js +277 -0
- package/dist/sonar-import.js.map +1 -0
- package/dist/suggest-owners.d.ts.map +1 -1
- package/dist/suggest-owners.js +2 -1
- package/dist/suggest-owners.js.map +1 -1
- package/dist/target-drift.d.ts +9 -0
- package/dist/target-drift.d.ts.map +1 -0
- package/dist/target-drift.js +27 -0
- package/dist/target-drift.js.map +1 -0
- package/dist/targets.d.ts +5 -0
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +73 -31
- package/dist/targets.js.map +1 -1
- package/dist/tenable-findings.d.ts +9 -0
- package/dist/tenable-findings.d.ts.map +1 -0
- package/dist/tenable-findings.js +122 -0
- package/dist/tenable-findings.js.map +1 -0
- package/dist/terminal-columns.d.ts +4 -0
- package/dist/terminal-columns.d.ts.map +1 -0
- package/dist/terminal-columns.js +19 -0
- package/dist/terminal-columns.js.map +1 -0
- package/dist/terminal-stream.d.ts +13 -0
- package/dist/terminal-stream.d.ts.map +1 -0
- package/dist/terminal-stream.js +35 -0
- package/dist/terminal-stream.js.map +1 -0
- package/dist/trivy-findings.d.ts +19 -0
- package/dist/trivy-findings.d.ts.map +1 -0
- package/dist/trivy-findings.js +435 -0
- package/dist/trivy-findings.js.map +1 -0
- package/dist/trivy-import.d.ts +19 -0
- package/dist/trivy-import.d.ts.map +1 -0
- package/dist/trivy-import.js +151 -0
- package/dist/trivy-import.js.map +1 -0
- package/dist/validation-records.d.ts +0 -3
- package/dist/validation-records.d.ts.map +1 -1
- package/dist/validation-records.js +1 -17
- package/dist/validation-records.js.map +1 -1
- package/dist/veracode-findings.d.ts +9 -0
- package/dist/veracode-findings.d.ts.map +1 -0
- package/dist/veracode-findings.js +409 -0
- package/dist/veracode-findings.js.map +1 -0
- package/dist/vertex-pricing.d.ts +8 -0
- package/dist/vertex-pricing.d.ts.map +1 -0
- package/dist/vertex-pricing.js +20 -0
- package/dist/vertex-pricing.js.map +1 -0
- package/dist/windows-path.d.ts +1 -0
- package/dist/windows-path.d.ts.map +1 -1
- package/dist/windows-path.js +27 -1
- package/dist/windows-path.js.map +1 -1
- package/dist/wiz-csv.d.ts +2 -2
- package/dist/wiz-csv.d.ts.map +1 -1
- package/dist/wiz-csv.js +1 -3
- package/dist/wiz-csv.js.map +1 -1
- package/dist/wiz-findings.d.ts +14 -2
- package/dist/wiz-findings.d.ts.map +1 -1
- package/dist/wiz-findings.js +143 -50
- package/dist/wiz-findings.js.map +1 -1
- package/docs/classify-severity-records.md +28 -13
- package/docs/cli.md +623 -843
- package/docs/dedupe-records.md +54 -24
- package/docs/findings-service.md +87 -47
- package/docs/hosted-remediation.md +14 -7
- package/docs/hosted-scans.md +64 -41
- package/docs/telemetry.md +236 -0
- package/docs/validate-records.md +78 -44
- package/package.json +19 -17
- package/schemas/external-findings.schema.json +14 -1
- package/schemas/hosted-scan-v2.fixture.json +16 -1
- package/_bundled_plugin/mcp/helpers.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/helpers.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-002 +0 -0
- package/_bundled_plugin/schemas/tools/deep-reducer.schema.json +0 -96
- package/_bundled_plugin/scripts/validate_tracking_source.py +0 -82
- package/_bundled_plugin/scripts/workbench_local_dedupe.py +0 -136
- package/dist/deduplication/records-protocol.d.ts +0 -4
- package/dist/deduplication/records-protocol.d.ts.map +0 -1
- package/dist/deduplication/records-protocol.js +0 -49
- package/dist/deduplication/records-protocol.js.map +0 -1
- package/dist/external-imports-feature.d.ts +0 -6
- package/dist/external-imports-feature.d.ts.map +0 -1
- package/dist/external-imports-feature.js +0 -51
- package/dist/external-imports-feature.js.map +0 -1
- package/dist/finding-normalization.d.ts +0 -5
- package/dist/finding-normalization.d.ts.map +0 -1
- package/dist/finding-normalization.js +0 -120
- package/dist/finding-normalization.js.map +0 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
+
import { type ImportedFinding } from "./finding-schema.js";
|
|
2
3
|
import type { Finding } from "../models.js";
|
|
3
4
|
import type { CodexReviewRunner } from "./codex-review.js";
|
|
4
5
|
import { type JsonObject } from "../config.js";
|
|
@@ -32,28 +33,30 @@ declare const screeningSchema: z.ZodObject<{
|
|
|
32
33
|
export type ScreeningResult = z.infer<typeof screeningSchema>;
|
|
33
34
|
export type DuplicateDecision = z.infer<typeof reviewSchema>;
|
|
34
35
|
export type GroupingDecision = z.infer<typeof screeningDecisionSchema>;
|
|
35
|
-
export interface DeduplicationReviewer {
|
|
36
|
-
screen(findings: readonly
|
|
37
|
-
reviewPair(findings: readonly
|
|
36
|
+
export interface DeduplicationReviewer<T = Finding> {
|
|
37
|
+
screen(findings: readonly T[]): Promise<ScreeningResult>;
|
|
38
|
+
reviewPair(findings: readonly T[]): Promise<GroupingDecision>;
|
|
38
39
|
}
|
|
39
40
|
export declare function pairKey(ids: readonly string[]): string;
|
|
40
41
|
export declare function screeningPairSlot(index: number): string;
|
|
41
|
-
export declare function validateReview(value: unknown, findings: readonly Finding[]): DuplicateDecision;
|
|
42
|
-
export declare function validateScreening(value: unknown, findings: readonly
|
|
43
|
-
declare class CodexReviewer {
|
|
42
|
+
export declare function validateReview(value: unknown, findings: readonly (Finding | ImportedFinding)[], importedIds?: ReadonlySet<string>): DuplicateDecision;
|
|
43
|
+
export declare function validateScreening(value: unknown, findings: readonly unknown[]): ScreeningResult;
|
|
44
|
+
declare class CodexReviewer<T extends Pick<Finding, "findingId"> = Finding> {
|
|
44
45
|
protected readonly runner: Pick<CodexReviewRunner, "run">;
|
|
45
46
|
private readonly configuration;
|
|
46
|
-
protected readonly sourceContext: (findings: readonly
|
|
47
|
-
constructor(runner: Pick<CodexReviewRunner, "run">, configuration?: JsonObject, sourceContext?: (findings: readonly
|
|
47
|
+
protected readonly sourceContext: (findings: readonly T[]) => string;
|
|
48
|
+
constructor(runner: Pick<CodexReviewRunner, "run">, configuration?: JsonObject, sourceContext?: (findings: readonly T[]) => string);
|
|
48
49
|
protected settings(model: string, effort: string): {
|
|
49
50
|
model: string;
|
|
50
51
|
effort: string;
|
|
51
52
|
};
|
|
52
|
-
screen(findings: readonly
|
|
53
|
+
screen(findings: readonly T[]): Promise<ScreeningResult>;
|
|
53
54
|
}
|
|
54
55
|
/** Rich review contract used by host-provided records consumers. */
|
|
55
|
-
export declare class CodexDeduplicationReviewer extends CodexReviewer implements DeduplicationReviewer {
|
|
56
|
-
|
|
56
|
+
export declare class CodexDeduplicationReviewer extends CodexReviewer<Finding | ImportedFinding> implements DeduplicationReviewer<Finding | ImportedFinding> {
|
|
57
|
+
private readonly importedIds?;
|
|
58
|
+
constructor(runner: Pick<CodexReviewRunner, "run">, configuration?: JsonObject, importedIds?: ReadonlySet<string> | undefined);
|
|
59
|
+
reviewPair(findings: readonly (Finding | ImportedFinding)[]): Promise<DuplicateDecision>;
|
|
57
60
|
}
|
|
58
61
|
/** Saved-scan grouping stores original records and needs only a pair decision. */
|
|
59
62
|
export declare class CodexGroupingReviewer extends CodexReviewer implements DeduplicationReviewer {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deduplication-reviewer.d.ts","sourceRoot":"","sources":["../../src/deduplication/deduplication-reviewer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"deduplication-reviewer.d.ts","sourceRoot":"","sources":["../../src/deduplication/deduplication-reviewer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAM3D,OAAO,EAA0B,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAevE,QAAA,MAAM,YAAY;;;;;;;;;;+BAGhB,CAAC;AACH,QAAA,MAAM,uBAAuB;;;;;;gCAG3B,CAAC;AAEH,QAAA,MAAM,eAAe;;;;;;;;kBAEnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAC9D,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAC7D,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEvE,MAAM,WAAW,qBAAqB,CAAC,CAAC,GAAG,OAAO;IAChD,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACzD,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC/D;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAEtD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC,EAAE,EAChD,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,iBAAiB,CAkBnB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,SAAS,OAAO,EAAE,GAC3B,eAAe,CAejB;AAiBD,cAAM,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,OAAO;IAE9D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC;IACzD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,KAAK,MAAM;IAHtE,YACqB,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,EACxC,aAAa,GAAE,UAAe,EAC5B,aAAa,GAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,KAAK,MAC1D,EACF;IAEJ,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;QAMrC,KAAK;QAAkB,MAAM;MACvC;IACK,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAS7D;CACF;AAED,oEAAoE;AACpE,qBAAa,0BACX,SAAQ,aAAa,CAAC,OAAO,GAAG,eAAe,CAC/C,YAAW,qBAAqB,CAAC,OAAO,GAAG,eAAe,CAAC;IAKzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAH/B,YACE,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,EACtC,aAAa,GAAE,UAAe,EACb,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,YAAA,EAGnD;IAEK,UAAU,CACd,QAAQ,EAAE,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC,EAAE,GAC/C,OAAO,CAAC,iBAAiB,CAAC,CAY5B;CACF;AAED,kFAAkF;AAClF,qBAAa,qBACX,SAAQ,aACR,YAAW,qBAAqB;IAE1B,UAAU,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAYxE;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import { requireFinding } from "./finding-schema.js";
|
|
2
|
+
import { requireFinding, requireImportedFinding, } from "./finding-schema.js";
|
|
3
3
|
import { pairReviewPrompt, groupingReviewPrompt, screeningPrompt, } from "./deduplication-prompts.js";
|
|
4
4
|
import { scanModelConfiguration } from "../config.js";
|
|
5
5
|
const rationale = z.string().refine((value) => value.trim().length > 0);
|
|
@@ -33,11 +33,13 @@ export function pairKey(ids) {
|
|
|
33
33
|
export function screeningPairSlot(index) {
|
|
34
34
|
return `pair-${index + 1}`;
|
|
35
35
|
}
|
|
36
|
-
export function validateReview(value, findings) {
|
|
36
|
+
export function validateReview(value, findings, importedIds) {
|
|
37
37
|
const result = reviewSchema.parse(value);
|
|
38
38
|
if (result.decision !== "SAME")
|
|
39
39
|
return result;
|
|
40
|
-
const finding =
|
|
40
|
+
const finding = importedIds?.has(result.canonicalFindingId)
|
|
41
|
+
? requireImportedFinding(result.mergedFinding)
|
|
42
|
+
: requireFinding(result.mergedFinding);
|
|
41
43
|
if (finding.findingId !== result.canonicalFindingId)
|
|
42
44
|
throw new Error("Every SAME decision requires the canonical finding's identity.");
|
|
43
45
|
if (!findings.some((finding) => finding.findingId === result.canonicalFindingId)) {
|
|
@@ -100,6 +102,11 @@ class CodexReviewer {
|
|
|
100
102
|
}
|
|
101
103
|
/** Rich review contract used by host-provided records consumers. */
|
|
102
104
|
export class CodexDeduplicationReviewer extends CodexReviewer {
|
|
105
|
+
importedIds;
|
|
106
|
+
constructor(runner, configuration = {}, importedIds) {
|
|
107
|
+
super(runner, configuration);
|
|
108
|
+
this.importedIds = importedIds;
|
|
109
|
+
}
|
|
103
110
|
async reviewPair(findings) {
|
|
104
111
|
return await this.runner.run({
|
|
105
112
|
stage: "pair-review",
|
|
@@ -110,7 +117,7 @@ export class CodexDeduplicationReviewer extends CodexReviewer {
|
|
|
110
117
|
type: "object",
|
|
111
118
|
...z.toJSONSchema(reviewSchema, { target: "openapi-3.0" }),
|
|
112
119
|
},
|
|
113
|
-
validate: (value) => validateReview(value, findings),
|
|
120
|
+
validate: (value) => validateReview(value, findings, this.importedIds),
|
|
114
121
|
});
|
|
115
122
|
}
|
|
116
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deduplication-reviewer.js","sourceRoot":"","sources":["../../src/deduplication/deduplication-reviewer.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from \"zod\";\nimport { requireFinding } from \"./finding-schema.js\";\nimport type { Finding } from \"../models.js\";\nimport type { CodexReviewRunner } from \"./codex-review.js\";\nimport {\n pairReviewPrompt,\n groupingReviewPrompt,\n screeningPrompt,\n} from \"./deduplication-prompts.js\";\nimport { scanModelConfiguration, type JsonObject } from \"../config.js\";\n\nconst rationale = z.string().refine((value) => value.trim().length > 0);\nconst sameSchema = z.object({\n decision: z.literal(\"SAME\"),\n rationale,\n canonicalFindingId: z.string(),\n mergedFinding: z.record(z.string(), z.unknown()),\n});\nconst distinctSchema = z.object({\n decision: z.literal(\"DISTINCT\"),\n rationale,\n canonicalFindingId: z.null().optional(),\n mergedFinding: z.null().optional(),\n});\nconst reviewSchema = z.discriminatedUnion(\"decision\", [\n sameSchema,\n distinctSchema,\n]);\nconst screeningDecisionSchema = z.discriminatedUnion(\"decision\", [\n sameSchema.pick({ decision: true, rationale: true }).strict(),\n distinctSchema.pick({ decision: true, rationale: true }).strict(),\n]);\n// The host assigns exact slot names; finding IDs stay out of model output.\nconst screeningSchema = z.strictObject({\n decisions: z.record(z.string(), screeningDecisionSchema),\n});\n\nexport type ScreeningResult = z.infer<typeof screeningSchema>;\nexport type DuplicateDecision = z.infer<typeof reviewSchema>;\nexport type GroupingDecision = z.infer<typeof screeningDecisionSchema>;\n\nexport interface DeduplicationReviewer {\n screen(findings: readonly Finding[]): Promise<ScreeningResult>;\n reviewPair(findings: readonly Finding[]): Promise<GroupingDecision>;\n}\n\nexport function pairKey(ids: readonly string[]): string {\n return JSON.stringify([...ids].sort());\n}\n\nexport function screeningPairSlot(index: number): string {\n return `pair-${index + 1}`;\n}\n\nexport function validateReview(\n value: unknown,\n findings: readonly Finding[],\n): DuplicateDecision {\n const result = reviewSchema.parse(value);\n if (result.decision !== \"SAME\") return result;\n const finding = requireFinding(result.mergedFinding);\n if (finding.findingId !== result.canonicalFindingId)\n throw new Error(\n \"Every SAME decision requires the canonical finding's identity.\",\n );\n if (\n !findings.some((finding) => finding.findingId === result.canonicalFindingId)\n ) {\n throw new Error(\n \"The canonical finding must belong to the assigned findings.\",\n );\n }\n return result;\n}\n\nexport function validateScreening(\n value: unknown,\n findings: readonly Finding[],\n): ScreeningResult {\n const result = screeningSchema.parse(value);\n const required = findings\n .slice(1)\n .map((_finding, index) => screeningPairSlot(index));\n const submitted = Object.keys(result.decisions);\n if (\n submitted.length !== required.length ||\n required.some((slot) => !Object.hasOwn(result.decisions, slot))\n ) {\n throw new Error(\n `Submit exactly the assigned screening pair slots: ${required.join(\", \")}.`,\n );\n }\n return result;\n}\n\nfunction screeningToolSchema(neighborCount: number): object {\n const slots = Object.fromEntries(\n Array.from({ length: neighborCount }, (_value, index) => [\n screeningPairSlot(index),\n screeningDecisionSchema,\n ]),\n );\n return z.toJSONSchema(z.strictObject({ decisions: z.strictObject(slots) }), {\n target: \"openapi-3.0\",\n override: ({ jsonSchema }) => {\n if (jsonSchema.type === \"object\") jsonSchema.required ??= [];\n },\n });\n}\n\nclass CodexReviewer {\n constructor(\n protected readonly runner: Pick<CodexReviewRunner, \"run\">,\n private readonly configuration: JsonObject = {},\n protected readonly sourceContext: (\n findings: readonly Finding[],\n ) => string = () => \"\",\n ) {}\n\n protected settings(model: string, effort: string) {\n const selected = scanModelConfiguration({\n model,\n model_reasoning_effort: effort,\n ...this.configuration,\n });\n return { model: selected.model, effort: selected.reasoningEffort };\n }\n async screen(findings: readonly Finding[]): Promise<ScreeningResult> {\n return await this.runner.run({\n stage: \"screening\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-luna\", \"xhigh\"),\n prompt: `${this.sourceContext(findings)}${screeningPrompt(findings)}`,\n schema: screeningToolSchema(findings.length - 1),\n validate: (value) => validateScreening(value, findings),\n });\n }\n}\n\n/** Rich review contract used by host-provided records consumers. */\nexport class CodexDeduplicationReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<DuplicateDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: pairReviewPrompt(findings),\n schema: {\n type: \"object\",\n ...z.toJSONSchema(reviewSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => validateReview(value, findings),\n });\n }\n}\n\n/** Saved-scan grouping stores original records and needs only a pair decision. */\nexport class CodexGroupingReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<GroupingDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: `${this.sourceContext(findings)}${groupingReviewPrompt(findings)}`,\n schema: {\n type: \"object\",\n ...z.toJSONSchema(screeningDecisionSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => screeningDecisionSchema.parse(value),\n });\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"deduplication-reviewer.js","sourceRoot":"","sources":["../../src/deduplication/deduplication-reviewer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,cAAc,EACd,sBAAsB,GAEvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,GAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAmB,MAAM,cAAc,CAAC;AAEvE,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACxE,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IAC3B,SAAS;IACT,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE;IAC9B,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;CACjD,CAAC,CAAC;AACH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IAC/B,SAAS;IACT,kBAAkB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IACvC,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;CACnC,CAAC,CAAC;AACH,MAAM,YAAY,GAAG,CAAC,CAAC,kBAAkB,CAAC,UAAU,EAAE;IACpD,UAAU;IACV,cAAc;CACf,CAAC,CAAC;AACH,MAAM,uBAAuB,GAAG,CAAC,CAAC,kBAAkB,CAAC,UAAU,EAAE;IAC/D,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAC7D,cAAc,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;CAClE,CAAC,CAAC;AACH,2EAA2E;AAC3E,MAAM,eAAe,GAAG,CAAC,CAAC,YAAY,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC;CACzD,CAAC,CAAC;AAWH,MAAM,UAAU,OAAO,CAAC,GAAsB;IAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,OAAO,QAAQ,KAAK,GAAG,CAAC,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,KAAc,EACd,QAAgD,EAChD,WAAiC;IAEjC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAC9C,MAAM,OAAO,GAAG,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;QACzD,CAAC,CAAC,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC;QAC9C,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACzC,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,kBAAkB;QACjD,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;IACJ,IACE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,kBAAkB,CAAC,EAC5E,CAAC;QACD,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAAc,EACd,QAA4B;IAE5B,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,QAAQ;SACtB,KAAK,CAAC,CAAC,CAAC;SACR,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChD,IACE,SAAS,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QACpC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,EAC/D,CAAC;QACD,MAAM,IAAI,KAAK,CACb,qDAAqD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC5E,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,aAAqB;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACvD,iBAAiB,CAAC,KAAK,CAAC;QACxB,uBAAuB;KACxB,CAAC,CACH,CAAC;IACF,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;QAC1E,MAAM,EAAE,aAAa;QACrB,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;YAC3B,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ;gBAAE,UAAU,CAAC,QAAQ,KAAK,EAAE,CAAC;QAC/D,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,aAAa;IAEI,MAAM;IACR,aAAa;IACX,aAAa;IAHlC,YACqB,MAAsC,EACxC,aAAa,GAAe,EAAE,EAC5B,aAAa,GAAuC,GAAG,EAAE,CAC1E,EAAE;sBAHe,MAAM;6BACR,aAAa;6BACX,aAAa;IAE/B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,MAAc;QAC9C,MAAM,QAAQ,GAAG,sBAAsB,CAAC;YACtC,KAAK;YACL,sBAAsB,EAAE,MAAM;YAC9B,GAAG,IAAI,CAAC,aAAa;SACtB,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC;IACrE,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,QAAsB;QACjC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YAC3B,KAAK,EAAE,WAAW;YAClB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;YACxD,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;YACzC,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,EAAE;YACrE,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAChD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;CACF;AAED,oEAAoE;AACpE,MAAM,OAAO,0BACX,SAAQ,aAAwC;IAM7B,WAAW;IAH9B,YACE,MAAsC,EACtC,aAAa,GAAe,EAAE,EACb,WAAiC;QAElD,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;2BAFZ,WAAW;IAG9B,CAAC;IAED,KAAK,CAAC,UAAU,CACd,QAAgD;QAEhD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YAC3B,KAAK,EAAE,aAAa;YACpB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;YACxD,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;YACvC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC;YAClC,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,GAAG,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;aAC3D;YACD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC;SACvE,CAAC,CAAC;IACL,CAAC;CACF;AAED,kFAAkF;AAClF,MAAM,OAAO,qBACX,SAAQ,aAAa;IAGrB,KAAK,CAAC,UAAU,CAAC,QAA4B;QAC3C,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YAC3B,KAAK,EAAE,aAAa;YACpB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;YACxD,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;YACvC,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE;YAC1E,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,GAAG,CAAC,CAAC,YAAY,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;aACtE;YACD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,uBAAuB,CAAC,KAAK,CAAC,KAAK,CAAC;SAC1D,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { z } from \"zod\";\nimport {\n requireFinding,\n requireImportedFinding,\n type ImportedFinding,\n} from \"./finding-schema.js\";\nimport type { Finding } from \"../models.js\";\nimport type { CodexReviewRunner } from \"./codex-review.js\";\nimport {\n pairReviewPrompt,\n groupingReviewPrompt,\n screeningPrompt,\n} from \"./deduplication-prompts.js\";\nimport { scanModelConfiguration, type JsonObject } from \"../config.js\";\n\nconst rationale = z.string().refine((value) => value.trim().length > 0);\nconst sameSchema = z.object({\n decision: z.literal(\"SAME\"),\n rationale,\n canonicalFindingId: z.string(),\n mergedFinding: z.record(z.string(), z.unknown()),\n});\nconst distinctSchema = z.object({\n decision: z.literal(\"DISTINCT\"),\n rationale,\n canonicalFindingId: z.null().optional(),\n mergedFinding: z.null().optional(),\n});\nconst reviewSchema = z.discriminatedUnion(\"decision\", [\n sameSchema,\n distinctSchema,\n]);\nconst screeningDecisionSchema = z.discriminatedUnion(\"decision\", [\n sameSchema.pick({ decision: true, rationale: true }).strict(),\n distinctSchema.pick({ decision: true, rationale: true }).strict(),\n]);\n// The host assigns exact slot names; finding IDs stay out of model output.\nconst screeningSchema = z.strictObject({\n decisions: z.record(z.string(), screeningDecisionSchema),\n});\n\nexport type ScreeningResult = z.infer<typeof screeningSchema>;\nexport type DuplicateDecision = z.infer<typeof reviewSchema>;\nexport type GroupingDecision = z.infer<typeof screeningDecisionSchema>;\n\nexport interface DeduplicationReviewer<T = Finding> {\n screen(findings: readonly T[]): Promise<ScreeningResult>;\n reviewPair(findings: readonly T[]): Promise<GroupingDecision>;\n}\n\nexport function pairKey(ids: readonly string[]): string {\n return JSON.stringify([...ids].sort());\n}\n\nexport function screeningPairSlot(index: number): string {\n return `pair-${index + 1}`;\n}\n\nexport function validateReview(\n value: unknown,\n findings: readonly (Finding | ImportedFinding)[],\n importedIds?: ReadonlySet<string>,\n): DuplicateDecision {\n const result = reviewSchema.parse(value);\n if (result.decision !== \"SAME\") return result;\n const finding = importedIds?.has(result.canonicalFindingId)\n ? requireImportedFinding(result.mergedFinding)\n : requireFinding(result.mergedFinding);\n if (finding.findingId !== result.canonicalFindingId)\n throw new Error(\n \"Every SAME decision requires the canonical finding's identity.\",\n );\n if (\n !findings.some((finding) => finding.findingId === result.canonicalFindingId)\n ) {\n throw new Error(\n \"The canonical finding must belong to the assigned findings.\",\n );\n }\n return result;\n}\n\nexport function validateScreening(\n value: unknown,\n findings: readonly unknown[],\n): ScreeningResult {\n const result = screeningSchema.parse(value);\n const required = findings\n .slice(1)\n .map((_finding, index) => screeningPairSlot(index));\n const submitted = Object.keys(result.decisions);\n if (\n submitted.length !== required.length ||\n required.some((slot) => !Object.hasOwn(result.decisions, slot))\n ) {\n throw new Error(\n `Submit exactly the assigned screening pair slots: ${required.join(\", \")}.`,\n );\n }\n return result;\n}\n\nfunction screeningToolSchema(neighborCount: number): object {\n const slots = Object.fromEntries(\n Array.from({ length: neighborCount }, (_value, index) => [\n screeningPairSlot(index),\n screeningDecisionSchema,\n ]),\n );\n return z.toJSONSchema(z.strictObject({ decisions: z.strictObject(slots) }), {\n target: \"openapi-3.0\",\n override: ({ jsonSchema }) => {\n if (jsonSchema.type === \"object\") jsonSchema.required ??= [];\n },\n });\n}\n\nclass CodexReviewer<T extends Pick<Finding, \"findingId\"> = Finding> {\n constructor(\n protected readonly runner: Pick<CodexReviewRunner, \"run\">,\n private readonly configuration: JsonObject = {},\n protected readonly sourceContext: (findings: readonly T[]) => string = () =>\n \"\",\n ) {}\n\n protected settings(model: string, effort: string) {\n const selected = scanModelConfiguration({\n model,\n model_reasoning_effort: effort,\n ...this.configuration,\n });\n return { model: selected.model, effort: selected.reasoningEffort };\n }\n async screen(findings: readonly T[]): Promise<ScreeningResult> {\n return await this.runner.run({\n stage: \"screening\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-luna\", \"xhigh\"),\n prompt: `${this.sourceContext(findings)}${screeningPrompt(findings)}`,\n schema: screeningToolSchema(findings.length - 1),\n validate: (value) => validateScreening(value, findings),\n });\n }\n}\n\n/** Rich review contract used by host-provided records consumers. */\nexport class CodexDeduplicationReviewer\n extends CodexReviewer<Finding | ImportedFinding>\n implements DeduplicationReviewer<Finding | ImportedFinding>\n{\n constructor(\n runner: Pick<CodexReviewRunner, \"run\">,\n configuration: JsonObject = {},\n private readonly importedIds?: ReadonlySet<string>,\n ) {\n super(runner, configuration);\n }\n\n async reviewPair(\n findings: readonly (Finding | ImportedFinding)[],\n ): Promise<DuplicateDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: pairReviewPrompt(findings),\n schema: {\n type: \"object\",\n ...z.toJSONSchema(reviewSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => validateReview(value, findings, this.importedIds),\n });\n }\n}\n\n/** Saved-scan grouping stores original records and needs only a pair decision. */\nexport class CodexGroupingReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<GroupingDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: `${this.sourceContext(findings)}${groupingReviewPrompt(findings)}`,\n schema: {\n type: \"object\",\n ...z.toJSONSchema(screeningDecisionSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => screeningDecisionSchema.parse(value),\n });\n }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deduplication.js","sourceRoot":"","sources":["../../src/deduplication/deduplication.ts"],"names":[],"mappings":"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","sourcesContent":["import { SCAN_SEVERITIES } from \"../scan-settings.js\";\nimport { findingGroupRoots } from \"../finding-catalogue.js\";\nimport type { Finding } from \"../models.js\";\nimport type { FindingNeighborhood } from \"../finding-retrieval.js\";\nimport {\n CodexSecurityError,\n DeduplicationReviewError,\n type DeduplicationReviewStage,\n} from \"../errors.js\";\nimport {\n pairKey,\n screeningPairSlot,\n type DeduplicationReviewer,\n type ScreeningResult,\n} from \"./deduplication-reviewer.js\";\n\nexport const DEFAULT_DEDUPE_CONCURRENCY = 8;\n\nexport function deduplicationConcurrency(\n concurrency = DEFAULT_DEDUPE_CONCURRENCY,\n): number {\n if (!Number.isSafeInteger(concurrency) || concurrency < 1)\n throw new CodexSecurityError(\n \"concurrency must be a positive safe integer.\",\n );\n return concurrency;\n}\n\ntype Job = () => Promise<void>;\n\nasync function runQueued(\n pending: Job[],\n ready: Job[],\n concurrency: number,\n signal?: AbortSignal,\n): Promise<void> {\n let failure: { error: unknown } | undefined;\n await new Promise<void>((resolve) => {\n let running = 0;\n async function run(job: Job): Promise<void> {\n try {\n await job();\n } catch (error) {\n failure ??= { error };\n } finally {\n running--;\n pump();\n }\n }\n function pump(): void {\n while (\n failure === undefined &&\n !signal?.aborted &&\n running < concurrency\n ) {\n const job = ready.shift() ?? pending.shift();\n if (job === undefined) break;\n running++;\n void run(job);\n }\n // An active producer can still enqueue work. After failure, drain active\n // jobs so successful reviews can finish saving their checkpoints.\n if (running === 0) resolve();\n }\n pump();\n });\n signal?.throwIfAborted();\n if (failure !== undefined) throw failure.error;\n}\n\nexport interface DeduplicationRefusal {\n decision: \"NO_DECISION\";\n stage: DeduplicationReviewStage;\n model: string;\n /** For screening, the first finding is the anchor and the rest are its candidates. */\n findingIds: string[];\n reason: string;\n}\n\nexport interface DeduplicationResult {\n uniqueFindingIds: string[];\n duplicateGroups: string[][];\n deduplicationStatus: \"completed\" | \"completed_with_refusals\";\n /** Refused reviews are kept separate without claiming a DISTINCT verdict. */\n refusals?: DeduplicationRefusal[];\n}\n\n/** @internal */\nexport interface ContradictionGroupingMetrics {\n candidateEvaluations: number;\n conflictNeighborChecks: number;\n}\n\n/** Greedily retain the best-supported legal merges, using input order for ties. */\n/** @internal */\nexport function contradictionFreeSubgroups(\n findingIds: readonly string[],\n samePairs: readonly (readonly [string, string])[],\n distinctPairs: readonly (readonly [string, string])[],\n signal?: AbortSignal,\n metrics?: ContradictionGroupingMetrics,\n): Set<string>[] {\n const indexes = new Map(\n findingIds.map((findingId, index) => [findingId, index]),\n );\n const clusters = new Map(\n findingIds.map((findingId, index) => [index, new Set([findingId])]),\n );\n const support = new Map<number, Map<number, number>>();\n for (const [left, right] of samePairs) {\n const leftIndex = indexes.get(left)!;\n const rightIndex = indexes.get(right)!;\n const leftSupport = support.get(leftIndex) ?? new Map<number, number>();\n const rightSupport = support.get(rightIndex) ?? new Map<number, number>();\n leftSupport.set(rightIndex, (leftSupport.get(rightIndex) ?? 0) + 1);\n rightSupport.set(leftIndex, (rightSupport.get(leftIndex) ?? 0) + 1);\n support.set(leftIndex, leftSupport);\n support.set(rightIndex, rightSupport);\n }\n const conflicts = new Map<number, Set<number>>();\n for (const [left, right] of distinctPairs) {\n const leftIndex = indexes.get(left)!;\n const rightIndex = indexes.get(right)!;\n const leftConflicts = conflicts.get(leftIndex) ?? new Set<number>();\n const rightConflicts = conflicts.get(rightIndex) ?? new Set<number>();\n leftConflicts.add(rightIndex);\n rightConflicts.add(leftIndex);\n conflicts.set(leftIndex, leftConflicts);\n conflicts.set(rightIndex, rightConflicts);\n }\n\n while (true) {\n signal?.throwIfAborted();\n let selected: readonly [number, number] | undefined;\n let selectedScore: readonly number[] | undefined;\n for (const leftCluster of clusters.keys()) {\n for (const [rightCluster, gain] of support.get(leftCluster) ?? []) {\n if (\n leftCluster >= rightCluster ||\n conflicts.get(leftCluster)?.has(rightCluster)\n )\n continue;\n if (metrics) metrics.candidateEvaluations++;\n let newlyBlocked = 0;\n const leftConflicts = conflicts.get(leftCluster);\n const rightConflicts = conflicts.get(rightCluster);\n for (const other of leftConflicts ?? []) {\n if (metrics) metrics.conflictNeighborChecks++;\n if (other !== rightCluster && !rightConflicts?.has(other))\n newlyBlocked += support.get(rightCluster)?.get(other) ?? 0;\n }\n for (const other of rightConflicts ?? []) {\n if (metrics) metrics.conflictNeighborChecks++;\n if (other !== leftCluster && !leftConflicts?.has(other))\n newlyBlocked += support.get(leftCluster)?.get(other) ?? 0;\n }\n const score = [\n gain - newlyBlocked,\n gain,\n -newlyBlocked,\n -leftCluster,\n -rightCluster,\n ];\n if (selectedScore !== undefined) {\n const index = score.findIndex(\n (value, position) => value !== selectedScore![position],\n );\n if (index === -1 || !(score[index]! > selectedScore[index]!)) {\n continue;\n }\n }\n selected = [leftCluster, rightCluster];\n selectedScore = score;\n }\n }\n if (selected === undefined)\n return [...clusters.values()].filter((members) => members.size > 1);\n const [leftCluster, rightCluster] = selected;\n for (const member of clusters.get(rightCluster)!)\n clusters.get(leftCluster)!.add(member);\n clusters.delete(rightCluster);\n\n const leftSupport = support.get(leftCluster)!;\n leftSupport.delete(rightCluster);\n for (const [neighbor, rightWeight] of support.get(rightCluster)!) {\n if (neighbor === leftCluster || neighbor === rightCluster) continue;\n const weight = (leftSupport.get(neighbor) ?? 0) + rightWeight;\n leftSupport.set(neighbor, weight);\n support.get(neighbor)!.set(leftCluster, weight).delete(rightCluster);\n }\n support.delete(rightCluster);\n\n const mergedConflicts = conflicts.get(leftCluster) ?? new Set<number>();\n for (const id of conflicts.get(rightCluster) ?? []) mergedConflicts.add(id);\n mergedConflicts.delete(leftCluster);\n mergedConflicts.delete(rightCluster);\n for (const neighbor of mergedConflicts) {\n conflicts.get(neighbor)!.add(leftCluster).delete(rightCluster);\n }\n conflicts.set(leftCluster, mergedConflicts);\n conflicts.delete(rightCluster);\n }\n}\n\n/** @internal */\nexport class FindingDeduplicator {\n constructor(\n private readonly candidates: {\n potentialDuplicates(findingId: string): Promise<FindingNeighborhood>;\n },\n private readonly reviewer: DeduplicationReviewer,\n private readonly signal?: AbortSignal,\n private readonly concurrency = DEFAULT_DEDUPE_CONCURRENCY,\n ) {}\n\n async run(findingIds: readonly string[]): Promise<DeduplicationResult> {\n this.signal?.throwIfAborted();\n const concurrency = deduplicationConcurrency(this.concurrency);\n const ids = [...new Set(findingIds)];\n const findings = new Map<string, Finding>();\n const refusals = new Map<string, DeduplicationRefusal>();\n const recordRefusal = (error: unknown, ids: string[]): void => {\n this.signal?.throwIfAborted();\n if (\n !(error instanceof DeduplicationReviewError) ||\n error.metadata.category !== \"refusal\"\n )\n throw error;\n const { stage, model, reason } = error.metadata;\n refusals.set(JSON.stringify([stage, ...ids]), {\n decision: \"NO_DECISION\",\n stage,\n model,\n findingIds: ids,\n reason,\n });\n };\n const neighborhoods = new Array<Finding[]>(ids.length);\n await runQueued(\n ids.map((id, index) => async () => {\n const result = await this.candidates.potentialDuplicates(id);\n this.signal?.throwIfAborted();\n neighborhoods[index] = [result.finding, ...result.potentialDuplicates];\n }),\n [],\n concurrency,\n this.signal,\n );\n const pairs = new Map<\n string,\n {\n ids: [string, string];\n remaining: number;\n rejected: boolean;\n decision?: \"SAME\" | \"DISTINCT\";\n }\n >();\n // Freeze records, insertion order, and the last nominating anchor's pair\n // orientation before reviews run, preserving grouping and checkpoint inputs.\n for (const neighborhood of neighborhoods) {\n this.signal?.throwIfAborted();\n for (const finding of neighborhood)\n findings.set(finding.findingId, finding);\n for (const neighbor of neighborhood.slice(1)) {\n const pair: [string, string] = [\n neighborhood[0]!.findingId,\n neighbor.findingId,\n ];\n const key = pairKey(pair);\n const state = pairs.get(key);\n if (state === undefined) {\n pairs.set(key, { ids: pair, remaining: 1, rejected: false });\n } else {\n state.ids = pair;\n state.remaining++;\n }\n }\n }\n\n const ready: Job[] = [];\n const pending = neighborhoods\n .filter((neighborhood) => neighborhood.length > 1)\n .map((neighborhood) => async () => {\n let screening: ScreeningResult | undefined;\n try {\n screening = await this.reviewer.screen(neighborhood);\n } catch (error) {\n recordRefusal(\n error,\n neighborhood.map((finding) => finding.findingId),\n );\n }\n this.signal?.throwIfAborted();\n for (let index = 0; index < neighborhood.length - 1; index++) {\n const key = pairKey([\n neighborhood[0]!.findingId,\n neighborhood[index + 1]!.findingId,\n ]);\n const state = pairs.get(key)!;\n if (\n screening === undefined ||\n screening.decisions[screeningPairSlot(index)]!.decision ===\n \"DISTINCT\"\n )\n state.rejected = true;\n state.remaining--;\n // Wait for every screening: a later DISTINCT verdict or refusal must\n // prevent verification, including a verification that could fail.\n if (state.remaining === 0 && !state.rejected) {\n ready.push(async () => {\n try {\n state.decision = (\n await this.reviewer.reviewPair(\n state.ids.map((id) => findings.get(id)!),\n )\n ).decision;\n } catch (error) {\n recordRefusal(error, state.ids);\n }\n });\n }\n }\n });\n await runQueued(pending, ready, concurrency, this.signal);\n\n // Completion order must not change grouping ties.\n const supported: [string, string][] = [];\n const rejected: [string, string][] = [];\n for (const state of pairs.values()) {\n this.signal?.throwIfAborted();\n if (state.decision === \"SAME\") supported.push(state.ids);\n else rejected.push(state.ids);\n }\n\n const { parents, root } = findingGroupRoots();\n for (const [left, right] of supported) parents.set(root(right), root(left));\n // Preserve finding insertion order for contradiction-grouping ties.\n const membersByRoot = Map.groupBy(findings.keys(), (id) => {\n this.signal?.throwIfAborted();\n return parents.has(id) ? root(id) : undefined;\n });\n membersByRoot.delete(undefined);\n const supportedByRoot = Map.groupBy(supported, ([left]) => root(left));\n const rejectedByRoot = Map.groupBy(\n rejected.filter(([left, right]) => root(left) === root(right)),\n ([left]) => root(left),\n );\n\n const selected = new Set(ids);\n const duplicateGroups: string[][] = [];\n const canonical = new Map<string, string>();\n for (const [componentRoot, members] of membersByRoot) {\n this.signal?.throwIfAborted();\n const conflicts = rejectedByRoot.get(componentRoot!);\n const groups =\n conflicts === undefined\n ? [new Set(members)]\n : contradictionFreeSubgroups(\n members,\n supportedByRoot.get(componentRoot!)!,\n conflicts,\n this.signal,\n );\n for (const group of groups) {\n const groupMembers = [...group];\n if (!groupMembers.some((member) => selected.has(member))) continue;\n groupMembers.sort(\n (left, right) =>\n SCAN_SEVERITIES.indexOf(findings.get(left)!.severity.level) -\n SCAN_SEVERITIES.indexOf(findings.get(right)!.severity.level) ||\n (left < right ? -1 : left > right ? 1 : 0),\n );\n duplicateGroups.push(groupMembers);\n for (const member of groupMembers)\n canonical.set(member, groupMembers[0]!);\n }\n }\n return {\n uniqueFindingIds: [...new Set(ids.map((id) => canonical.get(id) ?? id))],\n duplicateGroups,\n deduplicationStatus:\n refusals.size > 0 ? \"completed_with_refusals\" : \"completed\",\n ...(refusals.size > 0\n ? {\n refusals: [...refusals.entries()]\n .sort(([left], [right]) =>\n left < right ? -1 : left > right ? 1 : 0,\n )\n .map(([, refusal]) => refusal),\n }\n : {}),\n };\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"deduplication.js","sourceRoot":"","sources":["../../src/deduplication/deduplication.ts"],"names":[],"mappings":"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","sourcesContent":["import { SCAN_SEVERITIES } from \"../scan-settings.js\";\nimport { findingGroupRoots } from \"../finding-catalogue.js\";\nimport type { Finding } from \"../models.js\";\nimport type { FindingNeighborhood } from \"../finding-retrieval.js\";\nimport {\n CodexSecurityError,\n DeduplicationReviewError,\n type DeduplicationReviewStage,\n} from \"../errors.js\";\nimport {\n pairKey,\n screeningPairSlot,\n type DeduplicationReviewer,\n type ScreeningResult,\n} from \"./deduplication-reviewer.js\";\n\nexport const DEFAULT_DEDUPE_CONCURRENCY = 8;\n\nexport function deduplicationConcurrency(\n concurrency = DEFAULT_DEDUPE_CONCURRENCY,\n): number {\n if (!Number.isSafeInteger(concurrency) || concurrency < 1)\n throw new CodexSecurityError(\n \"concurrency must be a positive safe integer.\",\n );\n return concurrency;\n}\n\ntype Job = () => Promise<void>;\n\nasync function runQueued(\n pending: Job[],\n ready: Job[],\n concurrency: number,\n signal?: AbortSignal,\n): Promise<void> {\n let failure: { error: unknown } | undefined;\n await new Promise<void>((resolve) => {\n let running = 0;\n async function run(job: Job): Promise<void> {\n try {\n await job();\n } catch (error) {\n failure ??= { error };\n } finally {\n running--;\n pump();\n }\n }\n function pump(): void {\n while (\n failure === undefined &&\n !signal?.aborted &&\n running < concurrency\n ) {\n const job = ready.shift() ?? pending.shift();\n if (job === undefined) break;\n running++;\n void run(job);\n }\n // An active producer can still enqueue work. After failure, drain active\n // jobs so successful reviews can finish saving their checkpoints.\n if (running === 0) resolve();\n }\n pump();\n });\n signal?.throwIfAborted();\n if (failure !== undefined) throw failure.error;\n}\n\nexport interface DeduplicationRefusal {\n decision: \"NO_DECISION\";\n stage: DeduplicationReviewStage;\n model: string;\n /** For screening, the first finding is the anchor and the rest are its candidates. */\n findingIds: string[];\n reason: string;\n}\n\nexport interface DeduplicationResult {\n uniqueFindingIds: string[];\n duplicateGroups: string[][];\n deduplicationStatus: \"completed\" | \"completed_with_refusals\";\n /** Refused reviews are kept separate without claiming a DISTINCT verdict. */\n refusals?: DeduplicationRefusal[];\n}\n\n/** @internal */\nexport interface ContradictionGroupingMetrics {\n candidateEvaluations: number;\n conflictNeighborChecks: number;\n}\n\n/** Greedily retain the best-supported legal merges, using input order for ties. */\n/** @internal */\nexport function contradictionFreeSubgroups(\n findingIds: readonly string[],\n samePairs: readonly (readonly [string, string])[],\n distinctPairs: readonly (readonly [string, string])[],\n signal?: AbortSignal,\n metrics?: ContradictionGroupingMetrics,\n): Set<string>[] {\n const indexes = new Map(\n findingIds.map((findingId, index) => [findingId, index]),\n );\n const clusters = new Map(\n findingIds.map((findingId, index) => [index, new Set([findingId])]),\n );\n const support = new Map<number, Map<number, number>>();\n for (const [left, right] of samePairs) {\n const leftIndex = indexes.get(left)!;\n const rightIndex = indexes.get(right)!;\n const leftSupport = support.get(leftIndex) ?? new Map<number, number>();\n const rightSupport = support.get(rightIndex) ?? new Map<number, number>();\n leftSupport.set(rightIndex, (leftSupport.get(rightIndex) ?? 0) + 1);\n rightSupport.set(leftIndex, (rightSupport.get(leftIndex) ?? 0) + 1);\n support.set(leftIndex, leftSupport);\n support.set(rightIndex, rightSupport);\n }\n const conflicts = new Map<number, Set<number>>();\n for (const [left, right] of distinctPairs) {\n const leftIndex = indexes.get(left)!;\n const rightIndex = indexes.get(right)!;\n const leftConflicts = conflicts.get(leftIndex) ?? new Set<number>();\n const rightConflicts = conflicts.get(rightIndex) ?? new Set<number>();\n leftConflicts.add(rightIndex);\n rightConflicts.add(leftIndex);\n conflicts.set(leftIndex, leftConflicts);\n conflicts.set(rightIndex, rightConflicts);\n }\n\n while (true) {\n signal?.throwIfAborted();\n let selected: readonly [number, number] | undefined;\n let selectedScore: readonly number[] | undefined;\n for (const leftCluster of clusters.keys()) {\n for (const [rightCluster, gain] of support.get(leftCluster) ?? []) {\n if (\n leftCluster >= rightCluster ||\n conflicts.get(leftCluster)?.has(rightCluster)\n )\n continue;\n if (metrics) metrics.candidateEvaluations++;\n let newlyBlocked = 0;\n const leftConflicts = conflicts.get(leftCluster);\n const rightConflicts = conflicts.get(rightCluster);\n for (const other of leftConflicts ?? []) {\n if (metrics) metrics.conflictNeighborChecks++;\n if (other !== rightCluster && !rightConflicts?.has(other))\n newlyBlocked += support.get(rightCluster)?.get(other) ?? 0;\n }\n for (const other of rightConflicts ?? []) {\n if (metrics) metrics.conflictNeighborChecks++;\n if (other !== leftCluster && !leftConflicts?.has(other))\n newlyBlocked += support.get(leftCluster)?.get(other) ?? 0;\n }\n const score = [\n gain - newlyBlocked,\n gain,\n -newlyBlocked,\n -leftCluster,\n -rightCluster,\n ];\n if (selectedScore !== undefined) {\n const index = score.findIndex(\n (value, position) => value !== selectedScore![position],\n );\n if (index === -1 || !(score[index]! > selectedScore[index]!)) {\n continue;\n }\n }\n selected = [leftCluster, rightCluster];\n selectedScore = score;\n }\n }\n if (selected === undefined)\n return [...clusters.values()].filter((members) => members.size > 1);\n const [leftCluster, rightCluster] = selected;\n for (const member of clusters.get(rightCluster)!)\n clusters.get(leftCluster)!.add(member);\n clusters.delete(rightCluster);\n\n const leftSupport = support.get(leftCluster)!;\n leftSupport.delete(rightCluster);\n for (const [neighbor, rightWeight] of support.get(rightCluster)!) {\n if (neighbor === leftCluster || neighbor === rightCluster) continue;\n const weight = (leftSupport.get(neighbor) ?? 0) + rightWeight;\n leftSupport.set(neighbor, weight);\n support.get(neighbor)!.set(leftCluster, weight).delete(rightCluster);\n }\n support.delete(rightCluster);\n\n const mergedConflicts = conflicts.get(leftCluster) ?? new Set<number>();\n for (const id of conflicts.get(rightCluster) ?? []) mergedConflicts.add(id);\n mergedConflicts.delete(leftCluster);\n mergedConflicts.delete(rightCluster);\n for (const neighbor of mergedConflicts) {\n conflicts.get(neighbor)!.add(leftCluster).delete(rightCluster);\n }\n conflicts.set(leftCluster, mergedConflicts);\n conflicts.delete(rightCluster);\n }\n}\n\n/** @internal */\nexport class FindingDeduplicator<\n T extends Pick<Finding, \"findingId\" | \"severity\"> = Finding,\n> {\n constructor(\n private readonly candidates: {\n potentialDuplicates(findingId: string): Promise<FindingNeighborhood<T>>;\n },\n private readonly reviewer: DeduplicationReviewer<T>,\n private readonly signal?: AbortSignal,\n private readonly concurrency = DEFAULT_DEDUPE_CONCURRENCY,\n ) {}\n\n async run(findingIds: readonly string[]): Promise<DeduplicationResult> {\n this.signal?.throwIfAborted();\n const concurrency = deduplicationConcurrency(this.concurrency);\n const ids = [...new Set(findingIds)];\n const findings = new Map<string, T>();\n const refusals = new Map<string, DeduplicationRefusal>();\n const recordRefusal = (error: unknown, ids: string[]): void => {\n this.signal?.throwIfAborted();\n if (\n !(error instanceof DeduplicationReviewError) ||\n error.metadata.category !== \"refusal\"\n )\n throw error;\n const { stage, model, reason } = error.metadata;\n refusals.set(JSON.stringify([stage, ...ids]), {\n decision: \"NO_DECISION\",\n stage,\n model,\n findingIds: ids,\n reason,\n });\n };\n const neighborhoods = new Array<T[]>(ids.length);\n await runQueued(\n ids.map((id, index) => async () => {\n const result = await this.candidates.potentialDuplicates(id);\n this.signal?.throwIfAborted();\n neighborhoods[index] = [result.finding, ...result.potentialDuplicates];\n }),\n [],\n concurrency,\n this.signal,\n );\n const pairs = new Map<\n string,\n {\n ids: [string, string];\n remaining: number;\n rejected: boolean;\n decision?: \"SAME\" | \"DISTINCT\";\n }\n >();\n // Freeze records, insertion order, and the last nominating anchor's pair\n // orientation before reviews run, preserving grouping and checkpoint inputs.\n for (const neighborhood of neighborhoods) {\n this.signal?.throwIfAborted();\n for (const finding of neighborhood)\n findings.set(finding.findingId, finding);\n for (const neighbor of neighborhood.slice(1)) {\n const pair: [string, string] = [\n neighborhood[0]!.findingId,\n neighbor.findingId,\n ];\n const key = pairKey(pair);\n const state = pairs.get(key);\n if (state === undefined) {\n pairs.set(key, { ids: pair, remaining: 1, rejected: false });\n } else {\n state.ids = pair;\n state.remaining++;\n }\n }\n }\n\n const ready: Job[] = [];\n const pending = neighborhoods\n .filter((neighborhood) => neighborhood.length > 1)\n .map((neighborhood) => async () => {\n let screening: ScreeningResult | undefined;\n try {\n screening = await this.reviewer.screen(neighborhood);\n } catch (error) {\n recordRefusal(\n error,\n neighborhood.map((finding) => finding.findingId),\n );\n }\n this.signal?.throwIfAborted();\n for (let index = 0; index < neighborhood.length - 1; index++) {\n const key = pairKey([\n neighborhood[0]!.findingId,\n neighborhood[index + 1]!.findingId,\n ]);\n const state = pairs.get(key)!;\n if (\n screening === undefined ||\n screening.decisions[screeningPairSlot(index)]!.decision ===\n \"DISTINCT\"\n )\n state.rejected = true;\n state.remaining--;\n // Wait for every screening: a later DISTINCT verdict or refusal must\n // prevent verification, including a verification that could fail.\n if (state.remaining === 0 && !state.rejected) {\n ready.push(async () => {\n try {\n state.decision = (\n await this.reviewer.reviewPair(\n state.ids.map((id) => findings.get(id)!),\n )\n ).decision;\n } catch (error) {\n recordRefusal(error, state.ids);\n }\n });\n }\n }\n });\n await runQueued(pending, ready, concurrency, this.signal);\n\n // Completion order must not change grouping ties.\n const supported: [string, string][] = [];\n const rejected: [string, string][] = [];\n for (const state of pairs.values()) {\n this.signal?.throwIfAborted();\n if (state.decision === \"SAME\") supported.push(state.ids);\n else rejected.push(state.ids);\n }\n\n const { parents, root } = findingGroupRoots();\n for (const [left, right] of supported) parents.set(root(right), root(left));\n // Preserve finding insertion order for contradiction-grouping ties.\n const membersByRoot = Map.groupBy(findings.keys(), (id) => {\n this.signal?.throwIfAborted();\n return parents.has(id) ? root(id) : undefined;\n });\n membersByRoot.delete(undefined);\n const supportedByRoot = Map.groupBy(supported, ([left]) => root(left));\n const rejectedByRoot = Map.groupBy(\n rejected.filter(([left, right]) => root(left) === root(right)),\n ([left]) => root(left),\n );\n\n const selected = new Set(ids);\n const duplicateGroups: string[][] = [];\n const canonical = new Map<string, string>();\n for (const [componentRoot, members] of membersByRoot) {\n this.signal?.throwIfAborted();\n const conflicts = rejectedByRoot.get(componentRoot!);\n const groups =\n conflicts === undefined\n ? [new Set(members)]\n : contradictionFreeSubgroups(\n members,\n supportedByRoot.get(componentRoot!)!,\n conflicts,\n this.signal,\n );\n for (const group of groups) {\n const groupMembers = [...group];\n if (!groupMembers.some((member) => selected.has(member))) continue;\n groupMembers.sort(\n (left, right) =>\n SCAN_SEVERITIES.indexOf(findings.get(left)!.severity.level) -\n SCAN_SEVERITIES.indexOf(findings.get(right)!.severity.level) ||\n (left < right ? -1 : left > right ? 1 : 0),\n );\n duplicateGroups.push(groupMembers);\n for (const member of groupMembers)\n canonical.set(member, groupMembers[0]!);\n }\n }\n return {\n uniqueFindingIds: [...new Set(ids.map((id) => canonical.get(id) ?? id))],\n duplicateGroups,\n deduplicationStatus:\n refusals.size > 0 ? \"completed_with_refusals\" : \"completed\",\n ...(refusals.size > 0\n ? {\n refusals: [...refusals.entries()]\n .sort(([left], [right]) =>\n left < right ? -1 : left > right ? 1 : 0,\n )\n .map(([, refusal]) => refusal),\n }\n : {}),\n };\n }\n}\n"]}
|
|
@@ -1,4 +1,22 @@
|
|
|
1
1
|
import type { Finding } from "../models.js";
|
|
2
|
-
|
|
2
|
+
type FindingSchema = {
|
|
3
|
+
type: string;
|
|
4
|
+
properties: Record<string, object> & {
|
|
5
|
+
locations: object;
|
|
6
|
+
};
|
|
7
|
+
required: string[];
|
|
8
|
+
$defs: Record<string, object>;
|
|
9
|
+
};
|
|
10
|
+
declare const scannerFields: readonly ["ruleId", "identity", "taxonomy", "remediation"];
|
|
11
|
+
type ScannerField = (typeof scannerFields)[number];
|
|
12
|
+
export type ImportedFinding = Pick<Finding, "findingId" | "occurrenceId" | "fingerprints" | "title" | "summary" | "severity" | "confidence" | "provenance"> & Partial<Pick<Finding, ScannerField>> & {
|
|
13
|
+
locations: Finding["locations"][number][];
|
|
14
|
+
[extension: string]: unknown;
|
|
15
|
+
};
|
|
16
|
+
export declare function findingSchema(): FindingSchema;
|
|
3
17
|
export declare function requireFinding(value: unknown): Finding;
|
|
18
|
+
/** Imports retain their source evidence even when no scanner classified or located it. */
|
|
19
|
+
export declare function importedFindingSchema(): FindingSchema;
|
|
20
|
+
export declare function requireImportedFinding(value: unknown): ImportedFinding;
|
|
21
|
+
export {};
|
|
4
22
|
//# sourceMappingURL=finding-schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finding-schema.d.ts","sourceRoot":"","sources":["../../src/deduplication/finding-schema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"finding-schema.d.ts","sourceRoot":"","sources":["../../src/deduplication/finding-schema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF,QAAA,MAAM,aAAa,YACjB,QAAQ,EACR,UAAU,EACV,UAAU,EACV,aAAa,CACL,CAAC;AACX,KAAK,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AACnD,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,OAAO,EACL,WAAW,GACX,cAAc,GACd,cAAc,GACd,OAAO,GACP,SAAS,GACT,UAAU,GACV,YAAY,GACZ,YAAY,CACf,GACC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,GAAG;IACrC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAC1C,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;CAC9B,CAAC;AAMJ,wBAAgB,aAAa,IAAI,aAAa,CAe7C;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAStD;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,IAAI,aAAa,CAYrD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CAStE"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { readFileSync } from "node:fs";
|
|
2
2
|
import Ajv2020 from "ajv/dist/2020.js";
|
|
3
|
+
const scannerFields = [
|
|
4
|
+
"ruleId",
|
|
5
|
+
"identity",
|
|
6
|
+
"taxonomy",
|
|
7
|
+
"remediation",
|
|
8
|
+
];
|
|
3
9
|
let schema;
|
|
10
|
+
let importedValidator;
|
|
4
11
|
let validator;
|
|
5
12
|
export function findingSchema() {
|
|
6
13
|
if (schema)
|
|
@@ -17,4 +24,22 @@ export function requireFinding(value) {
|
|
|
17
24
|
throw new Error("Record must satisfy the Finding schema, including provenance.");
|
|
18
25
|
return value;
|
|
19
26
|
}
|
|
27
|
+
/** Imports retain their source evidence even when no scanner classified or located it. */
|
|
28
|
+
export function importedFindingSchema() {
|
|
29
|
+
const native = findingSchema();
|
|
30
|
+
return {
|
|
31
|
+
...native,
|
|
32
|
+
required: native.required.filter((name) => !scannerFields.some((field) => field === name)),
|
|
33
|
+
properties: {
|
|
34
|
+
...native.properties,
|
|
35
|
+
locations: { ...native.properties.locations, minItems: 0 },
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
export function requireImportedFinding(value) {
|
|
40
|
+
importedValidator ??= new Ajv2020({ strict: false }).compile(importedFindingSchema());
|
|
41
|
+
if (!importedValidator(value))
|
|
42
|
+
throw new Error("Record must satisfy the imported finding schema, including source provenance.");
|
|
43
|
+
return value;
|
|
44
|
+
}
|
|
20
45
|
//# sourceMappingURL=finding-schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finding-schema.js","sourceRoot":"","sources":["../../src/deduplication/finding-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,OAAkC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"finding-schema.js","sourceRoot":"","sources":["../../src/deduplication/finding-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,OAAkC,MAAM,kBAAkB,CAAC;AAUlE,MAAM,aAAa,GAAG;IACpB,QAAQ;IACR,UAAU;IACV,UAAU;IACV,aAAa;CACL,CAAC;AAkBX,IAAI,MAAiC,CAAC;AACtC,IAAI,iBAAgE,CAAC;AACrE,IAAI,SAAgD,CAAC;AAErD,MAAM,UAAU,aAAa;IAC3B,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,YAAY,CACV,IAAI,GAAG,CACL,oDAAoD,EACpD,OAAO,IAAI,CAAC,GAAG,CAChB,EACD,MAAM,CACP,CACF,CAAC;IACF,OAAO,CAAC,MAAM,GAAG;QACf,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK;QACrC,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,SAAS,KAAK,IAAI,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAClD,aAAa,EAAE,CAChB,CAAC;IACF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,qBAAqB;IACnC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAC9B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CACzD;QACD,UAAU,EAAE;YACV,GAAG,MAAM,CAAC,UAAU;YACpB,SAAS,EAAE,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE;SAC3D;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,iBAAiB,KAAK,IAAI,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAC1D,qBAAqB,EAAE,CACxB,CAAC;IACF,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { readFileSync } from \"node:fs\";\nimport Ajv2020, { type ValidateFunction } from \"ajv/dist/2020.js\";\nimport type { Finding } from \"../models.js\";\n\ntype FindingSchema = {\n type: string;\n properties: Record<string, object> & { locations: object };\n required: string[];\n $defs: Record<string, object>;\n};\n\nconst scannerFields = [\n \"ruleId\",\n \"identity\",\n \"taxonomy\",\n \"remediation\",\n] as const;\ntype ScannerField = (typeof scannerFields)[number];\nexport type ImportedFinding = Pick<\n Finding,\n | \"findingId\"\n | \"occurrenceId\"\n | \"fingerprints\"\n | \"title\"\n | \"summary\"\n | \"severity\"\n | \"confidence\"\n | \"provenance\"\n> &\n Partial<Pick<Finding, ScannerField>> & {\n locations: Finding[\"locations\"][number][];\n [extension: string]: unknown;\n };\n\nlet schema: FindingSchema | undefined;\nlet importedValidator: ValidateFunction<ImportedFinding> | undefined;\nlet validator: ValidateFunction<Finding> | undefined;\n\nexport function findingSchema(): FindingSchema {\n if (schema) return schema;\n const document = JSON.parse(\n readFileSync(\n new URL(\n \"../../_bundled_plugin/schemas/findings.schema.json\",\n import.meta.url,\n ),\n \"utf8\",\n ),\n );\n return (schema = {\n ...document.properties.findings.items,\n $defs: document.$defs,\n });\n}\n\nexport function requireFinding(value: unknown): Finding {\n validator ??= new Ajv2020({ strict: false }).compile<Finding>(\n findingSchema(),\n );\n if (!validator(value))\n throw new Error(\n \"Record must satisfy the Finding schema, including provenance.\",\n );\n return value;\n}\n\n/** Imports retain their source evidence even when no scanner classified or located it. */\nexport function importedFindingSchema(): FindingSchema {\n const native = findingSchema();\n return {\n ...native,\n required: native.required.filter(\n (name) => !scannerFields.some((field) => field === name),\n ),\n properties: {\n ...native.properties,\n locations: { ...native.properties.locations, minItems: 0 },\n },\n };\n}\n\nexport function requireImportedFinding(value: unknown): ImportedFinding {\n importedValidator ??= new Ajv2020({ strict: false }).compile<ImportedFinding>(\n importedFindingSchema(),\n );\n if (!importedValidator(value))\n throw new Error(\n \"Record must satisfy the imported finding schema, including source provenance.\",\n );\n return value;\n}\n"]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Finding } from "../models.js";
|
|
2
2
|
import type { FindingNeighborhood, FindingSearchScope } from "../finding-retrieval.js";
|
|
3
3
|
import { runWorkbench } from "../runtime.js";
|
|
4
|
-
import { type FindingEmbedder } from "../server/embeddings.js";
|
|
4
|
+
import { type FindingEmbedder, type EmbeddingUsageObserver } from "../server/embeddings.js";
|
|
5
5
|
/** One vector space and the adapter that produces its embeddings. */
|
|
6
6
|
export interface FindingEmbeddingBinding {
|
|
7
7
|
readonly embedder: FindingEmbedder;
|
|
@@ -21,7 +21,7 @@ export declare class LocalDeduplication {
|
|
|
21
21
|
private cacheKeys;
|
|
22
22
|
private readonly space;
|
|
23
23
|
private readonly embedding;
|
|
24
|
-
constructor(environment: NodeJS.ProcessEnv, scope: FindingSearchScope, repositoryPath: string, signal?: AbortSignal | undefined, workbench?: typeof runWorkbench, embedding?: FindingEmbeddingBinding);
|
|
24
|
+
constructor(environment: NodeJS.ProcessEnv, scope: FindingSearchScope, repositoryPath: string, signal?: AbortSignal | undefined, workbench?: typeof runWorkbench, embedding?: FindingEmbeddingBinding, onEmbeddingUsage?: EmbeddingUsageObserver);
|
|
25
25
|
get inputDigest(): string;
|
|
26
26
|
prepare(findings: readonly Finding[], repositoryId: string): Promise<void>;
|
|
27
27
|
potentialDuplicates(findingId: string): Promise<FindingNeighborhood>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../src/deduplication/local.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAGL,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAKL,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../src/deduplication/local.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAGL,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC5B,MAAM,yBAAyB,CAAC;AAMjC,qEAAqE;AACrE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,2FAA2F;IAC3F,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,2EAA2E;AAC3E,qBAAa,kBAAkB;IAO3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAV5B,OAAO,CAAC,OAAO,CAAC,CAAmD;IACnE,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD,YACmB,WAAW,EAAE,MAAM,CAAC,UAAU,EAC9B,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,WAAW,YAAA,EACpB,SAAS,GAAE,OAAO,YAA2B,EAC9D,SAAS,CAAC,EAAE,uBAAuB,EACnC,gBAAgB,CAAC,EAAE,sBAAsB,EA2B1C;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAEK,OAAO,CACX,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAqCf;IAEK,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAMzE;IAEK,iBAAiB,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAElE;YAEa,OAAO;CAoDtB"}
|
|
@@ -2,7 +2,7 @@ import { environmentEntry } from "../auth.js";
|
|
|
2
2
|
import { abortable, gitProtectionRoots } from "../targets.js";
|
|
3
3
|
import { CodexSecurityError } from "../errors.js";
|
|
4
4
|
import { workflowDigest } from "../finding-workflow.js";
|
|
5
|
-
import {
|
|
5
|
+
import { bundledPluginRoot, workbenchEnvironment, runWorkbench, } from "../runtime.js";
|
|
6
6
|
import { OpenAiFindingEmbedder, EMBEDDING_MODEL, EMBEDDING_DIMENSIONS, EMBEDDINGS_URL, } from "../server/embeddings.js";
|
|
7
7
|
import { retryDelay, waitForRetry } from "./retry.js";
|
|
8
8
|
// Checkpoint bounded batches so a retry keeps completed work without one process per finding.
|
|
@@ -18,7 +18,7 @@ export class LocalDeduplication {
|
|
|
18
18
|
cacheKeys = {};
|
|
19
19
|
space;
|
|
20
20
|
embedding;
|
|
21
|
-
constructor(environment, scope, repositoryPath, signal, workbench = runWorkbench, embedding) {
|
|
21
|
+
constructor(environment, scope, repositoryPath, signal, workbench = runWorkbench, embedding, onEmbeddingUsage) {
|
|
22
22
|
this.environment = environment;
|
|
23
23
|
this.scope = scope;
|
|
24
24
|
this.repositoryPath = repositoryPath;
|
|
@@ -33,7 +33,7 @@ export class LocalDeduplication {
|
|
|
33
33
|
embedder: new OpenAiFindingEmbedder([
|
|
34
34
|
environmentEntry(environment, "OPENAI_API_KEY"),
|
|
35
35
|
environmentEntry(environment, "CODEX_API_KEY"),
|
|
36
|
-
].find((value) => value?.trim()), embeddingRequest, endpoint, signal),
|
|
36
|
+
].find((value) => value?.trim()), embeddingRequest, endpoint, signal, onEmbeddingUsage),
|
|
37
37
|
};
|
|
38
38
|
// The digest keeps endpoint/namespace details out of persisted cache keys.
|
|
39
39
|
this.space = workflowDigest({
|
|
@@ -89,14 +89,9 @@ export class LocalDeduplication {
|
|
|
89
89
|
this.signal?.throwIfAborted();
|
|
90
90
|
this.options ??= (async () => {
|
|
91
91
|
const environment = workbenchEnvironment(this.environment);
|
|
92
|
-
const [python, pluginRoot] = await resolveWorkbenchRuntime({
|
|
93
|
-
environment,
|
|
94
|
-
protectedRoot: this.repositoryPath,
|
|
95
|
-
signal: this.signal,
|
|
96
|
-
});
|
|
97
92
|
return {
|
|
98
|
-
|
|
99
|
-
|
|
93
|
+
pluginRoot: await bundledPluginRoot(),
|
|
94
|
+
stateDirectory: environment.CODEX_SECURITY_STATE_DIR,
|
|
100
95
|
environment,
|
|
101
96
|
signal: this.signal,
|
|
102
97
|
protectedRoot: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/deduplication/local.ts"],"names":[],"mappings":"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","sourcesContent":["import { environmentEntry } from \"../auth.js\";\nimport { abortable, gitProtectionRoots } from \"../targets.js\";\nimport type { Finding } from \"../models.js\";\nimport type {\n FindingNeighborhood,\n FindingSearchScope,\n} from \"../finding-retrieval.js\";\nimport { CodexSecurityError } from \"../errors.js\";\nimport { workflowDigest } from \"../finding-workflow.js\";\nimport {\n resolveWorkbenchRuntime,\n workbenchEnvironment,\n runWorkbench,\n type WorkbenchCommandOptions,\n} from \"../runtime.js\";\nimport {\n OpenAiFindingEmbedder,\n EMBEDDING_MODEL,\n EMBEDDING_DIMENSIONS,\n EMBEDDINGS_URL,\n type FindingEmbedder,\n} from \"../server/embeddings.js\";\nimport { retryDelay, waitForRetry } from \"./retry.js\";\n\n// Checkpoint bounded batches so a retry keeps completed work without one process per finding.\nconst EMBEDDING_BATCH_SIZE = 64;\n\n/** One vector space and the adapter that produces its embeddings. */\nexport interface FindingEmbeddingBinding {\n readonly embedder: FindingEmbedder;\n readonly model: string;\n readonly dimensions: number;\n /** Identifies the provider/vector space and preprocessing version; exclude credentials. */\n readonly cacheNamespace: string;\n}\n\n/** Direct workbench adapter. Importing it starts no HTTP or MCP server. */\nexport class LocalDeduplication {\n private options?: Promise<WorkbenchCommandOptions>;\n private cacheKeys: Record<string, string> = {};\n private readonly space: string;\n private readonly embedding: FindingEmbeddingBinding;\n\n constructor(\n private readonly environment: NodeJS.ProcessEnv,\n private readonly scope: FindingSearchScope,\n private readonly repositoryPath: string,\n private readonly signal?: AbortSignal,\n private readonly workbench: typeof runWorkbench = runWorkbench,\n embedding?: FindingEmbeddingBinding,\n ) {\n const endpoint =\n environmentEntry(environment, \"CODEX_SECURITY_EMBEDDINGS_URL\") ||\n EMBEDDINGS_URL;\n this.embedding = embedding ?? {\n model: EMBEDDING_MODEL,\n dimensions: EMBEDDING_DIMENSIONS,\n cacheNamespace: endpoint,\n embedder: new OpenAiFindingEmbedder(\n [\n environmentEntry(environment, \"OPENAI_API_KEY\"),\n environmentEntry(environment, \"CODEX_API_KEY\"),\n ].find((value) => value?.trim()),\n embeddingRequest,\n endpoint,\n signal,\n ),\n };\n // The digest keeps endpoint/namespace details out of persisted cache keys.\n this.space = workflowDigest({\n version: 1,\n model: this.embedding.model,\n dimensions: this.embedding.dimensions,\n namespace: this.embedding.cacheNamespace,\n });\n }\n\n get inputDigest(): string {\n return workflowDigest(this.cacheKeys);\n }\n\n async prepare(\n findings: readonly Finding[],\n repositoryId: string,\n ): Promise<void> {\n const result = await this.command({\n action: \"prepare\",\n findings,\n anchorRepositoryId: repositoryId,\n repositoryPath: this.repositoryPath,\n });\n this.cacheKeys = result[\"cacheKeys\"] as Record<string, string>;\n const findingsToEmbed = result[\"findingsToEmbed\"] as unknown as Finding[];\n for (\n let offset = 0;\n offset < findingsToEmbed.length;\n offset += EMBEDDING_BATCH_SIZE\n ) {\n this.signal?.throwIfAborted();\n const batch = findingsToEmbed.slice(\n offset,\n offset + EMBEDDING_BATCH_SIZE,\n );\n const embeddings = await abortable(() => {\n this.signal?.throwIfAborted();\n return this.embedding.embedder.embed(batch);\n }, this.signal);\n this.signal?.throwIfAborted();\n if (embeddings.length !== batch.length)\n throw new CodexSecurityError(\n \"Embedding provider returned an invalid number of vectors.\",\n );\n await this.command({\n action: \"embed\",\n entries: batch.map((finding, index) => ({\n findingId: finding.findingId,\n cacheKey: this.cacheKeys[finding.findingId],\n embedding: embeddings[index],\n })),\n });\n }\n }\n\n async potentialDuplicates(findingId: string): Promise<FindingNeighborhood> {\n return (await this.command({\n action: \"neighbors\",\n findingId,\n cacheKeys: this.cacheKeys,\n })) as unknown as FindingNeighborhood;\n }\n\n async storeDedupeGroups(groups: readonly string[][]): Promise<void> {\n await this.command({ action: \"commit\", groups, cacheKeys: this.cacheKeys });\n }\n\n private async command(payload: { action: string; [key: string]: unknown }) {\n this.signal?.throwIfAborted();\n this.options ??= (async () => {\n const environment = workbenchEnvironment(this.environment);\n const [python, pluginRoot] = await resolveWorkbenchRuntime({\n environment,\n protectedRoot: this.repositoryPath,\n signal: this.signal,\n });\n return {\n python,\n pluginRoot,\n environment,\n signal: this.signal,\n protectedRoot: [\n this.repositoryPath,\n ...(await gitProtectionRoots(this.repositoryPath, this.signal)),\n ...(await gitProtectionRoots(process.cwd(), this.signal)),\n ],\n failureMessage: \"Could not access local deduplication state\",\n };\n })();\n const result = await this.workbench(\n await this.options,\n [\n payload.action === \"neighbors\"\n ? \"find-potential-duplicates\"\n : payload.action === \"commit\"\n ? \"store-dedupe-groups\"\n : \"local-dedupe\",\n ],\n JSON.stringify({\n ...payload,\n scope: this.scope,\n space: this.space,\n model: this.embedding.model,\n dimensions: this.embedding.dimensions,\n ...(this.scope.allRepositories\n ? {}\n : { repositoryId: this.scope.repositoryId }),\n }),\n );\n this.signal?.throwIfAborted();\n const code = result[\"error\"];\n if (code !== undefined) {\n const message =\n code === \"finding_changed\"\n ? \"Findings changed during local deduplication. Retry with a new workflow ID if resuming.\"\n : code === \"target_mismatch\"\n ? \"The scan target does not match the approved local checkout. Use its original checkout or an explicitly configured findings service.\"\n : code === \"finding_not_indexed\"\n ? \"A local finding has no complete document. Reimport its scan before deduplicating.\"\n : `Local deduplication failed: ${String(code)}.`;\n throw new CodexSecurityError(message);\n }\n return result;\n }\n}\n\nasync function embeddingRequest(\n url: string,\n init: RequestInit,\n): Promise<Response> {\n for (let attempt = 1; ; attempt++) {\n init.signal?.throwIfAborted();\n let delay = retryDelay(attempt);\n try {\n const response = await fetch(url, init);\n if (\n attempt === 3 ||\n ![408, 429, 500, 502, 503, 504].includes(response.status)\n )\n return response;\n const retryAfter = response.headers.get(\"Retry-After\");\n if (retryAfter !== null) {\n const seconds = Number(retryAfter);\n const retryAt = Number.isFinite(seconds)\n ? seconds * 1000\n : Date.parse(retryAfter) - Date.now();\n if (Number.isFinite(retryAt)) delay = Math.max(delay, retryAt);\n }\n await response.body?.cancel().catch(() => undefined);\n } catch (error) {\n init.signal?.throwIfAborted();\n if (attempt === 3 || !(error instanceof TypeError)) throw error;\n }\n await waitForRetry(delay, init.signal ?? undefined);\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/deduplication/local.ts"],"names":[],"mappings":"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","sourcesContent":["import { environmentEntry } from \"../auth.js\";\nimport { abortable, gitProtectionRoots } from \"../targets.js\";\nimport type { Finding } from \"../models.js\";\nimport type {\n FindingNeighborhood,\n FindingSearchScope,\n} from \"../finding-retrieval.js\";\nimport { CodexSecurityError } from \"../errors.js\";\nimport { workflowDigest } from \"../finding-workflow.js\";\nimport {\n bundledPluginRoot,\n workbenchEnvironment,\n runWorkbench,\n type WorkbenchCommandOptions,\n} from \"../runtime.js\";\nimport {\n OpenAiFindingEmbedder,\n EMBEDDING_MODEL,\n EMBEDDING_DIMENSIONS,\n EMBEDDINGS_URL,\n type FindingEmbedder,\n type EmbeddingUsageObserver,\n} from \"../server/embeddings.js\";\nimport { retryDelay, waitForRetry } from \"./retry.js\";\n\n// Checkpoint bounded batches so a retry keeps completed work without one process per finding.\nconst EMBEDDING_BATCH_SIZE = 64;\n\n/** One vector space and the adapter that produces its embeddings. */\nexport interface FindingEmbeddingBinding {\n readonly embedder: FindingEmbedder;\n readonly model: string;\n readonly dimensions: number;\n /** Identifies the provider/vector space and preprocessing version; exclude credentials. */\n readonly cacheNamespace: string;\n}\n\n/** Direct workbench adapter. Importing it starts no HTTP or MCP server. */\nexport class LocalDeduplication {\n private options?: Promise<Omit<WorkbenchCommandOptions, \"python\">>;\n private cacheKeys: Record<string, string> = {};\n private readonly space: string;\n private readonly embedding: FindingEmbeddingBinding;\n\n constructor(\n private readonly environment: NodeJS.ProcessEnv,\n private readonly scope: FindingSearchScope,\n private readonly repositoryPath: string,\n private readonly signal?: AbortSignal,\n private readonly workbench: typeof runWorkbench = runWorkbench,\n embedding?: FindingEmbeddingBinding,\n onEmbeddingUsage?: EmbeddingUsageObserver,\n ) {\n const endpoint =\n environmentEntry(environment, \"CODEX_SECURITY_EMBEDDINGS_URL\") ||\n EMBEDDINGS_URL;\n this.embedding = embedding ?? {\n model: EMBEDDING_MODEL,\n dimensions: EMBEDDING_DIMENSIONS,\n cacheNamespace: endpoint,\n embedder: new OpenAiFindingEmbedder(\n [\n environmentEntry(environment, \"OPENAI_API_KEY\"),\n environmentEntry(environment, \"CODEX_API_KEY\"),\n ].find((value) => value?.trim()),\n embeddingRequest,\n endpoint,\n signal,\n onEmbeddingUsage,\n ),\n };\n // The digest keeps endpoint/namespace details out of persisted cache keys.\n this.space = workflowDigest({\n version: 1,\n model: this.embedding.model,\n dimensions: this.embedding.dimensions,\n namespace: this.embedding.cacheNamespace,\n });\n }\n\n get inputDigest(): string {\n return workflowDigest(this.cacheKeys);\n }\n\n async prepare(\n findings: readonly Finding[],\n repositoryId: string,\n ): Promise<void> {\n const result = await this.command({\n action: \"prepare\",\n findings,\n anchorRepositoryId: repositoryId,\n repositoryPath: this.repositoryPath,\n });\n this.cacheKeys = result[\"cacheKeys\"] as Record<string, string>;\n const findingsToEmbed = result[\"findingsToEmbed\"] as unknown as Finding[];\n for (\n let offset = 0;\n offset < findingsToEmbed.length;\n offset += EMBEDDING_BATCH_SIZE\n ) {\n this.signal?.throwIfAborted();\n const batch = findingsToEmbed.slice(\n offset,\n offset + EMBEDDING_BATCH_SIZE,\n );\n const embeddings = await abortable(() => {\n this.signal?.throwIfAborted();\n return this.embedding.embedder.embed(batch);\n }, this.signal);\n this.signal?.throwIfAborted();\n if (embeddings.length !== batch.length)\n throw new CodexSecurityError(\n \"Embedding provider returned an invalid number of vectors.\",\n );\n await this.command({\n action: \"embed\",\n entries: batch.map((finding, index) => ({\n findingId: finding.findingId,\n cacheKey: this.cacheKeys[finding.findingId],\n embedding: embeddings[index],\n })),\n });\n }\n }\n\n async potentialDuplicates(findingId: string): Promise<FindingNeighborhood> {\n return (await this.command({\n action: \"neighbors\",\n findingId,\n cacheKeys: this.cacheKeys,\n })) as unknown as FindingNeighborhood;\n }\n\n async storeDedupeGroups(groups: readonly string[][]): Promise<void> {\n await this.command({ action: \"commit\", groups, cacheKeys: this.cacheKeys });\n }\n\n private async command(payload: { action: string; [key: string]: unknown }) {\n this.signal?.throwIfAborted();\n this.options ??= (async () => {\n const environment = workbenchEnvironment(this.environment);\n return {\n pluginRoot: await bundledPluginRoot(),\n stateDirectory: environment.CODEX_SECURITY_STATE_DIR,\n environment,\n signal: this.signal,\n protectedRoot: [\n this.repositoryPath,\n ...(await gitProtectionRoots(this.repositoryPath, this.signal)),\n ...(await gitProtectionRoots(process.cwd(), this.signal)),\n ],\n failureMessage: \"Could not access local deduplication state\",\n };\n })();\n const result = await this.workbench(\n await this.options,\n [\n payload.action === \"neighbors\"\n ? \"find-potential-duplicates\"\n : payload.action === \"commit\"\n ? \"store-dedupe-groups\"\n : \"local-dedupe\",\n ],\n JSON.stringify({\n ...payload,\n scope: this.scope,\n space: this.space,\n model: this.embedding.model,\n dimensions: this.embedding.dimensions,\n ...(this.scope.allRepositories\n ? {}\n : { repositoryId: this.scope.repositoryId }),\n }),\n );\n this.signal?.throwIfAborted();\n const code = result[\"error\"];\n if (code !== undefined) {\n const message =\n code === \"finding_changed\"\n ? \"Findings changed during local deduplication. Retry with a new workflow ID if resuming.\"\n : code === \"target_mismatch\"\n ? \"The scan target does not match the approved local checkout. Use its original checkout or an explicitly configured findings service.\"\n : code === \"finding_not_indexed\"\n ? \"A local finding has no complete document. Reimport its scan before deduplicating.\"\n : `Local deduplication failed: ${String(code)}.`;\n throw new CodexSecurityError(message);\n }\n return result;\n }\n}\n\nasync function embeddingRequest(\n url: string,\n init: RequestInit,\n): Promise<Response> {\n for (let attempt = 1; ; attempt++) {\n init.signal?.throwIfAborted();\n let delay = retryDelay(attempt);\n try {\n const response = await fetch(url, init);\n if (\n attempt === 3 ||\n ![408, 429, 500, 502, 503, 504].includes(response.status)\n )\n return response;\n const retryAfter = response.headers.get(\"Retry-After\");\n if (retryAfter !== null) {\n const seconds = Number(retryAfter);\n const retryAt = Number.isFinite(seconds)\n ? seconds * 1000\n : Date.parse(retryAfter) - Date.now();\n if (Number.isFinite(retryAt)) delay = Math.max(delay, retryAt);\n }\n await response.body?.cancel().catch(() => undefined);\n } catch (error) {\n init.signal?.throwIfAborted();\n if (attempt === 3 || !(error instanceof TypeError)) throw error;\n }\n await waitForRetry(delay, init.signal ?? undefined);\n }\n}\n"]}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
+
import { type ImportedFinding } from "./finding-schema.js";
|
|
2
3
|
import type { DeduplicationReviewAttribution, DeduplicationReviewRequest, DeduplicationReviewRunner } from "./review.js";
|
|
3
4
|
export declare function recordsReviewAttribution(findingIds: readonly string[] | undefined, references: ReadonlyMap<string, string>, anchors: ReadonlyMap<string, readonly string[]>): DeduplicationReviewAttribution;
|
|
4
5
|
declare const deduplicateRecordsInputSchema: z.ZodObject<{
|
|
5
6
|
version: z.ZodLiteral<1>;
|
|
6
|
-
observations: z.ZodArray<z.ZodObject<{
|
|
7
|
+
observations: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
7
8
|
id: z.ZodString;
|
|
9
|
+
kind: z.ZodOptional<z.ZodUndefined>;
|
|
8
10
|
finding: z.ZodPipe<z.ZodUnknown, z.ZodTransform<{
|
|
9
11
|
[k: string]: unknown;
|
|
10
12
|
findingId: string;
|
|
@@ -178,7 +180,11 @@ declare const deduplicateRecordsInputSchema: z.ZodObject<{
|
|
|
178
180
|
[k: string]: unknown;
|
|
179
181
|
};
|
|
180
182
|
}, unknown>>;
|
|
181
|
-
}, z.core.$strict
|
|
183
|
+
}, z.core.$strict>, z.ZodObject<{
|
|
184
|
+
id: z.ZodString;
|
|
185
|
+
kind: z.ZodLiteral<"imported">;
|
|
186
|
+
finding: z.ZodPipe<z.ZodUnknown, z.ZodTransform<ImportedFinding, unknown>>;
|
|
187
|
+
}, z.core.$strict>], "kind">>;
|
|
182
188
|
candidateRelationships: z.ZodArray<z.ZodObject<{
|
|
183
189
|
observationId: z.ZodString;
|
|
184
190
|
candidateObservationIds: z.ZodArray<z.ZodString>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../src/deduplication/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../src/deduplication/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,KAAK,EACV,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACzC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,GAC9C,8BAA8B,CAqBhC;AAkCD,QAAA,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBASjC,CAAC;AAEH,MAAM,WAAW,uBAAwB,SAAQ,CAAC,CAAC,KAAK,CACtD,OAAO,6BAA6B,CACrC;CAAG;AACJ,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,yBAAyB,CAAC;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AACD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;IACnC,MAAM,EAAE;QACN,2BAA2B,EAAE,MAAM,CAAC;QACpC,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,EAAE,CAAC;IACJ,UAAU,EAAE;QACV,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,eAAe,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;CACL;AAED,kFAAkF;AAClF,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,wBAAwB,CAAC,CAMnC;AAED,sFAAsF;AACtF,wBAAsB,UAAU,CAC9B,KAAK,EAAE,uBAAuB,EAC9B,SAAS,EAAE,CACT,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,KAC/B,OAAO,CAAC,OAAO,CAAC,EACrB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,wBAAwB,CAAC,CA0InC"}
|