@openai/codex-security 0.9.1 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -788
- package/_bundled_plugin/.codex-plugin/plugin.json +2 -0
- package/_bundled_plugin/.mcp.json +2 -0
- package/_bundled_plugin/mcp/helpers.mjs.br +0 -0
- 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/server.mjs.br +0 -0
- package/_bundled_plugin/references/artifact-storage.md +1 -1
- package/_bundled_plugin/references/baseline-auditor.md +18 -0
- package/_bundled_plugin/references/core-scan.md +5 -42
- package/_bundled_plugin/references/final-report.md +1 -1
- package/_bundled_plugin/references/focused-investigator.md +13 -0
- package/_bundled_plugin/references/scan-prologue.md +2 -2
- package/_bundled_plugin/references/scan-runtime.md +4 -2
- package/_bundled_plugin/references/security-guidance.md +14 -1
- package/_bundled_plugin/references/validate-scan-findings.md +3 -0
- package/_bundled_plugin/scripts/deep_scan_workbench.py +29 -12
- package/_bundled_plugin/scripts/dispatch_inventory_tool +7 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +29 -3
- package/_bundled_plugin/scripts/launch_codex_security_mcp +54 -16
- package/_bundled_plugin/scripts/posix_scan_local_files.py +26 -1
- package/_bundled_plugin/scripts/snapshot_sqlite.py +8 -2
- package/_bundled_plugin/scripts/windows_scan_local_files.py +216 -25
- package/_bundled_plugin/scripts/workbench/handoff.py +55 -25
- package/_bundled_plugin/scripts/workbench/storage.py +25 -5
- package/_bundled_plugin/scripts/workbench_cli.py +24 -2
- package/_bundled_plugin/scripts/workbench_constants.py +2 -0
- package/_bundled_plugin/scripts/workbench_db.py +244 -217
- package/_bundled_plugin/scripts/workbench_feedback.py +49 -4
- package/_bundled_plugin/scripts/workbench_native_indexes.py +226 -29
- package/_bundled_plugin/scripts/workbench_progress.py +159 -3
- package/_bundled_plugin/scripts/workbench_publication.py +2 -3
- package/_bundled_plugin/scripts/workbench_remediation.py +142 -2
- package/_bundled_plugin/scripts/workbench_saved_results.py +48 -8
- package/_bundled_plugin/scripts/workbench_scan_history.py +281 -119
- package/_bundled_plugin/scripts/workbench_scan_start.py +143 -9
- package/_bundled_plugin/scripts/workbench_scan_usage.py +36 -10
- package/_bundled_plugin/scripts/workbench_schema.py +220 -14
- package/_bundled_plugin/scripts/workbench_setup.py +1 -1
- package/_bundled_plugin/scripts/workbench_target.py +471 -84
- package/_bundled_plugin/scripts/workbench_target_state.py +1108 -22
- package/_bundled_plugin/shared/workbench-history-repairs.json +60 -14
- package/_bundled_plugin/shared/workbench-migrations.json +66 -0
- package/_bundled_plugin/skills/fix-finding/SKILL.md +1 -0
- package/_bundled_plugin/skills/publish-findings/SKILL.md +24 -160
- package/_bundled_plugin/skills/publish-findings/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/publish-findings/references/checkmarx-import.md +2 -2
- package/_bundled_plugin/skills/publish-findings/scripts/collect_checkmarx.py +3 -58
- package/_bundled_plugin/skills/publish-findings/scripts/collect_continuum.py +224 -0
- package/_bundled_plugin/skills/publish-findings/scripts/collector_paths.py +63 -0
- package/_bundled_plugin/skills/security-scan/SKILL.md +9 -46
- package/_bundled_plugin/skills/security-scan/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/security-scan/references/desktop-scan.md +3 -21
- package/_bundled_plugin/skills/security-scan/references/managed-scan.md +11 -0
- package/_bundled_plugin/skills/security-scan/references/scan-results.md +15 -0
- package/_bundled_plugin/skills/security-scan/references/scoped-paths.md +23 -0
- package/_bundled_plugin/skills/security-scan/references/sdk-files.md +24 -0
- package/bin/codex-security.mjs +2 -2
- package/dist/api.d.ts +6 -1
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +437 -154
- package/dist/api.js.map +1 -1
- package/dist/armorcode-findings.d.ts +9 -0
- package/dist/armorcode-findings.d.ts.map +1 -0
- package/dist/armorcode-findings.js +145 -0
- package/dist/armorcode-findings.js.map +1 -0
- package/dist/artifact-export.d.ts +2 -0
- package/dist/artifact-export.d.ts.map +1 -1
- package/dist/artifact-export.js +29 -13
- package/dist/artifact-export.js.map +1 -1
- package/dist/auth.d.ts +6 -2
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +33 -12
- package/dist/auth.js.map +1 -1
- package/dist/batch-cost.d.ts +18 -0
- package/dist/batch-cost.d.ts.map +1 -0
- package/dist/batch-cost.js +41 -0
- package/dist/batch-cost.js.map +1 -0
- package/dist/blackduck-findings.d.ts +1 -1
- package/dist/blackduck-findings.d.ts.map +1 -1
- package/dist/blackduck-findings.js +5 -18
- package/dist/blackduck-findings.js.map +1 -1
- package/dist/bundled-plugin.d.ts +4 -0
- package/dist/bundled-plugin.d.ts.map +1 -0
- package/dist/bundled-plugin.js +23 -0
- package/dist/bundled-plugin.js.map +1 -0
- package/dist/classify-scan-severity.d.ts +1 -1
- package/dist/classify-scan-severity.d.ts.map +1 -1
- package/dist/classify-scan-severity.js +11 -3
- package/dist/classify-scan-severity.js.map +1 -1
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +9 -6
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli-argument.d.ts +4 -0
- package/dist/cli-argument.d.ts.map +1 -0
- package/dist/cli-argument.js +17 -0
- package/dist/cli-argument.js.map +1 -0
- package/dist/cli-help.d.ts +1 -1
- package/dist/cli-help.d.ts.map +1 -1
- package/dist/cli-help.js +71 -29
- package/dist/cli-help.js.map +1 -1
- package/dist/cli-hook.d.ts +3 -0
- package/dist/cli-hook.d.ts.map +1 -0
- package/dist/cli-hook.js +87 -0
- package/dist/cli-hook.js.map +1 -0
- package/dist/cli-integrations.d.ts +13 -0
- package/dist/cli-integrations.d.ts.map +1 -0
- package/dist/cli-integrations.js +333 -0
- package/dist/cli-integrations.js.map +1 -0
- package/dist/cli-mcp.d.ts +15 -0
- package/dist/cli-mcp.d.ts.map +1 -0
- package/dist/cli-mcp.js +178 -0
- package/dist/cli-mcp.js.map +1 -0
- package/dist/cli-token-view.d.ts +10 -0
- package/dist/cli-token-view.d.ts.map +1 -0
- package/dist/cli-token-view.js +41 -0
- package/dist/cli-token-view.js.map +1 -0
- package/dist/cli.d.ts +5 -3
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1763 -894
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.d.ts.map +1 -1
- package/dist/cloud-publish.js +33 -31
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codex-sdk-environment.d.ts +6 -0
- package/dist/codex-sdk-environment.d.ts.map +1 -1
- package/dist/codex-sdk-environment.js +19 -0
- package/dist/codex-sdk-environment.js.map +1 -1
- package/dist/command-words.d.ts +3 -0
- package/dist/command-words.d.ts.map +1 -0
- package/dist/command-words.js +46 -0
- package/dist/command-words.js.map +1 -0
- package/dist/component-scan.d.ts +3 -1
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +40 -7
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +30 -1
- package/dist/config.js.map +1 -1
- package/dist/continuum-findings.d.ts +1 -1
- package/dist/continuum-findings.d.ts.map +1 -1
- package/dist/continuum-findings.js +93 -31
- package/dist/continuum-findings.js.map +1 -1
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +1 -45
- package/dist/cost.js.map +1 -1
- package/dist/custom-validation-prompt.d.ts +1 -1
- package/dist/custom-validation-prompt.d.ts.map +1 -1
- package/dist/custom-validation-prompt.js +29 -19
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/deduplication/local.d.ts +3 -1
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +8 -1
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/refusal.d.ts.map +1 -1
- package/dist/deduplication/refusal.js +2 -1
- package/dist/deduplication/refusal.js.map +1 -1
- package/dist/deduplication/scan.d.ts +2 -0
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +24 -7
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +16 -15
- package/dist/deep-scan.js.map +1 -1
- package/dist/endor-findings.d.ts +2 -2
- package/dist/endor-findings.d.ts.map +1 -1
- package/dist/endor-findings.js +6 -23
- package/dist/endor-findings.js.map +1 -1
- package/dist/errors.d.ts +3 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +7 -3
- package/dist/errors.js.map +1 -1
- package/dist/executable-path.d.ts +3 -0
- package/dist/executable-path.d.ts.map +1 -1
- package/dist/executable-path.js +26 -0
- package/dist/executable-path.js.map +1 -1
- package/dist/external-findings-import.d.ts.map +1 -1
- package/dist/external-findings-import.js +12 -1
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +66 -4
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +234 -53
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +6 -1
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +326 -1633
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +1 -0
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +31 -51
- package/dist/external-findings-read.js.map +1 -1
- package/dist/external-findings.d.ts +1 -1
- package/dist/external-findings.d.ts.map +1 -1
- package/dist/external-findings.js +12 -1
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-contract.d.ts +3 -11
- package/dist/external-import-contract.d.ts.map +1 -1
- package/dist/external-import-contract.js +29 -176
- 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/finding-prompt.d.ts.map +1 -1
- package/dist/finding-prompt.js +2 -2
- package/dist/finding-prompt.js.map +1 -1
- package/dist/github-dependabot-findings.d.ts.map +1 -1
- package/dist/github-dependabot-findings.js +3 -4
- package/dist/github-dependabot-findings.js.map +1 -1
- package/dist/github-findings.d.ts.map +1 -1
- package/dist/github-findings.js +19 -287
- package/dist/github-findings.js.map +1 -1
- package/dist/hosted-remediation.d.ts +1 -0
- package/dist/hosted-remediation.d.ts.map +1 -1
- package/dist/hosted-remediation.js +23 -3
- package/dist/hosted-remediation.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts.map +1 -1
- package/dist/inspector-findings.js +19 -35
- package/dist/inspector-findings.js.map +1 -1
- package/dist/knowledge-base.d.ts +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +34 -27
- package/dist/knowledge-base.js.map +1 -1
- package/dist/linear.d.ts +11 -0
- package/dist/linear.d.ts.map +1 -1
- package/dist/linear.js.map +1 -1
- package/dist/local-git-metadata.d.ts +5 -2
- package/dist/local-git-metadata.d.ts.map +1 -1
- package/dist/local-git-metadata.js +8 -4
- package/dist/local-git-metadata.js.map +1 -1
- package/dist/multiscan.d.ts +4 -0
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +79 -37
- package/dist/multiscan.js.map +1 -1
- package/dist/opengrep-findings.d.ts +4 -2
- package/dist/opengrep-findings.d.ts.map +1 -1
- package/dist/opengrep-findings.js +39 -22
- package/dist/opengrep-findings.js.map +1 -1
- package/dist/private-finding-import.d.ts +8 -13
- package/dist/private-finding-import.d.ts.map +1 -1
- package/dist/private-finding-import.js +69 -129
- package/dist/private-finding-import.js.map +1 -1
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +53 -13
- package/dist/project-config.js.map +1 -1
- package/dist/prompt-files.d.ts +7 -2
- package/dist/prompt-files.d.ts.map +1 -1
- package/dist/prompt-files.js +42 -20
- package/dist/prompt-files.js.map +1 -1
- package/dist/provider-profile.d.ts.map +1 -1
- package/dist/provider-profile.js +4 -9
- package/dist/provider-profile.js.map +1 -1
- package/dist/publication.d.ts +1 -1
- package/dist/publication.d.ts.map +1 -1
- package/dist/publication.js.map +1 -1
- package/dist/record.d.ts +1 -5
- package/dist/record.d.ts.map +1 -1
- package/dist/record.js +3 -51
- package/dist/record.js.map +1 -1
- package/dist/remediation.d.ts.map +1 -1
- package/dist/remediation.js +3 -1
- package/dist/remediation.js.map +1 -1
- package/dist/runtime.d.ts +35 -7
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +778 -153
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +6 -1
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +267 -115
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-archive-path.d.ts +2 -0
- package/dist/scan-archive-path.d.ts.map +1 -0
- package/dist/scan-archive-path.js +5 -0
- package/dist/scan-archive-path.js.map +1 -0
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +6 -2
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +1 -0
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +18 -2
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts.map +1 -1
- package/dist/scan-executor.js +4 -2
- package/dist/scan-executor.js.map +1 -1
- package/dist/scan-history-renderer.d.ts +1 -0
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +25 -9
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +28 -4
- package/dist/scan-logs.js.map +1 -1
- package/dist/scanner-import.d.ts +5 -11
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +16 -89
- package/dist/scanner-import.js.map +1 -1
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js +26 -6
- package/dist/security-policy.js.map +1 -1
- package/dist/semgrep-findings.d.ts.map +1 -1
- package/dist/semgrep-findings.js +14 -48
- package/dist/semgrep-findings.js.map +1 -1
- package/dist/semgrep-platform-findings.d.ts +20 -70
- package/dist/semgrep-platform-findings.d.ts.map +1 -1
- package/dist/semgrep-platform-findings.js +116 -333
- package/dist/semgrep-platform-findings.js.map +1 -1
- package/dist/snyk-findings.d.ts +2 -0
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +5 -8
- package/dist/snyk-findings.js.map +1 -1
- package/dist/snyk-rest-findings.d.ts +3 -20
- package/dist/snyk-rest-findings.d.ts.map +1 -1
- package/dist/snyk-rest-findings.js +45 -217
- package/dist/snyk-rest-findings.js.map +1 -1
- package/dist/sonar-findings.d.ts +1 -1
- package/dist/sonar-findings.d.ts.map +1 -1
- package/dist/sonar-findings.js +2 -4
- package/dist/sonar-findings.js.map +1 -1
- package/dist/sonar-import.d.ts +3 -0
- package/dist/sonar-import.d.ts.map +1 -1
- package/dist/sonar-import.js +28 -30
- package/dist/sonar-import.js.map +1 -1
- package/dist/stored-finding-projection.d.ts +6 -0
- package/dist/stored-finding-projection.d.ts.map +1 -0
- package/dist/stored-finding-projection.js +104 -0
- package/dist/stored-finding-projection.js.map +1 -0
- package/dist/stored-findings-publication.d.ts +23 -0
- package/dist/stored-findings-publication.d.ts.map +1 -0
- package/dist/stored-findings-publication.js +169 -0
- package/dist/stored-findings-publication.js.map +1 -0
- package/dist/targets.d.ts +6 -1
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +76 -23
- package/dist/targets.js.map +1 -1
- package/dist/tenable-findings.d.ts +1 -4
- package/dist/tenable-findings.d.ts.map +1 -1
- package/dist/tenable-findings.js.map +1 -1
- package/dist/trivy-findings.d.ts.map +1 -1
- package/dist/trivy-findings.js +0 -11
- package/dist/trivy-findings.js.map +1 -1
- package/dist/trusted-executable.d.ts +6 -0
- package/dist/trusted-executable.d.ts.map +1 -1
- package/dist/trusted-executable.js +140 -37
- package/dist/trusted-executable.js.map +1 -1
- package/dist/veracode-findings.d.ts +1 -3
- package/dist/veracode-findings.d.ts.map +1 -1
- package/dist/veracode-findings.js +13 -38
- package/dist/veracode-findings.js.map +1 -1
- package/dist/version.d.ts +3 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +184 -32
- package/dist/version.js.map +1 -1
- package/dist/wiz-findings.d.ts +2 -2
- package/dist/wiz-findings.d.ts.map +1 -1
- package/dist/wiz-findings.js +14 -92
- package/dist/wiz-findings.js.map +1 -1
- package/docs/cli.md +373 -106
- package/docs/findings-service.md +22 -9
- package/docs/hosted-remediation.md +13 -4
- package/docs/sdk.md +903 -0
- package/package.json +10 -6
- package/schemas/external-findings.schema.json +2 -1
- package/dist/hosted-scanner-v1.d.ts +0 -6
- package/dist/hosted-scanner-v1.d.ts.map +0 -1
- package/dist/hosted-scanner-v1.js +0 -60
- package/dist/hosted-scanner-v1.js.map +0 -1
- package/dist/reader-selection.d.ts +0 -15
- package/dist/reader-selection.d.ts.map +0 -1
- package/dist/reader-selection.js +0 -89
- package/dist/reader-selection.js.map +0 -1
- package/dist/semgrep-platform-v1.d.ts +0 -6
- package/dist/semgrep-platform-v1.d.ts.map +0 -1
- package/dist/semgrep-platform-v1.js +0 -83
- package/dist/semgrep-platform-v1.js.map +0 -1
- package/dist/snyk-rest-v1.d.ts +0 -28
- package/dist/snyk-rest-v1.d.ts.map +0 -1
- package/dist/snyk-rest-v1.js +0 -132
- package/dist/snyk-rest-v1.js.map +0 -1
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import type { SavedScanDependencies } from "./saved-scan.js";
|
|
2
2
|
import { type ProcessEnvironment } from "./runtime.js";
|
|
3
|
-
|
|
3
|
+
export interface SavedToolDiscovery {
|
|
4
|
+
protectedRoots: readonly string[];
|
|
5
|
+
allowPathLookup: boolean;
|
|
6
|
+
}
|
|
7
|
+
/** Read saved checkout boundaries before starting tools. The workbench validates the scan. */
|
|
4
8
|
export declare function savedScanWorkbench(requestedId: string | {
|
|
5
9
|
workflowId: string;
|
|
6
10
|
}, options: {
|
|
@@ -11,6 +15,7 @@ export declare function savedScanWorkbench(requestedId: string | {
|
|
|
11
15
|
}): Promise<SavedScanDependencies["runWorkbench"] & {
|
|
12
16
|
environment: ProcessEnvironment;
|
|
13
17
|
readonly protectedRoots: readonly string[];
|
|
18
|
+
readonly nodeDiscovery: SavedToolDiscovery;
|
|
14
19
|
}>;
|
|
15
20
|
export declare function readSavedScanLifecycle(environment: ProcessEnvironment, scanId: string): unknown;
|
|
16
21
|
//# sourceMappingURL=saved-scan-bootstrap.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saved-scan-bootstrap.d.ts","sourceRoot":"","sources":["../src/saved-scan-bootstrap.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"saved-scan-bootstrap.d.ts","sourceRoot":"","sources":["../src/saved-scan-bootstrap.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAML,KAAK,kBAAkB,EAGxB,MAAM,cAAc,CAAC;AAqBtB,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,8FAA8F;AAC9F,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAC5C,OAAO,EAAE;IACP,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,GACA,OAAO,CACR,qBAAqB,CAAC,cAAc,CAAC,GAAG;IACtC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;CAC5C,CACF,CAiLA;AAsED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,kBAAkB,EAC/B,MAAM,EAAE,MAAM,GACb,OAAO,CAaT"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { isRecord } from "./record.js";
|
|
2
|
-
import { compareTimestamps } from "./timestamps.js";
|
|
3
2
|
import { environmentEntry } from "./auth.js";
|
|
4
3
|
import { inspectTrustedExecutable } from "./trusted-executable.js";
|
|
5
|
-
import {
|
|
4
|
+
import { access } from "node:fs/promises";
|
|
6
5
|
import { isAbsolute, join, resolve } from "node:path";
|
|
7
6
|
import { gitHistoryIdentity, gitMarkerRoot, gitProtectionRoots, } from "./targets.js";
|
|
8
7
|
import { CodexSecurityError, errorMessage } from "./errors.js";
|
|
9
|
-
import { codexSecurityStateDirectory, resolvePluginPython, runWorkbench, workbenchEnvironment, sqliteDatabaseOpener, } from "./runtime.js";
|
|
10
|
-
/** Read
|
|
8
|
+
import { codexSecurityStateDirectory, resolvePluginPython, runWorkbench, sameFile, workbenchEnvironment, sqliteDatabaseOpener, } from "./runtime.js";
|
|
9
|
+
/** Read saved checkout boundaries before starting tools. The workbench validates the scan. */
|
|
11
10
|
export async function savedScanWorkbench(requestedId, options) {
|
|
12
11
|
options.signal?.throwIfAborted();
|
|
13
12
|
const environment = workbenchEnvironment(options.environment);
|
|
14
|
-
const targets = await readTargets(requestedId, environment, options.currentDirectory, options.signal);
|
|
13
|
+
const { targets, checkouts } = await readTargets(requestedId, environment, options.currentDirectory, options.signal);
|
|
15
14
|
const latest = requestedId === "latest" || typeof requestedId !== "string";
|
|
16
15
|
if (targets.length === 0)
|
|
17
16
|
throw new CodexSecurityError(typeof requestedId !== "string"
|
|
@@ -25,17 +24,21 @@ export async function savedScanWorkbench(requestedId, options) {
|
|
|
25
24
|
!isAbsolute(target.target_path)))
|
|
26
25
|
throw new CodexSecurityError("Saved scan history has no absolute repository target.");
|
|
27
26
|
const callerRoots = await gitProtectionRoots(options.currentDirectory, options.signal);
|
|
27
|
+
const liveTargets = targets.filter((target) => target.protectPython !== false);
|
|
28
28
|
const protectedRoots = [
|
|
29
29
|
...callerRoots,
|
|
30
|
-
...
|
|
31
|
-
|
|
30
|
+
...liveTargets.flatMap((row) => {
|
|
31
|
+
const root = checkouts.byTarget.get(row.target_path);
|
|
32
|
+
return root ? [root] : [];
|
|
33
|
+
}),
|
|
34
|
+
...liveTargets.map((row) => row.target_path),
|
|
35
|
+
...(await Promise.all(liveTargets.map((row) => gitProtectionRoots(row.target_path, options.signal)))).flat(),
|
|
32
36
|
];
|
|
37
|
+
const discoveryProtectedRoots = await savedDiscoveryRoots(checkouts, [options.currentDirectory, ...targets.map((row) => row.target_path)], options.signal);
|
|
33
38
|
let python;
|
|
34
39
|
const workbench = async (args, input, signal = options.signal) => {
|
|
35
40
|
signal?.throwIfAborted();
|
|
36
|
-
|
|
37
|
-
if (requestedId === "latest" && args[0] === "list-scans")
|
|
38
|
-
return { scans: targets.map((target) => ({ scanId: target.id })) };
|
|
41
|
+
const selectingLatest = requestedId === "latest" && args[0] === "list-scans";
|
|
39
42
|
const target = args[0] === "get-scan"
|
|
40
43
|
? latest
|
|
41
44
|
? targets.find((row) => row.id === args[2])
|
|
@@ -43,15 +46,17 @@ export async function savedScanWorkbench(requestedId, options) {
|
|
|
43
46
|
: undefined;
|
|
44
47
|
if (args[0] === "get-scan" && !target)
|
|
45
48
|
throw new CodexSecurityError("Saved scan history changed during lookup. Retry the command.");
|
|
46
|
-
// Pin
|
|
49
|
+
// Pin one interpreter; ambient discovery also excludes historical candidate paths.
|
|
47
50
|
python ??= await resolvePluginPython({
|
|
48
51
|
environment,
|
|
49
52
|
protectedRoot: protectedRoots,
|
|
53
|
+
discoveryProtectedRoots,
|
|
54
|
+
allowPathLookup: checkouts.complete,
|
|
50
55
|
currentDirectory: options.currentDirectory,
|
|
51
56
|
signal,
|
|
52
57
|
});
|
|
53
58
|
environment["PYTHON"] = python;
|
|
54
|
-
const
|
|
59
|
+
const execute = (command) => runWorkbench({
|
|
55
60
|
environment,
|
|
56
61
|
pluginRoot: options.pluginRoot,
|
|
57
62
|
python,
|
|
@@ -59,7 +64,43 @@ export async function savedScanWorkbench(requestedId, options) {
|
|
|
59
64
|
protectedRoot: protectedRoots,
|
|
60
65
|
currentDirectory: options.currentDirectory,
|
|
61
66
|
failureMessage: "Could not read Codex Security scan history",
|
|
62
|
-
},
|
|
67
|
+
}, command, input);
|
|
68
|
+
if (selectingLatest) {
|
|
69
|
+
// Let the workbench enforce the caller's persisted generation and component scope,
|
|
70
|
+
// including history whose original linked worktree has since been removed.
|
|
71
|
+
const scoped = new Map();
|
|
72
|
+
const scansAt = async (repository) => {
|
|
73
|
+
let scans = scoped.get(repository);
|
|
74
|
+
if (scans === undefined) {
|
|
75
|
+
const result = await execute([
|
|
76
|
+
"list-scans",
|
|
77
|
+
"--repository",
|
|
78
|
+
repository,
|
|
79
|
+
"--status",
|
|
80
|
+
"complete",
|
|
81
|
+
]);
|
|
82
|
+
scans = Array.isArray(result["scans"]) ? result["scans"] : [];
|
|
83
|
+
scoped.set(repository, scans);
|
|
84
|
+
}
|
|
85
|
+
return scans;
|
|
86
|
+
};
|
|
87
|
+
const callerScans = await scansAt(options.currentDirectory);
|
|
88
|
+
for (const candidate of targets) {
|
|
89
|
+
let selected = callerScans.find((scan) => isRecord(scan) && scan["scanId"] === candidate.id);
|
|
90
|
+
// Dedupe also accepts the same component of an independent same-origin clone.
|
|
91
|
+
// Validate that clone's current ownership before using its saved history.
|
|
92
|
+
if (selected === undefined && candidate.originFallback) {
|
|
93
|
+
selected = (await scansAt(candidate.target_path)).find((scan) => isRecord(scan) && scan["scanId"] === candidate.id);
|
|
94
|
+
}
|
|
95
|
+
if (selected !== undefined)
|
|
96
|
+
return { scans: [selected] };
|
|
97
|
+
}
|
|
98
|
+
if (environment["CODEX_SECURITY_GIT"] === "") {
|
|
99
|
+
throw new CodexSecurityError("Could not verify the saved checkout automatically without a trusted Git executable. Use an explicit saved scan ID: codex-security dedupe --scan SCAN_ID");
|
|
100
|
+
}
|
|
101
|
+
return { scans: [] };
|
|
102
|
+
}
|
|
103
|
+
const result = await execute(target ? ["get-scan", "--scan-id", target.id] : args);
|
|
63
104
|
if (typeof requestedId !== "string" && args[0] === "finding-workflow") {
|
|
64
105
|
const workflow = result["workflow"];
|
|
65
106
|
if (!isRecord(workflow) || workflow["scanId"] !== targets[0].id)
|
|
@@ -78,61 +119,135 @@ export async function savedScanWorkbench(requestedId, options) {
|
|
|
78
119
|
return Object.assign(workbench, {
|
|
79
120
|
environment,
|
|
80
121
|
protectedRoots: [options.currentDirectory, ...protectedRoots],
|
|
122
|
+
nodeDiscovery: {
|
|
123
|
+
protectedRoots: discoveryProtectedRoots,
|
|
124
|
+
allowPathLookup: checkouts.complete,
|
|
125
|
+
},
|
|
81
126
|
});
|
|
82
127
|
}
|
|
83
|
-
function
|
|
84
|
-
|
|
85
|
-
|
|
128
|
+
async function readTargets(requestedId, environment, currentDirectory, signal) {
|
|
129
|
+
try {
|
|
130
|
+
const latest = requestedId === "latest";
|
|
131
|
+
const snapshot = readSnapshot(workbenchDatabasePath(environment), (database) => {
|
|
132
|
+
const targets = latest
|
|
133
|
+
? completedScans(database)
|
|
134
|
+
: exactTargets(database, requestedId);
|
|
135
|
+
const checkouts = savedCheckouts(database);
|
|
136
|
+
return { targets, checkouts };
|
|
137
|
+
});
|
|
138
|
+
if (latest)
|
|
139
|
+
snapshot.targets = await latestTargets(snapshot.targets, currentDirectory, environment, snapshot.checkouts, signal);
|
|
140
|
+
return snapshot;
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
signal?.throwIfAborted();
|
|
144
|
+
if (error instanceof CodexSecurityError)
|
|
145
|
+
throw error;
|
|
146
|
+
throw new CodexSecurityError(`Could not read saved scan targets before Python discovery: ${errorMessage(error)}`, { cause: error });
|
|
147
|
+
}
|
|
86
148
|
}
|
|
87
|
-
|
|
88
|
-
|
|
149
|
+
function workbenchDatabasePath(environment) {
|
|
150
|
+
return join(codexSecurityStateDirectory(environment), "workbench.sqlite3");
|
|
151
|
+
}
|
|
152
|
+
/** @internal Read executable exclusions before launching an ordinary history command. */
|
|
153
|
+
export async function savedCheckoutBoundaries(environment) {
|
|
154
|
+
const path = workbenchDatabasePath(environment);
|
|
89
155
|
try {
|
|
90
|
-
|
|
91
|
-
|
|
156
|
+
await access(path);
|
|
157
|
+
}
|
|
158
|
+
catch (error) {
|
|
159
|
+
if (error.code === "ENOENT")
|
|
160
|
+
return undefined;
|
|
161
|
+
throw error;
|
|
162
|
+
}
|
|
163
|
+
return readSnapshot(path, (database) => savedCheckouts(database));
|
|
164
|
+
}
|
|
165
|
+
/** @internal Exclude both recorded checkout roots and the currently visible checkouts. */
|
|
166
|
+
export async function savedDiscoveryRoots(checkouts, paths, signal) {
|
|
167
|
+
const targets = [...new Set([...paths, ...(checkouts?.roots ?? [])])];
|
|
168
|
+
const currentRoots = await Promise.all(targets.map((path) => gitProtectionRoots(path, signal)));
|
|
169
|
+
return [...new Set([...targets, ...currentRoots.flat()])];
|
|
170
|
+
}
|
|
171
|
+
export function readSavedScanLifecycle(environment, scanId) {
|
|
172
|
+
return readSnapshot(workbenchDatabasePath(environment), (database) => {
|
|
92
173
|
const [row] = readRows(database, "SELECT snapshot FROM scan_lifecycles WHERE scan_id = ?", scanId);
|
|
93
174
|
return row && JSON.parse(row.snapshot);
|
|
175
|
+
}, 0);
|
|
176
|
+
}
|
|
177
|
+
function readSnapshot(path, select, timeout = 5000) {
|
|
178
|
+
const database = sqliteDatabaseOpener("read-existing")(path);
|
|
179
|
+
try {
|
|
180
|
+
database.exec(`PRAGMA busy_timeout = ${timeout}`);
|
|
181
|
+
database.exec("PRAGMA query_only = ON");
|
|
182
|
+
// Select scans and their saved boundaries from the same snapshot.
|
|
183
|
+
database.exec("BEGIN");
|
|
184
|
+
return select(database);
|
|
94
185
|
}
|
|
95
186
|
finally {
|
|
96
187
|
database.close();
|
|
97
188
|
}
|
|
98
189
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
database.
|
|
105
|
-
if (typeof requestedId !== "string") {
|
|
106
|
-
const columns = readRows(database, "PRAGMA table_info(finding_workflows)");
|
|
107
|
-
const scanId = columns.some((column) => column.name === "scan_id")
|
|
108
|
-
? "workflow.scan_id"
|
|
109
|
-
: "json_extract(workflow.state_json, '$.scanId')";
|
|
110
|
-
return readRows(database, `SELECT scans.id, scans.target_path FROM scans
|
|
190
|
+
function exactTargets(database, requestedId) {
|
|
191
|
+
if (typeof requestedId !== "string") {
|
|
192
|
+
const scanId = tableColumns(database, "finding_workflows").has("scan_id")
|
|
193
|
+
? "workflow.scan_id"
|
|
194
|
+
: "json_extract(workflow.state_json, '$.scanId')";
|
|
195
|
+
return readRows(database, `SELECT scans.id, scans.target_path FROM scans
|
|
111
196
|
JOIN finding_workflows AS workflow ON scans.id = ${scanId} WHERE workflow.id = ?`, requestedId.workflowId);
|
|
112
|
-
}
|
|
113
|
-
if (requestedId === "latest")
|
|
114
|
-
return await latestTargets(database, currentDirectory, environment, signal);
|
|
115
|
-
// Match uuid.UUID's accepted full-ID spellings before considering a prefix.
|
|
116
|
-
const compact = trimBoundary(requestedId.replaceAll("urn:", "").replaceAll("uuid:", ""), "{", "}").replaceAll("-", "");
|
|
117
|
-
if (/^[0-9a-f]{32}$/i.test(compact)) {
|
|
118
|
-
const id = compact
|
|
119
|
-
.toLowerCase()
|
|
120
|
-
.replace(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "$1-$2-$3-$4-$5");
|
|
121
|
-
return readRows(database, "SELECT id, target_path FROM scans WHERE id = ?", id);
|
|
122
|
-
}
|
|
123
|
-
if (requestedId.length < 8)
|
|
124
|
-
throw new CodexSecurityError("Scan ID prefixes must be at least eight characters.");
|
|
125
|
-
return readRows(database, "SELECT id, target_path FROM scans WHERE substr(id, 1, ?) = ? LIMIT 2", requestedId.length, requestedId.toLowerCase());
|
|
126
197
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
198
|
+
// Match uuid.UUID's accepted full-ID spellings before considering a prefix.
|
|
199
|
+
const compact = trimBoundary(requestedId.replaceAll("urn:", "").replaceAll("uuid:", ""), "{", "}").replaceAll("-", "");
|
|
200
|
+
if (/^[0-9a-f]{32}$/i.test(compact)) {
|
|
201
|
+
const id = compact
|
|
202
|
+
.toLowerCase()
|
|
203
|
+
.replace(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "$1-$2-$3-$4-$5");
|
|
204
|
+
return readRows(database, "SELECT id, target_path FROM scans WHERE id = ?", id);
|
|
132
205
|
}
|
|
133
|
-
|
|
134
|
-
|
|
206
|
+
if (requestedId.length < 8)
|
|
207
|
+
throw new CodexSecurityError("Scan ID prefixes must be at least eight characters.");
|
|
208
|
+
return readRows(database, "SELECT id, target_path FROM scans WHERE substr(id, 1, ?) = ? LIMIT 2", requestedId.length, requestedId.toLowerCase());
|
|
209
|
+
}
|
|
210
|
+
function tableColumns(database, table) {
|
|
211
|
+
return new Set(readRows(database, `PRAGMA table_info(${table})`).map((row) => row.name));
|
|
212
|
+
}
|
|
213
|
+
/** Read registered boundaries without assuming an unversioned scan was outside Git. */
|
|
214
|
+
function savedCheckouts(database) {
|
|
215
|
+
const scan = tableColumns(database, "scans");
|
|
216
|
+
const registry = tableColumns(database, "security_targets");
|
|
217
|
+
const workspace = tableColumns(database, "workspaces");
|
|
218
|
+
const sources = [];
|
|
219
|
+
if (scan.has("target_path"))
|
|
220
|
+
sources.push("SELECT target_path, NULL AS checkout_root FROM scans");
|
|
221
|
+
if (workspace.has("target_path")) {
|
|
222
|
+
const validated = workspace.has("target_path_unvalidated")
|
|
223
|
+
? " AND (target_path_unvalidated = 0 OR target_id IS NOT NULL)"
|
|
224
|
+
: "";
|
|
225
|
+
sources.push(`SELECT target_path, NULL AS checkout_root FROM workspaces
|
|
226
|
+
WHERE target_path IS NOT NULL${validated}`);
|
|
135
227
|
}
|
|
228
|
+
if (registry.has("current_path")) {
|
|
229
|
+
sources.push(`SELECT current_path AS target_path,
|
|
230
|
+
${registry.has("git_checkout_root") ? "git_checkout_root" : "NULL"} AS checkout_root
|
|
231
|
+
FROM security_targets`);
|
|
232
|
+
}
|
|
233
|
+
const rows = sources.length === 0
|
|
234
|
+
? []
|
|
235
|
+
: readRows(database, `SELECT target_path, MAX(checkout_root) AS checkout_root
|
|
236
|
+
FROM (${sources.join(" UNION ALL ")}) GROUP BY target_path`);
|
|
237
|
+
const saved = workspace.has("rejected_checkout_roots_json")
|
|
238
|
+
? "rejected_checkout_roots_json"
|
|
239
|
+
: "NULL";
|
|
240
|
+
const rejected = workspace.has("target_path_unvalidated")
|
|
241
|
+
? readRows(database, `SELECT DISTINCT value AS root FROM workspaces LEFT JOIN json_each(${saved})
|
|
242
|
+
WHERE ${saved} IS NOT NULL OR
|
|
243
|
+
(target_path IS NOT NULL AND target_path_unvalidated = 1 AND target_id IS NULL)`).map((row) => row.root)
|
|
244
|
+
: [];
|
|
245
|
+
const roots = [...rows.map((row) => row.checkout_root), ...rejected];
|
|
246
|
+
return {
|
|
247
|
+
byTarget: new Map(rows.map((row) => [row.target_path, row.checkout_root])),
|
|
248
|
+
roots: roots.filter((root) => root !== null),
|
|
249
|
+
complete: !roots.includes(null),
|
|
250
|
+
};
|
|
136
251
|
}
|
|
137
252
|
function readRows(database, sql, ...parameters) {
|
|
138
253
|
const statement = database.prepare(sql);
|
|
@@ -145,90 +260,127 @@ function readRows(database, sql, ...parameters) {
|
|
|
145
260
|
statement.finalize?.();
|
|
146
261
|
}
|
|
147
262
|
}
|
|
148
|
-
|
|
149
|
-
const
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
263
|
+
function completedScans(database) {
|
|
264
|
+
const columns = tableColumns(database, "scans");
|
|
265
|
+
return readRows(database, `SELECT scans.id, scans.target_path, scans.updated_at, scans.started_at,
|
|
266
|
+
progress.updated_at AS progress_updated_at,
|
|
267
|
+
${columns.has("repository_generation") ? "scans.repository_generation" : "NULL"} AS repository_generation
|
|
268
|
+
FROM scans JOIN scan_progress AS progress ON progress.scan_id = scans.id
|
|
269
|
+
WHERE scans.status = 'complete' ${columns.has("canceled_at") ? "AND scans.canceled_at IS NULL" : ""}`)
|
|
270
|
+
.map((scan) => {
|
|
271
|
+
const updated = timestampOrderKey(scan.updated_at);
|
|
272
|
+
const progress = timestampOrderKey(scan.progress_updated_at);
|
|
273
|
+
return {
|
|
274
|
+
...scan,
|
|
275
|
+
updatedKey: updated > progress ? updated : progress,
|
|
276
|
+
startedKey: timestampOrderKey(scan.started_at),
|
|
277
|
+
};
|
|
278
|
+
})
|
|
279
|
+
.sort((left, right) => compareOrderKeys(right.updatedKey, left.updatedKey) ||
|
|
280
|
+
compareOrderKeys(right.startedKey, left.startedKey) ||
|
|
281
|
+
compareOrderKeys(left.id, right.id));
|
|
282
|
+
}
|
|
283
|
+
async function latestTargets(scans, directory, environment, checkouts, signal) {
|
|
284
|
+
const paths = [...new Set(scans.map((scan) => scan.target_path))];
|
|
285
|
+
const related = new Map();
|
|
286
|
+
for (const path of paths)
|
|
287
|
+
if (await sameFile(path, directory))
|
|
288
|
+
related.set(path, { originFallback: false });
|
|
289
|
+
const protectedAncestorPaths = new Set();
|
|
160
290
|
let gitMatchingUnavailable = false;
|
|
161
291
|
const caller = await gitMarkerRoot(directory, signal, "outermost");
|
|
162
292
|
if (caller !== null) {
|
|
163
293
|
// Resolve metadata with a host Git, never a Git executable from any candidate checkout.
|
|
164
|
-
const
|
|
165
|
-
const protectedRoots = [
|
|
166
|
-
...(await gitProtectionRoots(directory, signal)),
|
|
167
|
-
...registered.map((target) => target.target_path),
|
|
168
|
-
...roots.flat(),
|
|
169
|
-
];
|
|
294
|
+
const protectedRoots = await savedDiscoveryRoots(checkouts, [directory, ...checkouts.byTarget.keys()], signal);
|
|
170
295
|
const configured = environmentEntry(environment, "CODEX_SECURITY_GIT");
|
|
171
|
-
const inspected = configured === ""
|
|
296
|
+
const inspected = configured === "" ||
|
|
297
|
+
(!checkouts.complete && !isAbsolute(configured ?? ""))
|
|
172
298
|
? { executable: null, environment }
|
|
173
299
|
: await inspectTrustedExecutable(configured ?? "git", environment, protectedRoots);
|
|
174
|
-
// Keep subsequent workbench operations on this host Git without changing Python's PATH.
|
|
175
300
|
for (const key of Object.keys(environment))
|
|
176
301
|
if (key.toUpperCase() === "CODEX_SECURITY_GIT")
|
|
177
302
|
delete environment[key];
|
|
178
303
|
environment["CODEX_SECURITY_GIT"] = inspected.executable ?? "";
|
|
179
304
|
gitMatchingUnavailable = inspected.executable === null;
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
: {
|
|
305
|
+
if (inspected.executable !== null) {
|
|
306
|
+
const git = {
|
|
183
307
|
executable: inspected.executable,
|
|
184
308
|
environment: inspected.environment,
|
|
185
309
|
};
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
310
|
+
const identity = await gitHistoryIdentity(directory, git, signal);
|
|
311
|
+
const origin = repositoryOrigin(identity.origin);
|
|
312
|
+
for (const path of paths) {
|
|
313
|
+
signal?.throwIfAborted();
|
|
314
|
+
if (related.has(path))
|
|
315
|
+
continue;
|
|
316
|
+
const candidate = await gitHistoryIdentity(path, git, signal);
|
|
317
|
+
if (candidate.commonDirectory === null &&
|
|
318
|
+
identity.commonDirectory !== null) {
|
|
319
|
+
const enclosing = await gitMarkerRoot(path, signal, "outermost");
|
|
320
|
+
if (enclosing !== null) {
|
|
321
|
+
const ancestor = await gitHistoryIdentity(enclosing, git, signal);
|
|
322
|
+
if (ancestor.commonDirectory !== null &&
|
|
323
|
+
(await sameFile(identity.commonDirectory, ancestor.commonDirectory)))
|
|
324
|
+
protectedAncestorPaths.add(path);
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
if (identity.relativePath === null ||
|
|
328
|
+
candidate.relativePath !== identity.relativePath)
|
|
329
|
+
continue;
|
|
330
|
+
const common = identity.commonDirectory !== null &&
|
|
331
|
+
candidate.commonDirectory !== null &&
|
|
332
|
+
(await sameFile(identity.commonDirectory, candidate.commonDirectory));
|
|
333
|
+
const clone = !common &&
|
|
334
|
+
identity.commonDirectory !== null &&
|
|
335
|
+
candidate.commonDirectory !== null &&
|
|
336
|
+
origin !== null &&
|
|
337
|
+
repositoryOrigin(candidate.origin) === origin;
|
|
338
|
+
if (common || clone)
|
|
339
|
+
related.set(path, { originFallback: clone });
|
|
340
|
+
}
|
|
203
341
|
}
|
|
204
342
|
}
|
|
205
|
-
const
|
|
206
|
-
progress.updated_at AS progress_updated_at,
|
|
207
|
-
${columns.has("target_id") ? "scans.target_id" : "scans.target_path"} AS target_id
|
|
208
|
-
FROM scans JOIN scan_progress AS progress ON progress.scan_id = scans.id
|
|
209
|
-
WHERE scans.status = 'complete' ${columns.has("canceled_at") ? "AND scans.canceled_at IS NULL" : ""}
|
|
210
|
-
ORDER BY scans.id`)
|
|
211
|
-
.map((scan) => ({
|
|
212
|
-
...scan,
|
|
213
|
-
updatedAt: compareTimestamps(scan.updated_at, scan.progress_updated_at) > 0
|
|
214
|
-
? scan.updated_at
|
|
215
|
-
: scan.progress_updated_at,
|
|
216
|
-
}))
|
|
217
|
-
.sort((a, b) => compareTimestamps(b.updatedAt, a.updatedAt) ||
|
|
218
|
-
compareTimestamps(b.started_at, a.started_at));
|
|
343
|
+
const selected = [];
|
|
219
344
|
for (const scan of scans) {
|
|
220
345
|
signal?.throwIfAborted();
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
346
|
+
const match = related.get(scan.target_path);
|
|
347
|
+
// Scan generations survive legacy unbound registry rows and removed or reused paths.
|
|
348
|
+
// The caller-scoped workbench query remains authoritative for membership.
|
|
349
|
+
if (match || (caller !== null && scan.repository_generation != null))
|
|
350
|
+
selected.push({
|
|
351
|
+
...scan,
|
|
352
|
+
originFallback: match?.originFallback ?? false,
|
|
353
|
+
// An existing path unrelated to the caller no longer supplies its source.
|
|
354
|
+
// Keep the historical binding for lookup without trusting it as a live target.
|
|
355
|
+
protectPython: match !== undefined || protectedAncestorPaths.has(scan.target_path),
|
|
356
|
+
});
|
|
224
357
|
}
|
|
225
|
-
if (gitMatchingUnavailable)
|
|
358
|
+
if (related.size === 0 && gitMatchingUnavailable)
|
|
226
359
|
throw new CodexSecurityError("No completed saved scan matched this exact path, and Git-based matching across worktrees or clones is unavailable. Use an explicit saved scan ID: codex-security dedupe --scan SCAN_ID");
|
|
227
|
-
return
|
|
360
|
+
return selected;
|
|
361
|
+
}
|
|
362
|
+
function timestampOrderKey(value) {
|
|
363
|
+
const match = /^(\d{4}-\d{2}-\d{2}[Tt]\d{2}:\d{2}:\d{2})(?:\.([0-9]+))?([Zz]|[+-]\d{2}:\d{2})$/.exec(value);
|
|
364
|
+
const seconds = match
|
|
365
|
+
? Date.parse(`${match[1]}${match[3]}`.toUpperCase())
|
|
366
|
+
: NaN;
|
|
367
|
+
// Legacy naive or malformed rows retain opaque text ordering. The scoped
|
|
368
|
+
// workbench query still owns their diagnostics, without using the host timezone.
|
|
369
|
+
if (!Number.isFinite(seconds))
|
|
370
|
+
return `0${value}`;
|
|
371
|
+
const instant = new Date(seconds);
|
|
372
|
+
const whole = instant.toISOString().slice(0, -5);
|
|
373
|
+
// An offset can carry a supported four-digit local year into UTC year 10000.
|
|
374
|
+
const year = String(instant.getUTCFullYear()).padStart(5, "0");
|
|
375
|
+
const digits = match[2] ?? "";
|
|
376
|
+
let fractionEnd = digits.length;
|
|
377
|
+
while (fractionEnd > 0 && digits[fractionEnd - 1] === "0")
|
|
378
|
+
fractionEnd--;
|
|
379
|
+
const fraction = digits.slice(0, fractionEnd);
|
|
380
|
+
return `${year}${whole.slice(whole.indexOf("-"))}${fraction ? `.${fraction}` : ""}`;
|
|
228
381
|
}
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
return process.platform === "win32" ? canonical.toLowerCase() : canonical;
|
|
382
|
+
function compareOrderKeys(left, right) {
|
|
383
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
232
384
|
}
|
|
233
385
|
// Match the workbench history's host/path identity across HTTPS and SSH origins.
|
|
234
386
|
function repositoryOrigin(remote) {
|