@openai/codex-security 0.8.3 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -746
- package/_bundled_plugin/.codex-plugin/plugin.json +2 -0
- package/_bundled_plugin/.mcp.json +7 -1
- package/_bundled_plugin/examples/completed-scan/findings.json +16 -4
- package/_bundled_plugin/examples/completed-scan/report.md +11 -8
- package/_bundled_plugin/examples/completed-scan/scan-manifest.json +4 -2
- package/_bundled_plugin/mcp/fzstd-LICENSE.txt +21 -0
- package/_bundled_plugin/mcp/helpers.mjs +2 -11
- package/_bundled_plugin/mcp/helpers.mjs.br +0 -0
- package/_bundled_plugin/mcp/native/THIRD_PARTY_NOTICES.txt +3 -210
- package/_bundled_plugin/mcp/native/darwin-arm64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/darwin-x64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/win32-arm64/windows.node +0 -0
- package/_bundled_plugin/mcp/native/win32-x64/windows.node +0 -0
- package/_bundled_plugin/mcp/package.json +1 -0
- package/_bundled_plugin/mcp/permission-profile-preflight.mjs +5 -2
- package/_bundled_plugin/mcp/server.mjs +2 -11
- package/_bundled_plugin/mcp/server.mjs.br +0 -0
- package/_bundled_plugin/mcp/session-decompression.mjs +712 -0
- package/_bundled_plugin/references/artifact-storage.md +1 -1
- package/_bundled_plugin/references/baseline-auditor.md +18 -0
- package/_bundled_plugin/references/core-scan.md +5 -42
- package/_bundled_plugin/references/default-severity-rubric.md +9 -4
- package/_bundled_plugin/references/final-report.md +5 -3
- package/_bundled_plugin/references/finding-detail-fields.md +18 -18
- package/_bundled_plugin/references/focused-investigator.md +13 -0
- package/_bundled_plugin/references/sarif-adapter.md +8 -2
- package/_bundled_plugin/references/scan-artifacts.md +21 -12
- package/_bundled_plugin/references/scan-contract.md +27 -33
- package/_bundled_plugin/references/scan-prologue.md +2 -2
- package/_bundled_plugin/references/scan-runtime.md +4 -2
- package/_bundled_plugin/references/security-guidance.md +14 -1
- package/_bundled_plugin/references/validate-scan-findings.md +3 -0
- package/_bundled_plugin/schemas/tools/scan-draft.schema.json +2 -2
- package/_bundled_plugin/scripts/check_deep_scan_target.py +97 -0
- package/_bundled_plugin/scripts/codex_profile.mjs +7 -1
- package/_bundled_plugin/scripts/deep_scan_config.py +20 -1
- package/_bundled_plugin/scripts/deep_scan_workbench.py +192 -352
- package/_bundled_plugin/scripts/dispatch_inventory_tool +7 -0
- package/_bundled_plugin/scripts/filesystem_identity.py +1 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +182 -230
- package/_bundled_plugin/scripts/finding_preview.py +20 -0
- package/_bundled_plugin/scripts/launch_codex_security_mcp +55 -16
- package/_bundled_plugin/scripts/legacy_findings.py +148 -0
- package/_bundled_plugin/scripts/posix_scan_local_files.py +37 -1
- package/_bundled_plugin/scripts/read_codex_session.mjs +21 -0
- package/_bundled_plugin/scripts/report_projection.py +81 -43
- package/_bundled_plugin/scripts/review_state.py +8 -2
- package/_bundled_plugin/scripts/servicenow_avit.py +20 -0
- package/_bundled_plugin/scripts/snapshot_sqlite.py +9 -2
- package/_bundled_plugin/scripts/threat_model_projection.py +22 -26
- package/_bundled_plugin/scripts/validate_scan_contract.py +7 -1
- package/_bundled_plugin/scripts/windows_scan_local_files.py +582 -20
- package/_bundled_plugin/scripts/workbench/__init__.py +1 -1
- package/_bundled_plugin/scripts/workbench/handoff.py +100 -23
- package/_bundled_plugin/scripts/workbench/retained_coverage.py +30 -51
- package/_bundled_plugin/scripts/workbench/retained_records.py +18 -30
- package/_bundled_plugin/scripts/workbench/runtime_toml.py +4 -1
- package/_bundled_plugin/scripts/workbench/saved_coverage.py +9 -17
- package/_bundled_plugin/scripts/workbench/saved_outputs.py +9 -0
- package/_bundled_plugin/scripts/workbench/saved_sources.py +47 -40
- package/_bundled_plugin/scripts/workbench/storage.py +91 -7
- package/_bundled_plugin/scripts/workbench_cli.py +54 -14
- package/_bundled_plugin/scripts/workbench_constants.py +12 -0
- package/_bundled_plugin/scripts/workbench_coverage_receipts.py +3 -3
- package/_bundled_plugin/scripts/workbench_db.py +562 -303
- package/_bundled_plugin/scripts/workbench_feedback.py +57 -11
- package/_bundled_plugin/scripts/workbench_finding_index.py +1 -0
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +4 -0
- package/_bundled_plugin/scripts/workbench_native_indexes.py +238 -41
- package/_bundled_plugin/scripts/workbench_progress.py +169 -4
- package/_bundled_plugin/scripts/workbench_publication.py +16 -13
- package/_bundled_plugin/scripts/workbench_remediation.py +155 -2
- package/_bundled_plugin/scripts/workbench_saved_results.py +176 -81
- package/_bundled_plugin/scripts/workbench_scan_history.py +398 -174
- package/_bundled_plugin/scripts/workbench_scan_start.py +224 -31
- package/_bundled_plugin/scripts/workbench_scan_usage.py +675 -73
- package/_bundled_plugin/scripts/workbench_schema.py +258 -63
- package/_bundled_plugin/scripts/workbench_setup.py +14 -2
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +13 -0
- package/_bundled_plugin/scripts/workbench_source_scopes.py +18 -0
- package/_bundled_plugin/scripts/workbench_target.py +594 -136
- package/_bundled_plugin/scripts/workbench_target_state.py +1110 -21
- package/_bundled_plugin/scripts/workbench_validation.py +43 -3
- package/_bundled_plugin/shared/workbench-history-repairs.json +77 -35
- package/_bundled_plugin/shared/workbench-migrations.json +100 -0
- package/_bundled_plugin/skills/cloud-findings/SKILL.md +5 -5
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +7 -50
- package/_bundled_plugin/skills/fix-finding/SKILL.md +2 -1
- package/_bundled_plugin/skills/publish-findings/SKILL.md +24 -153
- package/_bundled_plugin/skills/publish-findings/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/publish-findings/references/checkmarx-import.md +37 -0
- package/_bundled_plugin/skills/publish-findings/references/wiz-import.md +3 -3
- package/_bundled_plugin/skills/publish-findings/scripts/collect_checkmarx.py +409 -0
- package/_bundled_plugin/skills/publish-findings/scripts/collect_continuum.py +224 -0
- package/_bundled_plugin/skills/publish-findings/scripts/collector_paths.py +63 -0
- package/_bundled_plugin/skills/security-scan/SKILL.md +9 -46
- package/_bundled_plugin/skills/security-scan/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/security-scan/references/desktop-scan.md +3 -21
- package/_bundled_plugin/skills/security-scan/references/managed-scan.md +11 -0
- package/_bundled_plugin/skills/security-scan/references/scan-results.md +15 -0
- package/_bundled_plugin/skills/security-scan/references/scoped-paths.md +23 -0
- package/_bundled_plugin/skills/security-scan/references/sdk-files.md +24 -0
- package/_bundled_plugin/skills/threat-model-visualize/scripts/build_explorer.py +22 -1
- package/_bundled_plugin/skills/triage-finding/references/ticket-intake.md +6 -2
- package/bin/codex-security.mjs +2 -2
- package/dist/api.d.ts +45 -5
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +1192 -427
- package/dist/api.js.map +1 -1
- package/dist/armorcode-findings.d.ts +9 -0
- package/dist/armorcode-findings.d.ts.map +1 -0
- package/dist/armorcode-findings.js +145 -0
- package/dist/armorcode-findings.js.map +1 -0
- package/dist/artifact-export.d.ts +2 -0
- package/dist/artifact-export.d.ts.map +1 -1
- package/dist/artifact-export.js +29 -13
- package/dist/artifact-export.js.map +1 -1
- package/dist/auth.d.ts +6 -2
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +37 -18
- package/dist/auth.js.map +1 -1
- package/dist/batch-cost.d.ts +18 -0
- package/dist/batch-cost.d.ts.map +1 -0
- package/dist/batch-cost.js +41 -0
- package/dist/batch-cost.js.map +1 -0
- package/dist/bedrock-oss-pricing.d.ts +6 -0
- package/dist/bedrock-oss-pricing.d.ts.map +1 -0
- package/dist/bedrock-oss-pricing.js +58 -0
- package/dist/bedrock-oss-pricing.js.map +1 -0
- package/dist/bedrock-pricing.d.ts +15 -0
- package/dist/bedrock-pricing.d.ts.map +1 -0
- package/dist/bedrock-pricing.js +117 -0
- package/dist/bedrock-pricing.js.map +1 -0
- package/dist/blackduck-findings.d.ts +1 -1
- package/dist/blackduck-findings.d.ts.map +1 -1
- package/dist/blackduck-findings.js +24 -22
- package/dist/blackduck-findings.js.map +1 -1
- package/dist/bulk-scan-discovery.d.ts.map +1 -1
- package/dist/bulk-scan-discovery.js +4 -4
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/bundled-plugin.d.ts +4 -0
- package/dist/bundled-plugin.d.ts.map +1 -0
- package/dist/bundled-plugin.js +23 -0
- package/dist/bundled-plugin.js.map +1 -0
- package/dist/checkmarx-evidence.d.ts +19 -0
- package/dist/checkmarx-evidence.d.ts.map +1 -0
- package/dist/checkmarx-evidence.js +36 -0
- package/dist/checkmarx-evidence.js.map +1 -0
- package/dist/checkmarx-findings.d.ts +4 -0
- package/dist/checkmarx-findings.d.ts.map +1 -0
- package/dist/checkmarx-findings.js +27 -0
- package/dist/checkmarx-findings.js.map +1 -0
- package/dist/checkmarx-one.d.ts +4 -0
- package/dist/checkmarx-one.d.ts.map +1 -0
- package/dist/checkmarx-one.js +53 -0
- package/dist/checkmarx-one.js.map +1 -0
- package/dist/checkmarx-repository.d.ts +12 -0
- package/dist/checkmarx-repository.d.ts.map +1 -0
- package/dist/checkmarx-repository.js +181 -0
- package/dist/checkmarx-repository.js.map +1 -0
- package/dist/checkmarx-xml.d.ts +12 -0
- package/dist/checkmarx-xml.d.ts.map +1 -0
- package/dist/checkmarx-xml.js +196 -0
- package/dist/checkmarx-xml.js.map +1 -0
- package/dist/classify-scan-severity.d.ts +1 -1
- package/dist/classify-scan-severity.d.ts.map +1 -1
- package/dist/classify-scan-severity.js +11 -3
- package/dist/classify-scan-severity.js.map +1 -1
- package/dist/classify-severity-records.d.ts +1 -9
- package/dist/classify-severity-records.d.ts.map +1 -1
- package/dist/classify-severity-records.js +3 -13
- package/dist/classify-severity-records.js.map +1 -1
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +11 -10
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli-argument.d.ts +4 -0
- package/dist/cli-argument.d.ts.map +1 -0
- package/dist/cli-argument.js +17 -0
- package/dist/cli-argument.js.map +1 -0
- package/dist/cli-help.d.ts +1 -1
- package/dist/cli-help.d.ts.map +1 -1
- package/dist/cli-help.js +71 -29
- package/dist/cli-help.js.map +1 -1
- package/dist/cli-hook.d.ts +3 -0
- package/dist/cli-hook.d.ts.map +1 -0
- package/dist/cli-hook.js +87 -0
- package/dist/cli-hook.js.map +1 -0
- package/dist/cli-integrations.d.ts +13 -0
- package/dist/cli-integrations.d.ts.map +1 -0
- package/dist/cli-integrations.js +333 -0
- package/dist/cli-integrations.js.map +1 -0
- package/dist/cli-mcp.d.ts +15 -0
- package/dist/cli-mcp.d.ts.map +1 -0
- package/dist/cli-mcp.js +178 -0
- package/dist/cli-mcp.js.map +1 -0
- package/dist/cli-token-view.d.ts +10 -0
- package/dist/cli-token-view.d.ts.map +1 -0
- package/dist/cli-token-view.js +41 -0
- package/dist/cli-token-view.js.map +1 -0
- package/dist/cli.d.ts +16 -8
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +3382 -2017
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.d.ts.map +1 -1
- package/dist/cloud-publish.js +35 -33
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codex-sdk-environment.d.ts +6 -0
- package/dist/codex-sdk-environment.d.ts.map +1 -1
- package/dist/codex-sdk-environment.js +19 -0
- package/dist/codex-sdk-environment.js.map +1 -1
- package/dist/command-words.d.ts +3 -0
- package/dist/command-words.d.ts.map +1 -0
- package/dist/command-words.js +46 -0
- package/dist/command-words.js.map +1 -0
- package/dist/component-scan.d.ts +19 -4
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +67 -9
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +130 -67
- package/dist/config.js.map +1 -1
- package/dist/continuum-findings.d.ts +1 -1
- package/dist/continuum-findings.d.ts.map +1 -1
- package/dist/continuum-findings.js +149 -19
- package/dist/continuum-findings.js.map +1 -1
- package/dist/contract-values.d.ts +2 -0
- package/dist/contract-values.d.ts.map +1 -1
- package/dist/contract-values.js +12 -9
- package/dist/contract-values.js.map +1 -1
- package/dist/cost-model.d.ts +13 -1
- package/dist/cost-model.d.ts.map +1 -1
- package/dist/cost-model.js +66 -112
- package/dist/cost-model.js.map +1 -1
- package/dist/cost.d.ts +42 -3
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +484 -149
- package/dist/cost.js.map +1 -1
- package/dist/custom-publish.d.ts +4 -0
- package/dist/custom-publish.d.ts.map +1 -1
- package/dist/custom-publish.js +40 -3
- package/dist/custom-publish.js.map +1 -1
- package/dist/custom-validation-prompt.d.ts +1 -1
- package/dist/custom-validation-prompt.d.ts.map +1 -1
- package/dist/custom-validation-prompt.js +29 -19
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/deduplication/local.d.ts +4 -2
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +9 -2
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/refusal.d.ts.map +1 -1
- package/dist/deduplication/refusal.js +26 -5
- package/dist/deduplication/refusal.js.map +1 -1
- package/dist/deduplication/scan.d.ts +5 -0
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +24 -7
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-config.d.ts +0 -1
- package/dist/deep-config.d.ts.map +1 -1
- package/dist/deep-config.js +22 -33
- package/dist/deep-config.js.map +1 -1
- package/dist/deep-scan-defaults.d.ts +2 -0
- package/dist/deep-scan-defaults.d.ts.map +1 -1
- package/dist/deep-scan-defaults.js +28 -1
- package/dist/deep-scan-defaults.js.map +1 -1
- package/dist/deep-scan.d.ts +2 -0
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +44 -19
- package/dist/deep-scan.js.map +1 -1
- package/dist/default-severity-rubric.d.ts +1 -1
- package/dist/default-severity-rubric.d.ts.map +1 -1
- package/dist/default-severity-rubric.js +1 -1
- package/dist/default-severity-rubric.js.map +1 -1
- package/dist/endor-findings.d.ts +3 -1
- package/dist/endor-findings.d.ts.map +1 -1
- package/dist/endor-findings.js +86 -45
- package/dist/endor-findings.js.map +1 -1
- package/dist/errors.d.ts +4 -2
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +15 -4
- package/dist/errors.js.map +1 -1
- package/dist/executable-path.d.ts +3 -0
- package/dist/executable-path.d.ts.map +1 -1
- package/dist/executable-path.js +26 -0
- package/dist/executable-path.js.map +1 -1
- package/dist/external-findings-import.d.ts +5 -3
- package/dist/external-findings-import.d.ts.map +1 -1
- package/dist/external-findings-import.js +19 -7
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +69 -5
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +537 -108
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +13 -6
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +895 -1142
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +21 -2
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +130 -68
- package/dist/external-findings-read.js.map +1 -1
- package/dist/external-findings.d.ts +15 -3
- package/dist/external-findings.d.ts.map +1 -1
- package/dist/external-findings.js +54 -2
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-contract.d.ts +8 -12
- package/dist/external-import-contract.d.ts.map +1 -1
- package/dist/external-import-contract.js +51 -184
- package/dist/external-import-contract.js.map +1 -1
- package/dist/external-import-models.d.ts +1 -1
- package/dist/external-import-models.d.ts.map +1 -1
- package/dist/external-import-models.js.map +1 -1
- package/dist/feedback.d.ts.map +1 -1
- package/dist/feedback.js +5 -4
- package/dist/feedback.js.map +1 -1
- package/dist/finding-prompt.d.ts +5 -0
- package/dist/finding-prompt.d.ts.map +1 -0
- package/dist/finding-prompt.js +32 -0
- package/dist/finding-prompt.js.map +1 -0
- package/dist/findings-client.d.ts +1 -0
- package/dist/findings-client.d.ts.map +1 -1
- package/dist/findings-client.js +27 -3
- package/dist/findings-client.js.map +1 -1
- package/dist/github-advisories.d.ts.map +1 -1
- package/dist/github-advisories.js +0 -2
- package/dist/github-advisories.js.map +1 -1
- package/dist/github-dependabot-findings.d.ts.map +1 -1
- package/dist/github-dependabot-findings.js +18 -8
- package/dist/github-dependabot-findings.js.map +1 -1
- package/dist/github-findings.d.ts +4 -1
- package/dist/github-findings.d.ts.map +1 -1
- package/dist/github-findings.js +73 -316
- package/dist/github-findings.js.map +1 -1
- package/dist/hosted-git-remotes.d.ts +5 -0
- package/dist/hosted-git-remotes.d.ts.map +1 -0
- package/dist/hosted-git-remotes.js +285 -0
- package/dist/hosted-git-remotes.js.map +1 -0
- package/dist/hosted-git-repository.d.ts +28 -0
- package/dist/hosted-git-repository.d.ts.map +1 -0
- package/dist/hosted-git-repository.js +222 -0
- package/dist/hosted-git-repository.js.map +1 -0
- package/dist/hosted-remediation.d.ts +1 -0
- package/dist/hosted-remediation.d.ts.map +1 -1
- package/dist/hosted-remediation.js +23 -3
- package/dist/hosted-remediation.js.map +1 -1
- package/dist/hosted-scan-protocol.js +2 -2
- package/dist/hosted-scan-protocol.js.map +1 -1
- package/dist/hosted-scan.d.ts.map +1 -1
- package/dist/hosted-scan.js +16 -11
- package/dist/hosted-scan.js.map +1 -1
- package/dist/hosted-scanner-http.d.ts +21 -0
- package/dist/hosted-scanner-http.d.ts.map +1 -0
- package/dist/hosted-scanner-http.js +204 -0
- package/dist/hosted-scanner-http.js.map +1 -0
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +3 -0
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +21 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -3
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts.map +1 -1
- package/dist/inspector-findings.js +52 -86
- package/dist/inspector-findings.js.map +1 -1
- package/dist/knowledge-base.d.ts +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +102 -32
- package/dist/knowledge-base.js.map +1 -1
- package/dist/linear.d.ts +11 -0
- package/dist/linear.d.ts.map +1 -1
- package/dist/linear.js.map +1 -1
- package/dist/local-git-metadata.d.ts +5 -2
- package/dist/local-git-metadata.d.ts.map +1 -1
- package/dist/local-git-metadata.js +8 -5
- package/dist/local-git-metadata.js.map +1 -1
- package/dist/multiscan.d.ts +10 -4
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +217 -102
- package/dist/multiscan.js.map +1 -1
- package/dist/native-json-findings.d.ts +2 -1
- package/dist/native-json-findings.d.ts.map +1 -1
- package/dist/native-json-findings.js +12 -2
- package/dist/native-json-findings.js.map +1 -1
- package/dist/opengrep-findings.d.ts +5 -2
- package/dist/opengrep-findings.d.ts.map +1 -1
- package/dist/opengrep-findings.js +54 -33
- package/dist/opengrep-findings.js.map +1 -1
- package/dist/operation-telemetry.d.ts +104 -0
- package/dist/operation-telemetry.d.ts.map +1 -0
- package/dist/operation-telemetry.js +293 -0
- package/dist/operation-telemetry.js.map +1 -0
- package/dist/plugin-python-probe.d.ts +4 -0
- package/dist/plugin-python-probe.d.ts.map +1 -0
- package/dist/plugin-python-probe.js +10 -0
- package/dist/plugin-python-probe.js.map +1 -0
- package/dist/private-finding-import.d.ts +99 -9
- package/dist/private-finding-import.d.ts.map +1 -1
- package/dist/private-finding-import.js +116 -152
- package/dist/private-finding-import.js.map +1 -1
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +53 -13
- package/dist/project-config.js.map +1 -1
- package/dist/prompt-files.d.ts +7 -2
- package/dist/prompt-files.d.ts.map +1 -1
- package/dist/prompt-files.js +42 -20
- package/dist/prompt-files.js.map +1 -1
- package/dist/provider-profile.d.ts +1 -1
- package/dist/provider-profile.d.ts.map +1 -1
- package/dist/provider-profile.js +12 -10
- package/dist/provider-profile.js.map +1 -1
- package/dist/publication-telemetry.d.ts +45 -0
- package/dist/publication-telemetry.d.ts.map +1 -0
- package/dist/publication-telemetry.js +50 -0
- package/dist/publication-telemetry.js.map +1 -0
- package/dist/publication.d.ts +1 -1
- package/dist/publication.d.ts.map +1 -1
- package/dist/publication.js.map +1 -1
- package/dist/publish.d.ts +4 -0
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +42 -2
- package/dist/publish.js.map +1 -1
- package/dist/record.d.ts +1 -5
- package/dist/record.d.ts.map +1 -1
- package/dist/record.js +3 -51
- package/dist/record.js.map +1 -1
- package/dist/remediation.d.ts +1 -4
- package/dist/remediation.d.ts.map +1 -1
- package/dist/remediation.js +6 -8
- package/dist/remediation.js.map +1 -1
- package/dist/request-metadata.d.ts +3 -0
- package/dist/request-metadata.d.ts.map +1 -1
- package/dist/request-metadata.js +9 -0
- package/dist/request-metadata.js.map +1 -1
- package/dist/result.d.ts +4 -0
- package/dist/result.d.ts.map +1 -1
- package/dist/result.js +1 -1
- package/dist/result.js.map +1 -1
- package/dist/retry-windows-rename.d.ts +8 -0
- package/dist/retry-windows-rename.d.ts.map +1 -0
- package/dist/retry-windows-rename.js +24 -0
- package/dist/retry-windows-rename.js.map +1 -0
- package/dist/runtime.d.ts +54 -6
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +1084 -256
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +7 -1
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +269 -114
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-activity.d.ts.map +1 -1
- package/dist/scan-activity.js +141 -56
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-archive-path.d.ts +2 -0
- package/dist/scan-archive-path.d.ts.map +1 -0
- package/dist/scan-archive-path.js +5 -0
- package/dist/scan-archive-path.js.map +1 -0
- package/dist/scan-comparison.d.ts +10 -5
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +66 -17
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +7 -6
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +92 -43
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts +10 -1
- package/dist/scan-executor.d.ts.map +1 -1
- package/dist/scan-executor.js +24 -2
- package/dist/scan-executor.js.map +1 -1
- package/dist/scan-history-renderer.d.ts +1 -0
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +34 -28
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-logs.d.ts +12 -0
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +131 -78
- package/dist/scan-logs.js.map +1 -1
- package/dist/scan-measurement.d.ts +26 -0
- package/dist/scan-measurement.d.ts.map +1 -0
- package/dist/scan-measurement.js +77 -0
- package/dist/scan-measurement.js.map +1 -0
- package/dist/scan-progress.d.ts +1 -0
- package/dist/scan-progress.d.ts.map +1 -1
- package/dist/scan-progress.js +3 -0
- package/dist/scan-progress.js.map +1 -1
- package/dist/scan-sessions.d.ts.map +1 -1
- package/dist/scan-sessions.js +4 -1
- package/dist/scan-sessions.js.map +1 -1
- package/dist/scan-settings.d.ts +1 -1
- package/dist/scan-settings.d.ts.map +1 -1
- package/dist/scan-settings.js +1 -24
- package/dist/scan-settings.js.map +1 -1
- package/dist/scanner-import.d.ts +25 -13
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +216 -97
- package/dist/scanner-import.js.map +1 -1
- package/dist/scanner-repository-url.d.ts +4 -1
- package/dist/scanner-repository-url.d.ts.map +1 -1
- package/dist/scanner-repository-url.js +10 -6
- package/dist/scanner-repository-url.js.map +1 -1
- package/dist/security-policy.d.ts +1 -1
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js +26 -6
- package/dist/security-policy.js.map +1 -1
- package/dist/semgrep-findings.d.ts +6 -3
- package/dist/semgrep-findings.d.ts.map +1 -1
- package/dist/semgrep-findings.js +72 -42
- package/dist/semgrep-findings.js.map +1 -1
- package/dist/semgrep-guardian-findings.d.ts +38 -0
- package/dist/semgrep-guardian-findings.d.ts.map +1 -0
- package/dist/semgrep-guardian-findings.js +165 -0
- package/dist/semgrep-guardian-findings.js.map +1 -0
- package/dist/semgrep-platform-collector.d.ts +26 -0
- package/dist/semgrep-platform-collector.d.ts.map +1 -0
- package/dist/semgrep-platform-collector.js +108 -0
- package/dist/semgrep-platform-collector.js.map +1 -0
- package/dist/semgrep-platform-findings.d.ts +157 -6
- package/dist/semgrep-platform-findings.d.ts.map +1 -1
- package/dist/semgrep-platform-findings.js +766 -103
- package/dist/semgrep-platform-findings.js.map +1 -1
- package/dist/server/api.d.ts +1 -1
- package/dist/server/api.d.ts.map +1 -1
- package/dist/server/api.js.map +1 -1
- package/dist/server/embedding-tokenizer.cdx.json +33 -0
- package/dist/server/embedding-tokenizer.d.ts +2 -0
- package/dist/server/embedding-tokenizer.d.ts.map +1 -0
- package/dist/server/embedding-tokenizer.js +322 -0
- package/dist/server/embedding-tokenizer.js.map +6 -0
- package/dist/server/embeddings.d.ts +16 -2
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +35 -5
- package/dist/server/embeddings.js.map +1 -1
- package/dist/session-lines.d.ts +5 -0
- package/dist/session-lines.d.ts.map +1 -0
- package/dist/session-lines.js +60 -0
- package/dist/session-lines.js.map +1 -0
- package/dist/severity-review.d.ts +3 -1
- package/dist/severity-review.d.ts.map +1 -1
- package/dist/severity-review.js +3 -2
- package/dist/severity-review.js.map +1 -1
- package/dist/skill-authentication.d.ts +1 -0
- package/dist/skill-authentication.d.ts.map +1 -1
- package/dist/skill-authentication.js +1 -0
- package/dist/skill-authentication.js.map +1 -1
- package/dist/snyk-findings.d.ts +9 -2
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +90 -70
- package/dist/snyk-findings.js.map +1 -1
- package/dist/snyk-rest-findings.d.ts +59 -0
- package/dist/snyk-rest-findings.d.ts.map +1 -0
- package/dist/snyk-rest-findings.js +879 -0
- package/dist/snyk-rest-findings.js.map +1 -0
- package/dist/snyk-token-origin.d.ts +4 -0
- package/dist/snyk-token-origin.d.ts.map +1 -0
- package/dist/snyk-token-origin.js +82 -0
- package/dist/snyk-token-origin.js.map +1 -0
- package/dist/sonar-collector.d.ts.map +1 -1
- package/dist/sonar-collector.js +0 -3
- package/dist/sonar-collector.js.map +1 -1
- package/dist/sonar-findings.d.ts +1 -1
- package/dist/sonar-findings.d.ts.map +1 -1
- package/dist/sonar-findings.js +2 -4
- package/dist/sonar-findings.js.map +1 -1
- package/dist/sonar-import.d.ts +3 -0
- package/dist/sonar-import.d.ts.map +1 -1
- package/dist/sonar-import.js +30 -34
- package/dist/sonar-import.js.map +1 -1
- package/dist/stored-finding-projection.d.ts +6 -0
- package/dist/stored-finding-projection.d.ts.map +1 -0
- package/dist/stored-finding-projection.js +104 -0
- package/dist/stored-finding-projection.js.map +1 -0
- package/dist/stored-findings-publication.d.ts +23 -0
- package/dist/stored-findings-publication.d.ts.map +1 -0
- package/dist/stored-findings-publication.js +169 -0
- package/dist/stored-findings-publication.js.map +1 -0
- package/dist/target-drift.d.ts +9 -0
- package/dist/target-drift.d.ts.map +1 -0
- package/dist/target-drift.js +27 -0
- package/dist/target-drift.js.map +1 -0
- package/dist/targets.d.ts +8 -1
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +131 -42
- package/dist/targets.js.map +1 -1
- package/dist/tenable-findings.d.ts +6 -0
- package/dist/tenable-findings.d.ts.map +1 -0
- package/dist/tenable-findings.js +122 -0
- package/dist/tenable-findings.js.map +1 -0
- package/dist/terminal-stream.d.ts +13 -0
- package/dist/terminal-stream.d.ts.map +1 -0
- package/dist/terminal-stream.js +35 -0
- package/dist/terminal-stream.js.map +1 -0
- package/dist/trivy-findings.d.ts +19 -0
- package/dist/trivy-findings.d.ts.map +1 -0
- package/dist/trivy-findings.js +424 -0
- package/dist/trivy-findings.js.map +1 -0
- package/dist/trivy-import.d.ts +19 -0
- package/dist/trivy-import.d.ts.map +1 -0
- package/dist/trivy-import.js +151 -0
- package/dist/trivy-import.js.map +1 -0
- package/dist/trusted-executable.d.ts +6 -0
- package/dist/trusted-executable.d.ts.map +1 -1
- package/dist/trusted-executable.js +140 -37
- package/dist/trusted-executable.js.map +1 -1
- package/dist/validation-records.js +1 -1
- package/dist/validation-records.js.map +1 -1
- package/dist/veracode-findings.d.ts +1 -1
- package/dist/veracode-findings.d.ts.map +1 -1
- package/dist/veracode-findings.js +19 -6
- package/dist/veracode-findings.js.map +1 -1
- package/dist/version.d.ts +3 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +184 -32
- package/dist/version.js.map +1 -1
- package/dist/vertex-pricing.d.ts +8 -0
- package/dist/vertex-pricing.d.ts.map +1 -0
- package/dist/vertex-pricing.js +20 -0
- package/dist/vertex-pricing.js.map +1 -0
- package/dist/windows-path.d.ts +1 -0
- package/dist/windows-path.d.ts.map +1 -1
- package/dist/windows-path.js +26 -1
- package/dist/windows-path.js.map +1 -1
- package/dist/wiz-findings.d.ts +6 -2
- package/dist/wiz-findings.d.ts.map +1 -1
- package/dist/wiz-findings.js +65 -89
- package/dist/wiz-findings.js.map +1 -1
- package/docs/classify-severity-records.md +27 -12
- package/docs/cli.md +853 -639
- package/docs/dedupe-records.md +44 -24
- package/docs/findings-service.md +84 -44
- package/docs/hosted-remediation.md +27 -11
- package/docs/hosted-scans.md +50 -42
- package/docs/sdk.md +903 -0
- package/docs/telemetry.md +236 -0
- package/docs/validate-records.md +78 -44
- package/package.json +23 -16
- package/schemas/external-findings.schema.json +4 -1
- package/_bundled_plugin/mcp/helpers.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/helpers.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-002 +0 -0
- package/_bundled_plugin/schemas/tools/deep-reducer.schema.json +0 -96
- package/dist/external-imports-feature.d.ts +0 -6
- package/dist/external-imports-feature.d.ts.map +0 -1
- package/dist/external-imports-feature.js +0 -51
- package/dist/external-imports-feature.js.map +0 -1
- package/dist/finding-normalization.d.ts +0 -5
- package/dist/finding-normalization.d.ts.map +0 -1
- package/dist/finding-normalization.js +0 -155
- package/dist/finding-normalization.js.map +0 -1
- package/dist/reader-selection.d.ts +0 -13
- package/dist/reader-selection.d.ts.map +0 -1
- package/dist/reader-selection.js +0 -81
- package/dist/reader-selection.js.map +0 -1
package/dist/scan-logs.js
CHANGED
|
@@ -1,13 +1,27 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { basename, dirname, join, relative } from "node:path";
|
|
3
|
-
import { createInterface } from "node:readline";
|
|
4
|
-
import { pipeline } from "node:stream";
|
|
1
|
+
import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
|
|
5
2
|
import { isDeepStrictEqual } from "node:util";
|
|
6
|
-
import
|
|
3
|
+
import { firstNativeSessionLine, sessionLines } from "./session-lines.js";
|
|
4
|
+
import { parseJson } from "./value.js";
|
|
7
5
|
import { isRecord } from "./record.js";
|
|
8
6
|
import { sessionFiles } from "./cost.js";
|
|
9
7
|
import { CodexSecurityError } from "./errors.js";
|
|
10
8
|
import { isScanArtifactDirectory, sessionOwnsTurn, sessionParentThreadId, sessionStartedAt, } from "./scan-sessions.js";
|
|
9
|
+
import { compareTimestamps } from "./timestamps.js";
|
|
10
|
+
import { shortArchivePrefix } from "./scan-archive-path.js";
|
|
11
|
+
export function savedScanLogBoundaries(scan) {
|
|
12
|
+
const status = scan.progress?.status;
|
|
13
|
+
const terminal = status === "complete" || status === "failed" || status === "canceled";
|
|
14
|
+
return {
|
|
15
|
+
// Legacy completion still bounds inferred workers, but cannot identify the
|
|
16
|
+
// final scan turn when sealed artifacts were completed before a resume.
|
|
17
|
+
completedAt: status === "running"
|
|
18
|
+
? null
|
|
19
|
+
: terminal
|
|
20
|
+
? (scan.lifecycle?.finishedAt ?? scan.progress?.updatedAt ?? "")
|
|
21
|
+
: "",
|
|
22
|
+
logCompletedAt: terminal ? (scan.logCompletedAt ?? null) : null,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
11
25
|
export function readSavedScanLogs(scan, codexHome, options = {}) {
|
|
12
26
|
const threadId = scan.continuationThreadId;
|
|
13
27
|
if (!threadId && !options.allowMissingRoot) {
|
|
@@ -21,37 +35,29 @@ export function readSavedScanLogs(scan, codexHome, options = {}) {
|
|
|
21
35
|
codexHome,
|
|
22
36
|
allowMissingRoot: options.allowMissingRoot,
|
|
23
37
|
scanDirectory: scan.mode === "deep" ? scan.scanDir : undefined,
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
: scan.progress?.status === "complete" ||
|
|
27
|
-
scan.progress?.status === "failed" ||
|
|
28
|
-
scan.progress?.status === "canceled"
|
|
29
|
-
? (scan.progress.updatedAt ?? "")
|
|
30
|
-
: "",
|
|
38
|
+
startedAt: scan.lifecycle?.startedAt,
|
|
39
|
+
...savedScanLogBoundaries(scan),
|
|
31
40
|
});
|
|
32
41
|
}
|
|
33
|
-
// Codex can compress cold rollouts to `.jsonl.zst`. Node 22.13 and 22.14 lack
|
|
34
|
-
// zstd, so they still read plain rollouts only.
|
|
35
|
-
const readsCompressedSessions = typeof zlib.createZstdDecompress === "function";
|
|
36
42
|
async function* scanSessions(codexHome, directory = "sessions") {
|
|
37
|
-
for await (const path of sessionFiles(join(codexHome, directory),
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
43
|
+
for await (const path of sessionFiles(join(codexHome, directory), true)) {
|
|
44
|
+
const first = await firstSessionEvent(path);
|
|
45
|
+
if (first?.["type"] !== "session_meta" || !isRecord(first["payload"]))
|
|
46
|
+
continue;
|
|
47
|
+
const metadata = first["payload"];
|
|
48
|
+
const threadId = metadata["id"];
|
|
49
|
+
if (typeof threadId !== "string")
|
|
50
|
+
continue;
|
|
51
|
+
yield {
|
|
52
|
+
threadId,
|
|
53
|
+
parentThreadId: sessionParentThreadId(metadata),
|
|
54
|
+
startedAt: sessionStartedAt(metadata["timestamp"]),
|
|
55
|
+
timestamp: typeof metadata["timestamp"] === "string"
|
|
56
|
+
? metadata["timestamp"]
|
|
57
|
+
: null,
|
|
58
|
+
workingDirectory: typeof metadata["cwd"] === "string" ? metadata["cwd"] : null,
|
|
59
|
+
path,
|
|
60
|
+
};
|
|
55
61
|
}
|
|
56
62
|
}
|
|
57
63
|
export async function findScanSession(codexHome, threadId) {
|
|
@@ -81,7 +87,9 @@ export async function readScanLogs(options) {
|
|
|
81
87
|
if (root === undefined && !options.allowMissingRoot) {
|
|
82
88
|
throw new CodexSecurityError(`No saved session logs are available for scan ${options.scanId}.`);
|
|
83
89
|
}
|
|
84
|
-
|
|
90
|
+
const startsAfterCompletion = (timestamp) => typeof options.logCompletedAt === "string" &&
|
|
91
|
+
typeof timestamp === "string" &&
|
|
92
|
+
compareTimestamps(timestamp, options.logCompletedAt) >= 0;
|
|
85
93
|
const included = new Set([
|
|
86
94
|
...(options.threadId ? [options.threadId] : []),
|
|
87
95
|
...(options.threadIds ?? []),
|
|
@@ -90,19 +98,70 @@ export async function readScanLogs(options) {
|
|
|
90
98
|
// A Desktop owner can contain other work. Include its log without treating
|
|
91
99
|
// the whole conversation tree as part of this scan.
|
|
92
100
|
const traversed = new Set(options.executionThreadIds ?? included);
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
+
const children = Map.groupBy(logs.values().map(([session]) => session), (session) => session.parentThreadId);
|
|
102
|
+
// Comparisons have no spawn edge. The saved scan window also works for a
|
|
103
|
+
// shared Desktop owner, whose unrelated child threads must stay excluded.
|
|
104
|
+
const startedAt = options.startedAt === undefined
|
|
105
|
+
? root && traversed.has(root.threadId)
|
|
106
|
+
? root.startedAt
|
|
107
|
+
: null
|
|
108
|
+
: sessionStartedAt(options.startedAt);
|
|
109
|
+
if (options.scanDirectory && startedAt !== null) {
|
|
110
|
+
const directories = [options.scanDirectory];
|
|
111
|
+
const name = basename(options.scanDirectory);
|
|
112
|
+
const parent = dirname(options.scanDirectory);
|
|
113
|
+
const originals = new Set();
|
|
114
|
+
for (const marker of name.matchAll(/\.previous-/g)) {
|
|
115
|
+
if (marker.index)
|
|
116
|
+
originals.add(join(parent, name.slice(0, marker.index)));
|
|
117
|
+
}
|
|
118
|
+
if (name.startsWith(".previous-")) {
|
|
119
|
+
// A short archive has no readable source name. Only already-bound
|
|
120
|
+
// sessions can supply a sibling whose complete filename matches its hash.
|
|
121
|
+
const boundCwds = [
|
|
122
|
+
root?.workingDirectory,
|
|
123
|
+
...Array.from(traversed, (id) => logs.get(id)?.[0].workingDirectory),
|
|
124
|
+
];
|
|
125
|
+
for (const cwd of boundCwds) {
|
|
126
|
+
if (!cwd)
|
|
127
|
+
continue;
|
|
128
|
+
const path = relative(parent, cwd);
|
|
129
|
+
const sibling = path.split(sep, 1)[0];
|
|
130
|
+
if (sibling &&
|
|
131
|
+
sibling !== ".." &&
|
|
132
|
+
!isAbsolute(path) &&
|
|
133
|
+
name.startsWith(shortArchivePrefix(sibling))) {
|
|
134
|
+
originals.add(join(parent, sibling));
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
for (const original of originals) {
|
|
139
|
+
// A Desktop owner can work outside the scan directory. Its registered
|
|
140
|
+
// workers provide the same binding after archiving the output.
|
|
141
|
+
if ((root?.workingDirectory != null &&
|
|
142
|
+
relative(original, root.workingDirectory) === "") ||
|
|
143
|
+
Array.from(traversed).some((threadId) => {
|
|
144
|
+
const cwd = logs.get(threadId)?.[0].workingDirectory;
|
|
145
|
+
return cwd != null && isScanArtifactDirectory(original, cwd);
|
|
146
|
+
}))
|
|
147
|
+
directories.push(original);
|
|
148
|
+
}
|
|
149
|
+
for (const session of children.get(null) ?? []) {
|
|
150
|
+
if (session !== root &&
|
|
151
|
+
belongsToScan(session, directories, startedAt, options)) {
|
|
101
152
|
included.add(session.threadId);
|
|
102
153
|
traversed.add(session.threadId);
|
|
103
154
|
}
|
|
104
155
|
}
|
|
105
156
|
}
|
|
157
|
+
for (const parentId of traversed) {
|
|
158
|
+
for (const session of children.get(parentId) ?? []) {
|
|
159
|
+
if (startsAfterCompletion(session.timestamp))
|
|
160
|
+
continue;
|
|
161
|
+
included.add(session.threadId);
|
|
162
|
+
traversed.add(session.threadId);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
106
165
|
const sessions = [];
|
|
107
166
|
for (const threadId of included) {
|
|
108
167
|
const copies = logs.get(threadId);
|
|
@@ -116,6 +175,8 @@ export async function readScanLogs(options) {
|
|
|
116
175
|
sessions.push(session);
|
|
117
176
|
}
|
|
118
177
|
const events = [];
|
|
178
|
+
// Recorded completion can precede the scan turn's final response. Keep that
|
|
179
|
+
// turn's remaining events, then stop before a post-completion turn starts.
|
|
119
180
|
for (const session of sessions) {
|
|
120
181
|
let replaying = false;
|
|
121
182
|
for await (const event of sessionEvents(session.path)) {
|
|
@@ -123,15 +184,16 @@ export async function readScanLogs(options) {
|
|
|
123
184
|
if (event["type"] === "session_meta" && isRecord(payload)) {
|
|
124
185
|
replaying = payload["id"] !== session.threadId;
|
|
125
186
|
}
|
|
187
|
+
const taskStarted = event["type"] === "event_msg" &&
|
|
188
|
+
isRecord(payload) &&
|
|
189
|
+
payload["type"] === "task_started";
|
|
126
190
|
if (replaying) {
|
|
127
|
-
if (
|
|
128
|
-
!isRecord(payload) ||
|
|
129
|
-
payload["type"] !== "task_started" ||
|
|
130
|
-
!sessionOwnsTurn(session, payload)) {
|
|
191
|
+
if (!taskStarted || !sessionOwnsTurn(session, payload))
|
|
131
192
|
continue;
|
|
132
|
-
}
|
|
133
193
|
replaying = false;
|
|
134
194
|
}
|
|
195
|
+
if (taskStarted && startsAfterCompletion(event["timestamp"]))
|
|
196
|
+
break;
|
|
135
197
|
events.push({ threadId: session.threadId, event });
|
|
136
198
|
}
|
|
137
199
|
}
|
|
@@ -146,30 +208,19 @@ export async function readScanLogs(options) {
|
|
|
146
208
|
events,
|
|
147
209
|
};
|
|
148
210
|
}
|
|
149
|
-
function belongsToScan(session,
|
|
150
|
-
|
|
151
|
-
if (scanDirectory === undefined ||
|
|
152
|
-
session.workingDirectory === null ||
|
|
153
|
-
root.startedAt === null ||
|
|
211
|
+
function belongsToScan(session, directories, startedAt, options) {
|
|
212
|
+
if (session.workingDirectory === null ||
|
|
154
213
|
session.startedAt === null ||
|
|
155
|
-
session.startedAt <
|
|
214
|
+
session.startedAt < startedAt) {
|
|
156
215
|
return false;
|
|
157
216
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
const
|
|
165
|
-
const name = basename(scanDirectory);
|
|
166
|
-
const marker = name.lastIndexOf(".previous-");
|
|
167
|
-
if (marker > 0 &&
|
|
168
|
-
root.workingDirectory !== null &&
|
|
169
|
-
relative(join(dirname(scanDirectory), name.slice(0, marker)), root.workingDirectory) === "") {
|
|
170
|
-
roots.push(root.workingDirectory);
|
|
171
|
-
}
|
|
172
|
-
for (const directoryRoot of roots) {
|
|
217
|
+
const beforeCompletion = typeof options.logCompletedAt === "string" && session.timestamp !== null
|
|
218
|
+
? compareTimestamps(session.timestamp, options.logCompletedAt) < 0
|
|
219
|
+
: options.completedAt == null ||
|
|
220
|
+
session.startedAt < Date.parse(options.completedAt);
|
|
221
|
+
if (!beforeCompletion)
|
|
222
|
+
return false;
|
|
223
|
+
for (const directoryRoot of directories) {
|
|
173
224
|
if (isScanArtifactDirectory(directoryRoot, session.workingDirectory)) {
|
|
174
225
|
return true;
|
|
175
226
|
}
|
|
@@ -192,14 +243,20 @@ async function extendsSessionLog(previousPath, path) {
|
|
|
192
243
|
await events.return(undefined);
|
|
193
244
|
}
|
|
194
245
|
}
|
|
246
|
+
async function firstSessionEvent(path) {
|
|
247
|
+
const line = await firstNativeSessionLine(path);
|
|
248
|
+
if (line !== undefined) {
|
|
249
|
+
const event = parseJson(() => line);
|
|
250
|
+
if (isRecord(event))
|
|
251
|
+
return event;
|
|
252
|
+
}
|
|
253
|
+
// Also handles metadata split across frames and malformed prefix lines.
|
|
254
|
+
for await (const event of sessionEvents(path))
|
|
255
|
+
return event;
|
|
256
|
+
}
|
|
195
257
|
async function* sessionEvents(path) {
|
|
196
|
-
const file = createReadStream(path);
|
|
197
|
-
const stream = path.endsWith(".zst")
|
|
198
|
-
? pipeline(file, zlib.createZstdDecompress(), () => { })
|
|
199
|
-
: file;
|
|
200
|
-
const lines = createInterface({ input: stream, crlfDelay: Infinity });
|
|
201
258
|
try {
|
|
202
|
-
for await (const line of
|
|
259
|
+
for await (const line of sessionLines(path)) {
|
|
203
260
|
if (line.trim() === "")
|
|
204
261
|
continue;
|
|
205
262
|
try {
|
|
@@ -216,9 +273,5 @@ async function* sessionEvents(path) {
|
|
|
216
273
|
if (error.code !== "ENOENT")
|
|
217
274
|
throw error;
|
|
218
275
|
}
|
|
219
|
-
finally {
|
|
220
|
-
lines.close();
|
|
221
|
-
stream.destroy();
|
|
222
|
-
}
|
|
223
276
|
}
|
|
224
277
|
//# sourceMappingURL=scan-logs.js.map
|
package/dist/scan-logs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-logs.js","sourceRoot":"","sources":["../src/scan-logs.ts"],"names":[],"mappings":"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","sourcesContent":["import { createReadStream } from \"node:fs\";\nimport { basename, dirname, join, relative } from \"node:path\";\nimport { createInterface } from \"node:readline\";\nimport { pipeline } from \"node:stream\";\nimport { isDeepStrictEqual } from \"node:util\";\nimport zlib from \"node:zlib\";\nimport { isRecord } from \"./record.js\";\nimport { sessionFiles } from \"./cost.js\";\nimport { CodexSecurityError } from \"./errors.js\";\nimport type { JsonObject } from \"./config.js\";\nimport {\n isScanArtifactDirectory,\n sessionOwnsTurn,\n sessionParentThreadId,\n sessionStartedAt,\n} from \"./scan-sessions.js\";\n\ninterface ScanLogOptions {\n scanId: string;\n threadId?: string;\n threadIds?: readonly string[];\n executionThreadIds?: readonly string[];\n codexHome: string | readonly string[];\n scanDirectory?: string;\n completedAt?: string | null;\n allowMissingRoot?: boolean;\n}\n\nexport type ScanLogSource = JsonObject & {\n scanId: string;\n continuationThreadId?: string;\n threadIds?: string[];\n executionThreadIds?: string[];\n mode?: string;\n scanDir?: string;\n progress?: { status?: string; updatedAt?: string };\n};\n\nexport function readSavedScanLogs(\n scan: ScanLogSource,\n codexHome: string | readonly string[],\n options: { allowMissingRoot?: boolean } = {},\n) {\n const threadId = scan.continuationThreadId;\n if (!threadId && !options.allowMissingRoot) {\n throw new CodexSecurityError(\n `No session is associated with scan ${scan.scanId}.`,\n );\n }\n return readScanLogs({\n scanId: scan.scanId,\n threadId: threadId ?? scan.threadIds?.[0],\n threadIds: scan.threadIds,\n executionThreadIds: scan.executionThreadIds ?? [],\n codexHome,\n allowMissingRoot: options.allowMissingRoot,\n scanDirectory: scan.mode === \"deep\" ? scan.scanDir : undefined,\n completedAt:\n scan.progress?.status === \"running\"\n ? null\n : scan.progress?.status === \"complete\" ||\n scan.progress?.status === \"failed\" ||\n scan.progress?.status === \"canceled\"\n ? (scan.progress.updatedAt ?? \"\")\n : \"\",\n });\n}\n\n// Codex can compress cold rollouts to `.jsonl.zst`. Node 22.13 and 22.14 lack\n// zstd, so they still read plain rollouts only.\nconst readsCompressedSessions = typeof zlib.createZstdDecompress === \"function\";\n\ntype SessionLog = NonNullable<Awaited<ReturnType<typeof findScanSession>>>;\n\nasync function* scanSessions(codexHome: string, directory = \"sessions\") {\n for await (const path of sessionFiles(\n join(codexHome, directory),\n readsCompressedSessions,\n )) {\n for await (const first of sessionEvents(path)) {\n if (first[\"type\"] !== \"session_meta\" || !isRecord(first[\"payload\"])) {\n break;\n }\n const metadata = first[\"payload\"];\n const threadId = metadata[\"id\"];\n if (typeof threadId !== \"string\") break;\n yield {\n threadId,\n parentThreadId: sessionParentThreadId(metadata),\n startedAt: sessionStartedAt(metadata[\"timestamp\"]),\n workingDirectory:\n typeof metadata[\"cwd\"] === \"string\" ? metadata[\"cwd\"] : null,\n path,\n };\n break;\n }\n }\n}\n\nexport async function findScanSession(codexHome: string, threadId: string) {\n for await (const session of scanSessions(codexHome)) {\n if (session.threadId === threadId) return session;\n }\n return null;\n}\n\nexport async function readScanLogs(options: ScanLogOptions) {\n const logs = new Map<string, [SessionLog, ...SessionLog[]]>();\n const homes = new Set(\n typeof options.codexHome === \"string\"\n ? [options.codexHome]\n : options.codexHome,\n );\n for (const directory of [\"sessions\", \"archived_sessions\"]) {\n for (const home of homes) {\n for await (const session of scanSessions(home, directory)) {\n const copies = logs.get(session.threadId);\n if (copies === undefined) logs.set(session.threadId, [session]);\n else copies.push(session);\n }\n }\n }\n\n const root = options.threadId ? logs.get(options.threadId)?.[0] : undefined;\n if (root === undefined && !options.allowMissingRoot) {\n throw new CodexSecurityError(\n `No saved session logs are available for scan ${options.scanId}.`,\n );\n }\n let children: Map<string | undefined, SessionLog[]> | undefined;\n\n const included = new Set([\n ...(options.threadId ? [options.threadId] : []),\n ...(options.threadIds ?? []),\n ...(options.executionThreadIds ?? []),\n ]);\n // A Desktop owner can contain other work. Include its log without treating\n // the whole conversation tree as part of this scan.\n const traversed = new Set(options.executionThreadIds ?? included);\n for (const parentId of traversed) {\n const parent = logs.get(parentId)?.[0];\n // Parentless workers can only belong to the root, in discovery order.\n children ??= Map.groupBy(\n logs.values().map(([session]) => session),\n (session) => session.parentThreadId ?? root?.threadId,\n );\n for (const session of children.get(parentId) ?? []) {\n if (\n !traversed.has(session.threadId) &&\n (session.parentThreadId === parentId ||\n (parent !== undefined && belongsToScan(session, parent, options)))\n ) {\n included.add(session.threadId);\n traversed.add(session.threadId);\n }\n }\n }\n const sessions: SessionLog[] = [];\n for (const threadId of included) {\n const copies = logs.get(threadId);\n if (copies === undefined) continue;\n let session = copies[0];\n for (const copy of copies.slice(1)) {\n if (await extendsSessionLog(session.path, copy.path)) session = copy;\n }\n sessions.push(session);\n }\n const events: Record<string, unknown>[] = [];\n for (const session of sessions) {\n let replaying = false;\n for await (const event of sessionEvents(session.path)) {\n const payload = event[\"payload\"];\n if (event[\"type\"] === \"session_meta\" && isRecord(payload)) {\n replaying = payload[\"id\"] !== session.threadId;\n }\n if (replaying) {\n if (\n event[\"type\"] !== \"event_msg\" ||\n !isRecord(payload) ||\n payload[\"type\"] !== \"task_started\" ||\n !sessionOwnsTurn(session, payload)\n ) {\n continue;\n }\n replaying = false;\n }\n events.push({ threadId: session.threadId, event });\n }\n }\n\n return {\n scanId: options.scanId,\n threadId: options.threadId ?? null,\n sessions: sessions.map(({ threadId, parentThreadId, path }) => ({\n threadId,\n parentThreadId,\n path,\n })),\n events,\n };\n}\n\nfunction belongsToScan(\n session: SessionLog,\n root: SessionLog,\n options: ScanLogOptions,\n): boolean {\n const { scanDirectory, completedAt } = options;\n if (\n scanDirectory === undefined ||\n session.workingDirectory === null ||\n root.startedAt === null ||\n session.startedAt === null ||\n session.startedAt < root.startedAt\n ) {\n return false;\n }\n if (completedAt !== undefined && completedAt !== null) {\n const completed = Date.parse(completedAt);\n if (!Number.isFinite(completed) || session.startedAt >= completed) {\n return false;\n }\n }\n\n const roots = [scanDirectory];\n const name = basename(scanDirectory);\n const marker = name.lastIndexOf(\".previous-\");\n if (\n marker > 0 &&\n root.workingDirectory !== null &&\n relative(\n join(dirname(scanDirectory), name.slice(0, marker)),\n root.workingDirectory,\n ) === \"\"\n ) {\n roots.push(root.workingDirectory);\n }\n\n for (const directoryRoot of roots) {\n if (isScanArtifactDirectory(directoryRoot, session.workingDirectory)) {\n return true;\n }\n }\n return false;\n}\n\n// Prefer a longer copy only when it preserves every event in the earlier copy.\n// Identical or divergent copies keep the existing home/archive precedence.\nasync function extendsSessionLog(\n previousPath: string,\n path: string,\n): Promise<boolean> {\n const events = sessionEvents(path);\n try {\n for await (const previous of sessionEvents(previousPath)) {\n const next = await events.next();\n if (next.done || !isDeepStrictEqual(previous, next.value)) return false;\n }\n return !(await events.next()).done;\n } finally {\n await events.return(undefined);\n }\n}\n\nasync function* sessionEvents(\n path: string,\n): AsyncGenerator<Record<string, unknown>> {\n const file = createReadStream(path);\n const stream = path.endsWith(\".zst\")\n ? pipeline(file, zlib.createZstdDecompress(), () => {})\n : file;\n const lines = createInterface({ input: stream, crlfDelay: Infinity });\n try {\n for await (const line of lines) {\n if (line.trim() === \"\") continue;\n try {\n const event: unknown = JSON.parse(line);\n if (isRecord(event)) yield event;\n } catch {\n continue;\n }\n }\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code !== \"ENOENT\") throw error;\n } finally {\n lines.close();\n stream.destroy();\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"scan-logs.js","sourceRoot":"","sources":["../src/scan-logs.ts"],"names":[],"mappings":"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","sourcesContent":["import { basename, dirname, isAbsolute, join, relative, sep } from \"node:path\";\nimport { isDeepStrictEqual } from \"node:util\";\nimport { firstNativeSessionLine, sessionLines } from \"./session-lines.js\";\nimport { parseJson } from \"./value.js\";\nimport { isRecord } from \"./record.js\";\nimport { sessionFiles } from \"./cost.js\";\nimport { CodexSecurityError } from \"./errors.js\";\nimport type { JsonObject } from \"./config.js\";\nimport {\n isScanArtifactDirectory,\n sessionOwnsTurn,\n sessionParentThreadId,\n sessionStartedAt,\n} from \"./scan-sessions.js\";\nimport { compareTimestamps } from \"./timestamps.js\";\nimport { shortArchivePrefix } from \"./scan-archive-path.js\";\n\ninterface ScanLogOptions {\n scanId: string;\n threadId?: string;\n threadIds?: readonly string[];\n executionThreadIds?: readonly string[];\n codexHome: string | readonly string[];\n scanDirectory?: string;\n startedAt?: string;\n completedAt?: string | null;\n logCompletedAt?: string | null;\n allowMissingRoot?: boolean;\n}\n\nexport type ScanLogSource = JsonObject & {\n scanId: string;\n continuationThreadId?: string;\n threadIds?: string[];\n executionThreadIds?: string[];\n mode?: string;\n scanDir?: string;\n logCompletedAt?: string | null;\n lifecycle?: { startedAt: string; finishedAt?: string | null };\n progress?: { status?: string; updatedAt?: string };\n};\n\nexport function savedScanLogBoundaries(scan: ScanLogSource) {\n const status = scan.progress?.status;\n const terminal =\n status === \"complete\" || status === \"failed\" || status === \"canceled\";\n return {\n // Legacy completion still bounds inferred workers, but cannot identify the\n // final scan turn when sealed artifacts were completed before a resume.\n completedAt:\n status === \"running\"\n ? null\n : terminal\n ? (scan.lifecycle?.finishedAt ?? scan.progress?.updatedAt ?? \"\")\n : \"\",\n logCompletedAt: terminal ? (scan.logCompletedAt ?? null) : null,\n };\n}\n\nexport function readSavedScanLogs(\n scan: ScanLogSource,\n codexHome: string | readonly string[],\n options: { allowMissingRoot?: boolean } = {},\n) {\n const threadId = scan.continuationThreadId;\n if (!threadId && !options.allowMissingRoot) {\n throw new CodexSecurityError(\n `No session is associated with scan ${scan.scanId}.`,\n );\n }\n return readScanLogs({\n scanId: scan.scanId,\n threadId: threadId ?? scan.threadIds?.[0],\n threadIds: scan.threadIds,\n executionThreadIds: scan.executionThreadIds ?? [],\n codexHome,\n allowMissingRoot: options.allowMissingRoot,\n scanDirectory: scan.mode === \"deep\" ? scan.scanDir : undefined,\n startedAt: scan.lifecycle?.startedAt,\n ...savedScanLogBoundaries(scan),\n });\n}\n\ntype SessionLog = NonNullable<Awaited<ReturnType<typeof findScanSession>>>;\n\nasync function* scanSessions(codexHome: string, directory = \"sessions\") {\n for await (const path of sessionFiles(join(codexHome, directory), true)) {\n const first = await firstSessionEvent(path);\n if (first?.[\"type\"] !== \"session_meta\" || !isRecord(first[\"payload\"]))\n continue;\n const metadata = first[\"payload\"];\n const threadId = metadata[\"id\"];\n if (typeof threadId !== \"string\") continue;\n yield {\n threadId,\n parentThreadId: sessionParentThreadId(metadata),\n startedAt: sessionStartedAt(metadata[\"timestamp\"]),\n timestamp:\n typeof metadata[\"timestamp\"] === \"string\"\n ? metadata[\"timestamp\"]\n : null,\n workingDirectory:\n typeof metadata[\"cwd\"] === \"string\" ? metadata[\"cwd\"] : null,\n path,\n };\n }\n}\n\nexport async function findScanSession(codexHome: string, threadId: string) {\n for await (const session of scanSessions(codexHome)) {\n if (session.threadId === threadId) return session;\n }\n return null;\n}\n\nexport async function readScanLogs(options: ScanLogOptions) {\n const logs = new Map<string, [SessionLog, ...SessionLog[]]>();\n const homes = new Set(\n typeof options.codexHome === \"string\"\n ? [options.codexHome]\n : options.codexHome,\n );\n for (const directory of [\"sessions\", \"archived_sessions\"]) {\n for (const home of homes) {\n for await (const session of scanSessions(home, directory)) {\n const copies = logs.get(session.threadId);\n if (copies === undefined) logs.set(session.threadId, [session]);\n else copies.push(session);\n }\n }\n }\n\n const root = options.threadId ? logs.get(options.threadId)?.[0] : undefined;\n if (root === undefined && !options.allowMissingRoot) {\n throw new CodexSecurityError(\n `No saved session logs are available for scan ${options.scanId}.`,\n );\n }\n\n const startsAfterCompletion = (timestamp: unknown) =>\n typeof options.logCompletedAt === \"string\" &&\n typeof timestamp === \"string\" &&\n compareTimestamps(timestamp, options.logCompletedAt) >= 0;\n\n const included = new Set([\n ...(options.threadId ? [options.threadId] : []),\n ...(options.threadIds ?? []),\n ...(options.executionThreadIds ?? []),\n ]);\n // A Desktop owner can contain other work. Include its log without treating\n // the whole conversation tree as part of this scan.\n const traversed = new Set(options.executionThreadIds ?? included);\n const children = Map.groupBy(\n logs.values().map(([session]) => session),\n (session) => session.parentThreadId,\n );\n // Comparisons have no spawn edge. The saved scan window also works for a\n // shared Desktop owner, whose unrelated child threads must stay excluded.\n const startedAt =\n options.startedAt === undefined\n ? root && traversed.has(root.threadId)\n ? root.startedAt\n : null\n : sessionStartedAt(options.startedAt);\n if (options.scanDirectory && startedAt !== null) {\n const directories = [options.scanDirectory];\n const name = basename(options.scanDirectory);\n const parent = dirname(options.scanDirectory);\n const originals = new Set<string>();\n for (const marker of name.matchAll(/\\.previous-/g)) {\n if (marker.index)\n originals.add(join(parent, name.slice(0, marker.index)));\n }\n if (name.startsWith(\".previous-\")) {\n // A short archive has no readable source name. Only already-bound\n // sessions can supply a sibling whose complete filename matches its hash.\n const boundCwds = [\n root?.workingDirectory,\n ...Array.from(traversed, (id) => logs.get(id)?.[0].workingDirectory),\n ];\n for (const cwd of boundCwds) {\n if (!cwd) continue;\n const path = relative(parent, cwd);\n const sibling = path.split(sep, 1)[0];\n if (\n sibling &&\n sibling !== \"..\" &&\n !isAbsolute(path) &&\n name.startsWith(shortArchivePrefix(sibling))\n ) {\n originals.add(join(parent, sibling));\n }\n }\n }\n for (const original of originals) {\n // A Desktop owner can work outside the scan directory. Its registered\n // workers provide the same binding after archiving the output.\n if (\n (root?.workingDirectory != null &&\n relative(original, root.workingDirectory) === \"\") ||\n Array.from(traversed).some((threadId) => {\n const cwd = logs.get(threadId)?.[0].workingDirectory;\n return cwd != null && isScanArtifactDirectory(original, cwd);\n })\n )\n directories.push(original);\n }\n for (const session of children.get(null) ?? []) {\n if (\n session !== root &&\n belongsToScan(session, directories, startedAt, options)\n ) {\n included.add(session.threadId);\n traversed.add(session.threadId);\n }\n }\n }\n for (const parentId of traversed) {\n for (const session of children.get(parentId) ?? []) {\n if (startsAfterCompletion(session.timestamp)) continue;\n included.add(session.threadId);\n traversed.add(session.threadId);\n }\n }\n const sessions: SessionLog[] = [];\n for (const threadId of included) {\n const copies = logs.get(threadId);\n if (copies === undefined) continue;\n let session = copies[0];\n for (const copy of copies.slice(1)) {\n if (await extendsSessionLog(session.path, copy.path)) session = copy;\n }\n sessions.push(session);\n }\n const events: Record<string, unknown>[] = [];\n // Recorded completion can precede the scan turn's final response. Keep that\n // turn's remaining events, then stop before a post-completion turn starts.\n for (const session of sessions) {\n let replaying = false;\n for await (const event of sessionEvents(session.path)) {\n const payload = event[\"payload\"];\n if (event[\"type\"] === \"session_meta\" && isRecord(payload)) {\n replaying = payload[\"id\"] !== session.threadId;\n }\n const taskStarted =\n event[\"type\"] === \"event_msg\" &&\n isRecord(payload) &&\n payload[\"type\"] === \"task_started\";\n if (replaying) {\n if (!taskStarted || !sessionOwnsTurn(session, payload)) continue;\n replaying = false;\n }\n if (taskStarted && startsAfterCompletion(event[\"timestamp\"])) break;\n events.push({ threadId: session.threadId, event });\n }\n }\n\n return {\n scanId: options.scanId,\n threadId: options.threadId ?? null,\n sessions: sessions.map(({ threadId, parentThreadId, path }) => ({\n threadId,\n parentThreadId,\n path,\n })),\n events,\n };\n}\n\nfunction belongsToScan(\n session: SessionLog,\n directories: string[],\n startedAt: number,\n options: ScanLogOptions,\n): boolean {\n if (\n session.workingDirectory === null ||\n session.startedAt === null ||\n session.startedAt < startedAt\n ) {\n return false;\n }\n const beforeCompletion =\n typeof options.logCompletedAt === \"string\" && session.timestamp !== null\n ? compareTimestamps(session.timestamp, options.logCompletedAt) < 0\n : options.completedAt == null ||\n session.startedAt < Date.parse(options.completedAt);\n if (!beforeCompletion) return false;\n\n for (const directoryRoot of directories) {\n if (isScanArtifactDirectory(directoryRoot, session.workingDirectory)) {\n return true;\n }\n }\n return false;\n}\n\n// Prefer a longer copy only when it preserves every event in the earlier copy.\n// Identical or divergent copies keep the existing home/archive precedence.\nasync function extendsSessionLog(\n previousPath: string,\n path: string,\n): Promise<boolean> {\n const events = sessionEvents(path);\n try {\n for await (const previous of sessionEvents(previousPath)) {\n const next = await events.next();\n if (next.done || !isDeepStrictEqual(previous, next.value)) return false;\n }\n return !(await events.next()).done;\n } finally {\n await events.return(undefined);\n }\n}\n\nasync function firstSessionEvent(path: string) {\n const line = await firstNativeSessionLine(path);\n if (line !== undefined) {\n const event = parseJson(() => line);\n if (isRecord(event)) return event;\n }\n // Also handles metadata split across frames and malformed prefix lines.\n for await (const event of sessionEvents(path)) return event;\n}\n\nasync function* sessionEvents(\n path: string,\n): AsyncGenerator<Record<string, unknown>> {\n try {\n for await (const line of sessionLines(path)) {\n if (line.trim() === \"\") continue;\n try {\n const event: unknown = JSON.parse(line);\n if (isRecord(event)) yield event;\n } catch {\n continue;\n }\n }\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code !== \"ENOENT\") throw error;\n }\n}\n"]}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { type ScanUsageMeasurement } from "./cost.js";
|
|
2
|
+
import { type ScanPricingContext } from "./cost-model.js";
|
|
3
|
+
export declare function measurementFromUsage(value: unknown, model: string, pricingContext?: ScanPricingContext): ScanUsageMeasurement;
|
|
4
|
+
/** Only for disjoint stage invocations, not cumulative observations of one thread. */
|
|
5
|
+
export declare function combineMeasurements(values: readonly Readonly<ScanUsageMeasurement>[], model: string, pricingContext?: ScanPricingContext): ScanUsageMeasurement;
|
|
6
|
+
/** Workbench envelope keeps usage even when the selected model has no price. */
|
|
7
|
+
export declare function measuredScanCost(measurement: Readonly<ScanUsageMeasurement> | null): {
|
|
8
|
+
usage: {
|
|
9
|
+
source: string;
|
|
10
|
+
coverage: "complete" | "partial" | "unavailable";
|
|
11
|
+
observedAt: string;
|
|
12
|
+
threadCount: number;
|
|
13
|
+
missingThreadCount: number;
|
|
14
|
+
warnings?: string[] | undefined;
|
|
15
|
+
coverageScope?: string[] | undefined;
|
|
16
|
+
inputTokens: number;
|
|
17
|
+
cachedInputTokens: number;
|
|
18
|
+
cacheWriteInputTokens: number;
|
|
19
|
+
cacheWriteInputTokensReported?: boolean | undefined;
|
|
20
|
+
outputTokens: number;
|
|
21
|
+
reasoningOutputTokens: number;
|
|
22
|
+
totalTokens: number;
|
|
23
|
+
};
|
|
24
|
+
cost?: Readonly<import("./cost-model.js").ScanCost> | undefined;
|
|
25
|
+
} | null;
|
|
26
|
+
//# sourceMappingURL=scan-measurement.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scan-measurement.d.ts","sourceRoot":"","sources":["../src/scan-measurement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAGL,KAAK,kBAAkB,EAExB,MAAM,iBAAiB,CAAC;AAEzB,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,cAAc,CAAC,EAAE,kBAAkB,GAClC,oBAAoB,CAUtB;AAED,sFAAsF;AACtF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,QAAQ,CAAC,oBAAoB,CAAC,EAAE,EACjD,KAAK,EAAE,MAAM,EACb,cAAc,CAAC,EAAE,kBAAkB,GAClC,oBAAoB,CA8BtB;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,IAAI;;;;;;;;;;;;;;;;;;SAiCnD"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { addTokenUsage } from "./cost.js";
|
|
2
|
+
import { estimateScanCost, tokenUsage, } from "./cost-model.js";
|
|
3
|
+
export function measurementFromUsage(value, model, pricingContext) {
|
|
4
|
+
const usage = tokenUsage(value);
|
|
5
|
+
return {
|
|
6
|
+
usage,
|
|
7
|
+
cost: estimateScanCost(model, usage, pricingContext),
|
|
8
|
+
coverage: usage === null ? "unavailable" : "complete",
|
|
9
|
+
observedAt: new Date().toISOString(),
|
|
10
|
+
threadCount: usage === null ? 0 : 1,
|
|
11
|
+
missingThreadCount: usage === null ? 1 : 0,
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
/** Only for disjoint stage invocations, not cumulative observations of one thread. */
|
|
15
|
+
export function combineMeasurements(values, model, pricingContext) {
|
|
16
|
+
let usage = null;
|
|
17
|
+
for (const value of values) {
|
|
18
|
+
if (value.usage !== null)
|
|
19
|
+
usage = addTokenUsage(usage, value.usage);
|
|
20
|
+
}
|
|
21
|
+
const warnings = [
|
|
22
|
+
...new Set(values.flatMap((value) => value.warnings ?? [])),
|
|
23
|
+
].sort();
|
|
24
|
+
return {
|
|
25
|
+
...measurementFromUsage(usage, model, pricingContext),
|
|
26
|
+
...(warnings.length ? { warnings } : {}),
|
|
27
|
+
coverage: usage === null
|
|
28
|
+
? "unavailable"
|
|
29
|
+
: values.every((value) => value.coverage === "complete")
|
|
30
|
+
? "complete"
|
|
31
|
+
: "partial",
|
|
32
|
+
threadCount: values.reduce((sum, value) => sum + value.threadCount, 0),
|
|
33
|
+
missingThreadCount: values.reduce((sum, value) => sum + value.missingThreadCount, 0),
|
|
34
|
+
...(values.every((value) => value.coverageScope !== undefined)
|
|
35
|
+
? {
|
|
36
|
+
coverageScope: [
|
|
37
|
+
...new Set(values.flatMap((value) => value.coverageScope)),
|
|
38
|
+
].sort(),
|
|
39
|
+
}
|
|
40
|
+
: {}),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
/** Workbench envelope keeps usage even when the selected model has no price. */
|
|
44
|
+
export function measuredScanCost(measurement) {
|
|
45
|
+
if (measurement?.usage == null)
|
|
46
|
+
return null;
|
|
47
|
+
const tokens = measurement.usage;
|
|
48
|
+
return {
|
|
49
|
+
usage: {
|
|
50
|
+
source: "codex_runtime",
|
|
51
|
+
coverage: measurement.coverage,
|
|
52
|
+
observedAt: measurement.observedAt,
|
|
53
|
+
threadCount: measurement.threadCount,
|
|
54
|
+
missingThreadCount: measurement.missingThreadCount,
|
|
55
|
+
// The workbench accepts up to 32 diagnostic codes across all stages.
|
|
56
|
+
...(measurement.warnings?.length
|
|
57
|
+
? { warnings: measurement.warnings.slice(0, 32) }
|
|
58
|
+
: {}),
|
|
59
|
+
...(measurement.coverageScope === undefined
|
|
60
|
+
? {}
|
|
61
|
+
: { coverageScope: measurement.coverageScope }),
|
|
62
|
+
inputTokens: tokens.input_tokens,
|
|
63
|
+
cachedInputTokens: tokens.cached_input_tokens,
|
|
64
|
+
cacheWriteInputTokens: tokens.cache_write_input_tokens,
|
|
65
|
+
...(tokens.cache_write_input_tokens_reported === undefined
|
|
66
|
+
? {}
|
|
67
|
+
: {
|
|
68
|
+
cacheWriteInputTokensReported: tokens.cache_write_input_tokens_reported,
|
|
69
|
+
}),
|
|
70
|
+
outputTokens: tokens.output_tokens,
|
|
71
|
+
reasoningOutputTokens: tokens.reasoning_output_tokens,
|
|
72
|
+
totalTokens: tokens.total_tokens,
|
|
73
|
+
},
|
|
74
|
+
...(measurement.cost === null ? {} : { cost: measurement.cost }),
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=scan-measurement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scan-measurement.js","sourceRoot":"","sources":["../src/scan-measurement.ts"],"names":[],"mappings":"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","sourcesContent":["import { addTokenUsage, type ScanUsageMeasurement } from \"./cost.js\";\nimport {\n estimateScanCost,\n tokenUsage,\n type ScanPricingContext,\n type ScanTokenUsage,\n} from \"./cost-model.js\";\n\nexport function measurementFromUsage(\n value: unknown,\n model: string,\n pricingContext?: ScanPricingContext,\n): ScanUsageMeasurement {\n const usage = tokenUsage(value);\n return {\n usage,\n cost: estimateScanCost(model, usage, pricingContext),\n coverage: usage === null ? \"unavailable\" : \"complete\",\n observedAt: new Date().toISOString(),\n threadCount: usage === null ? 0 : 1,\n missingThreadCount: usage === null ? 1 : 0,\n };\n}\n\n/** Only for disjoint stage invocations, not cumulative observations of one thread. */\nexport function combineMeasurements(\n values: readonly Readonly<ScanUsageMeasurement>[],\n model: string,\n pricingContext?: ScanPricingContext,\n): ScanUsageMeasurement {\n let usage: ScanTokenUsage | null = null;\n for (const value of values) {\n if (value.usage !== null) usage = addTokenUsage(usage, value.usage);\n }\n const warnings = [\n ...new Set(values.flatMap((value) => value.warnings ?? [])),\n ].sort();\n return {\n ...measurementFromUsage(usage, model, pricingContext),\n ...(warnings.length ? { warnings } : {}),\n coverage:\n usage === null\n ? \"unavailable\"\n : values.every((value) => value.coverage === \"complete\")\n ? \"complete\"\n : \"partial\",\n threadCount: values.reduce((sum, value) => sum + value.threadCount, 0),\n missingThreadCount: values.reduce(\n (sum, value) => sum + value.missingThreadCount,\n 0,\n ),\n ...(values.every((value) => value.coverageScope !== undefined)\n ? {\n coverageScope: [\n ...new Set(values.flatMap((value) => value.coverageScope!)),\n ].sort(),\n }\n : {}),\n };\n}\n\n/** Workbench envelope keeps usage even when the selected model has no price. */\nexport function measuredScanCost(\n measurement: Readonly<ScanUsageMeasurement> | null,\n) {\n if (measurement?.usage == null) return null;\n const tokens = measurement.usage;\n return {\n usage: {\n source: \"codex_runtime\",\n coverage: measurement.coverage,\n observedAt: measurement.observedAt,\n threadCount: measurement.threadCount,\n missingThreadCount: measurement.missingThreadCount,\n // The workbench accepts up to 32 diagnostic codes across all stages.\n ...(measurement.warnings?.length\n ? { warnings: measurement.warnings.slice(0, 32) }\n : {}),\n ...(measurement.coverageScope === undefined\n ? {}\n : { coverageScope: measurement.coverageScope }),\n inputTokens: tokens.input_tokens,\n cachedInputTokens: tokens.cached_input_tokens,\n cacheWriteInputTokens: tokens.cache_write_input_tokens,\n ...(tokens.cache_write_input_tokens_reported === undefined\n ? {}\n : {\n cacheWriteInputTokensReported:\n tokens.cache_write_input_tokens_reported,\n }),\n outputTokens: tokens.output_tokens,\n reasoningOutputTokens: tokens.reasoning_output_tokens,\n totalTokens: tokens.total_tokens,\n },\n ...(measurement.cost === null ? {} : { cost: measurement.cost }),\n };\n}\n"]}
|
package/dist/scan-progress.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export interface DeepScanProgress extends z.output<typeof deepProgressSchema> {
|
|
|
20
20
|
/** Whether the coordinator is reducing results or has finished. */
|
|
21
21
|
consolidating?: boolean;
|
|
22
22
|
}
|
|
23
|
+
export declare function formatDeepScanReviews(progress: DeepScanProgress): string;
|
|
23
24
|
interface ScanProgressTrackerOptions {
|
|
24
25
|
read: (signal: AbortSignal) => Promise<unknown>;
|
|
25
26
|
onProgress?: (progress: SavedScanProgress) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-progress.d.ts","sourceRoot":"","sources":["../src/scan-progress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE1E,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;GAUnB,CAAC;AAEN,MAAM,WAAW,gBAAiB,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC;IAC3E,mEAAmE;IACnE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,0BAA0B;IAClC,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACnD,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AAID,qBAAa,mBAAmB;;IAQ9B,YAAmB,OAAO,EAAE,0BAA0B,EAErD;IAEM,KAAK,IAAI,IAAI,CAUnB;IAEY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CA0CpC;IAEM,IAAI,IAAI,IAAI,CAKlB;CACF;AAaD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;CACvD;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,OAAO,GACd,iBAAiB,GAAG,IAAI,CAgB1B;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,OAAO,GACd,gBAAgB,GAAG,IAAI,CAWzB"}
|
|
1
|
+
{"version":3,"file":"scan-progress.d.ts","sourceRoot":"","sources":["../src/scan-progress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE1E,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;GAUnB,CAAC;AAEN,MAAM,WAAW,gBAAiB,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC;IAC3E,mEAAmE;IACnE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAExE;AAED,UAAU,0BAA0B;IAClC,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACnD,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AAID,qBAAa,mBAAmB;;IAQ9B,YAAmB,OAAO,EAAE,0BAA0B,EAErD;IAEM,KAAK,IAAI,IAAI,CAUnB;IAEY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CA0CpC;IAEM,IAAI,IAAI,IAAI,CAKlB;CACF;AAaD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;CACvD;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,OAAO,GACd,iBAAiB,GAAG,IAAI,CAgB1B;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,OAAO,GACd,gBAAgB,GAAG,IAAI,CAWzB"}
|
package/dist/scan-progress.js
CHANGED
|
@@ -12,6 +12,9 @@ const deepProgressSchema = z
|
|
|
12
12
|
...counts,
|
|
13
13
|
...(consolidating === undefined ? {} : { consolidating }),
|
|
14
14
|
}));
|
|
15
|
+
export function formatDeepScanReviews(progress) {
|
|
16
|
+
return `Reviews: ${progress.completed} completed, ${progress.active} active, cap ${progress.maximum}`;
|
|
17
|
+
}
|
|
15
18
|
const PROGRESS_POLL_INTERVAL_MS = 5_000;
|
|
16
19
|
export class ScanProgressTracker {
|
|
17
20
|
#options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-progress.js","sourceRoot":"","sources":["../src/scan-progress.ts"],"names":[],"mappings":"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","sourcesContent":["import { isRecord } from \"./record.js\";\nimport { z } from \"zod\";\nimport { scanPhaseSchema, type ScanProgress } from \"./worker-progress.js\";\n\nconst deepProgressSchema = z\n .object({\n completed: z.int().nonnegative(),\n active: z.int().nonnegative(),\n maximum: z.int().positive(),\n consolidating: z.boolean().optional(),\n })\n .transform(({ consolidating, ...counts }) => ({\n ...counts,\n ...(consolidating === undefined ? {} : { consolidating }),\n }));\n\nexport interface DeepScanProgress extends z.output<typeof deepProgressSchema> {\n /** Whether the coordinator is reducing results or has finished. */\n consolidating?: boolean;\n}\n\ninterface ScanProgressTrackerOptions {\n read: (signal: AbortSignal) => Promise<unknown>;\n onProgress?: (progress: SavedScanProgress) => void;\n onDeepProgress?: (progress: DeepScanProgress) => void;\n onError?: (error: unknown) => void;\n}\n\nconst PROGRESS_POLL_INTERVAL_MS = 5_000;\n\nexport class ScanProgressTracker {\n readonly #options: ScanProgressTrackerOptions;\n #timer: NodeJS.Timeout | null = null;\n #pending: Promise<void> | null = null;\n readonly #abortController = new AbortController();\n #lastDeepProgress: DeepScanProgress | null = null;\n #lastScanProgress: string | null = null;\n\n public constructor(options: ScanProgressTrackerOptions) {\n this.#options = options;\n }\n\n public start(): void {\n if (this.#timer !== null || this.#abortController.signal.aborted) return;\n const poll = () => {\n void this.refresh().catch((error: unknown) => {\n this.#options.onError?.(error);\n });\n };\n this.#timer = setInterval(poll, PROGRESS_POLL_INTERVAL_MS);\n this.#timer.unref();\n poll();\n }\n\n public async refresh(): Promise<void> {\n if (this.#abortController.signal.aborted) return;\n if (this.#pending !== null) return await this.#pending;\n const abortController = this.#abortController;\n let update: Promise<void> | null = null;\n update = (async () => {\n try {\n const result = await this.#options.read(abortController.signal);\n if (abortController.signal.aborted) return;\n if (this.#options.onProgress !== undefined) {\n const progress = scanProgressFromWorkbench(result);\n if (progress !== null) {\n const key = JSON.stringify(progress);\n if (key !== this.#lastScanProgress) {\n this.#lastScanProgress = key;\n this.#options.onProgress(progress);\n }\n }\n }\n if (this.#options.onDeepProgress === undefined) return;\n const progress = deepScanProgressFromWorkbench(result);\n if (\n abortController.signal.aborted ||\n progress === null ||\n (progress.completed === this.#lastDeepProgress?.completed &&\n progress.active === this.#lastDeepProgress?.active &&\n progress.maximum === this.#lastDeepProgress?.maximum &&\n progress.consolidating === this.#lastDeepProgress?.consolidating)\n ) {\n return;\n }\n this.#lastDeepProgress = progress;\n this.#options.onDeepProgress(progress);\n } catch (error) {\n if (abortController.signal.aborted) return;\n throw error;\n } finally {\n if (this.#pending === update) this.#pending = null;\n }\n })();\n this.#pending = update;\n await update;\n }\n\n public stop(): void {\n if (this.#abortController.signal.aborted) return;\n clearInterval(this.#timer ?? undefined);\n this.#timer = null;\n this.#abortController.abort();\n }\n}\n\nconst savedProgressSchema = z.object({\n phase: scanPhaseSchema,\n coverage: z\n .object({\n filesTotal: z.int().nonnegative().nullable(),\n closedRows: z.int().nonnegative(),\n worklistRows: z.int().nonnegative(),\n })\n .refine(({ closedRows, worklistRows }) => closedRows <= worklistRows),\n});\n\nexport interface SavedScanProgress {\n phase: ScanProgress[\"phase\"];\n filesTotal: number | null;\n reviewItems: NonNullable<ScanProgress[\"reviewItems\"]>;\n}\n\nexport function scanProgressFromWorkbench(\n result: unknown,\n): SavedScanProgress | null {\n if (!isRecord(result) || !isRecord(result[\"scan\"])) return null;\n const progress = result[\"scan\"][\"progress\"];\n if (!isRecord(progress) || progress[\"coverage\"] === undefined) return null;\n const parsed = savedProgressSchema.safeParse(progress);\n if (!parsed.success) {\n throw new Error(\"Codex Security workbench returned invalid scan progress.\");\n }\n return {\n phase: parsed.data.phase,\n filesTotal: parsed.data.coverage.filesTotal,\n reviewItems: {\n completed: parsed.data.coverage.closedRows,\n total: parsed.data.coverage.worklistRows,\n },\n };\n}\n\nexport function deepScanProgressFromWorkbench(\n result: unknown,\n): DeepScanProgress | null {\n if (!isRecord(result) || !isRecord(result[\"scan\"])) return null;\n const progress = result[\"scan\"][\"progress\"];\n if (!isRecord(progress)) return null;\n const independentReviews = progress[\"independentReviews\"];\n if (independentReviews === undefined) return null;\n const parsed = deepProgressSchema.safeParse(independentReviews);\n if (parsed.success) return parsed.data;\n throw new Error(\n \"Codex Security workbench returned invalid Deep Scan progress.\",\n );\n}\n"]}
|
|
1
|
+
{"version":3,"file":"scan-progress.js","sourceRoot":"","sources":["../src/scan-progress.ts"],"names":[],"mappings":"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","sourcesContent":["import { isRecord } from \"./record.js\";\nimport { z } from \"zod\";\nimport { scanPhaseSchema, type ScanProgress } from \"./worker-progress.js\";\n\nconst deepProgressSchema = z\n .object({\n completed: z.int().nonnegative(),\n active: z.int().nonnegative(),\n maximum: z.int().positive(),\n consolidating: z.boolean().optional(),\n })\n .transform(({ consolidating, ...counts }) => ({\n ...counts,\n ...(consolidating === undefined ? {} : { consolidating }),\n }));\n\nexport interface DeepScanProgress extends z.output<typeof deepProgressSchema> {\n /** Whether the coordinator is reducing results or has finished. */\n consolidating?: boolean;\n}\n\nexport function formatDeepScanReviews(progress: DeepScanProgress): string {\n return `Reviews: ${progress.completed} completed, ${progress.active} active, cap ${progress.maximum}`;\n}\n\ninterface ScanProgressTrackerOptions {\n read: (signal: AbortSignal) => Promise<unknown>;\n onProgress?: (progress: SavedScanProgress) => void;\n onDeepProgress?: (progress: DeepScanProgress) => void;\n onError?: (error: unknown) => void;\n}\n\nconst PROGRESS_POLL_INTERVAL_MS = 5_000;\n\nexport class ScanProgressTracker {\n readonly #options: ScanProgressTrackerOptions;\n #timer: NodeJS.Timeout | null = null;\n #pending: Promise<void> | null = null;\n readonly #abortController = new AbortController();\n #lastDeepProgress: DeepScanProgress | null = null;\n #lastScanProgress: string | null = null;\n\n public constructor(options: ScanProgressTrackerOptions) {\n this.#options = options;\n }\n\n public start(): void {\n if (this.#timer !== null || this.#abortController.signal.aborted) return;\n const poll = () => {\n void this.refresh().catch((error: unknown) => {\n this.#options.onError?.(error);\n });\n };\n this.#timer = setInterval(poll, PROGRESS_POLL_INTERVAL_MS);\n this.#timer.unref();\n poll();\n }\n\n public async refresh(): Promise<void> {\n if (this.#abortController.signal.aborted) return;\n if (this.#pending !== null) return await this.#pending;\n const abortController = this.#abortController;\n let update: Promise<void> | null = null;\n update = (async () => {\n try {\n const result = await this.#options.read(abortController.signal);\n if (abortController.signal.aborted) return;\n if (this.#options.onProgress !== undefined) {\n const progress = scanProgressFromWorkbench(result);\n if (progress !== null) {\n const key = JSON.stringify(progress);\n if (key !== this.#lastScanProgress) {\n this.#lastScanProgress = key;\n this.#options.onProgress(progress);\n }\n }\n }\n if (this.#options.onDeepProgress === undefined) return;\n const progress = deepScanProgressFromWorkbench(result);\n if (\n abortController.signal.aborted ||\n progress === null ||\n (progress.completed === this.#lastDeepProgress?.completed &&\n progress.active === this.#lastDeepProgress?.active &&\n progress.maximum === this.#lastDeepProgress?.maximum &&\n progress.consolidating === this.#lastDeepProgress?.consolidating)\n ) {\n return;\n }\n this.#lastDeepProgress = progress;\n this.#options.onDeepProgress(progress);\n } catch (error) {\n if (abortController.signal.aborted) return;\n throw error;\n } finally {\n if (this.#pending === update) this.#pending = null;\n }\n })();\n this.#pending = update;\n await update;\n }\n\n public stop(): void {\n if (this.#abortController.signal.aborted) return;\n clearInterval(this.#timer ?? undefined);\n this.#timer = null;\n this.#abortController.abort();\n }\n}\n\nconst savedProgressSchema = z.object({\n phase: scanPhaseSchema,\n coverage: z\n .object({\n filesTotal: z.int().nonnegative().nullable(),\n closedRows: z.int().nonnegative(),\n worklistRows: z.int().nonnegative(),\n })\n .refine(({ closedRows, worklistRows }) => closedRows <= worklistRows),\n});\n\nexport interface SavedScanProgress {\n phase: ScanProgress[\"phase\"];\n filesTotal: number | null;\n reviewItems: NonNullable<ScanProgress[\"reviewItems\"]>;\n}\n\nexport function scanProgressFromWorkbench(\n result: unknown,\n): SavedScanProgress | null {\n if (!isRecord(result) || !isRecord(result[\"scan\"])) return null;\n const progress = result[\"scan\"][\"progress\"];\n if (!isRecord(progress) || progress[\"coverage\"] === undefined) return null;\n const parsed = savedProgressSchema.safeParse(progress);\n if (!parsed.success) {\n throw new Error(\"Codex Security workbench returned invalid scan progress.\");\n }\n return {\n phase: parsed.data.phase,\n filesTotal: parsed.data.coverage.filesTotal,\n reviewItems: {\n completed: parsed.data.coverage.closedRows,\n total: parsed.data.coverage.worklistRows,\n },\n };\n}\n\nexport function deepScanProgressFromWorkbench(\n result: unknown,\n): DeepScanProgress | null {\n if (!isRecord(result) || !isRecord(result[\"scan\"])) return null;\n const progress = result[\"scan\"][\"progress\"];\n if (!isRecord(progress)) return null;\n const independentReviews = progress[\"independentReviews\"];\n if (independentReviews === undefined) return null;\n const parsed = deepProgressSchema.safeParse(independentReviews);\n if (parsed.success) return parsed.data;\n throw new Error(\n \"Codex Security workbench returned invalid Deep Scan progress.\",\n );\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-sessions.d.ts","sourceRoot":"","sources":["../src/scan-sessions.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAIlE;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC9D,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACzC,OAAO,CAST;AAcD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC1C,MAAM,GAAG,IAAI,CAYf;AAED,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"scan-sessions.d.ts","sourceRoot":"","sources":["../src/scan-sessions.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAIlE;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC9D,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACzC,OAAO,CAST;AAcD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC1C,MAAM,GAAG,IAAI,CAYf;AAED,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAgBT"}
|
package/dist/scan-sessions.js
CHANGED
|
@@ -39,7 +39,10 @@ export function isScanArtifactDirectory(scanDirectory, workingDirectory) {
|
|
|
39
39
|
const artifacts = join(scanDirectory, "artifacts");
|
|
40
40
|
if (relative(artifacts, workingDirectory) === "")
|
|
41
41
|
return true;
|
|
42
|
-
const
|
|
42
|
+
const deepDirectory = join(artifacts, "deep_discovery");
|
|
43
|
+
if (relative(deepDirectory, workingDirectory) === "")
|
|
44
|
+
return true;
|
|
45
|
+
const workers = join(deepDirectory, "workers");
|
|
43
46
|
const directory = relative(workers, workingDirectory);
|
|
44
47
|
const components = directory.split(sep);
|
|
45
48
|
return (!isAbsolute(directory) &&
|