@openai/codex-security 0.8.3 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +192 -151
- package/_bundled_plugin/.mcp.json +5 -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/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/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/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 +165 -342
- package/_bundled_plugin/scripts/filesystem_identity.py +1 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +153 -227
- package/_bundled_plugin/scripts/finding_preview.py +20 -0
- package/_bundled_plugin/scripts/launch_codex_security_mcp +1 -0
- package/_bundled_plugin/scripts/legacy_findings.py +148 -0
- package/_bundled_plugin/scripts/posix_scan_local_files.py +11 -0
- 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 +1 -0
- 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 +388 -17
- package/_bundled_plugin/scripts/workbench/__init__.py +1 -1
- package/_bundled_plugin/scripts/workbench/handoff.py +47 -0
- package/_bundled_plugin/scripts/workbench/retained_coverage.py +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 +71 -7
- package/_bundled_plugin/scripts/workbench_cli.py +30 -12
- package/_bundled_plugin/scripts/workbench_constants.py +10 -0
- package/_bundled_plugin/scripts/workbench_coverage_receipts.py +3 -3
- package/_bundled_plugin/scripts/workbench_db.py +369 -137
- package/_bundled_plugin/scripts/workbench_feedback.py +8 -7
- package/_bundled_plugin/scripts/workbench_finding_index.py +1 -0
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +4 -0
- package/_bundled_plugin/scripts/workbench_native_indexes.py +12 -12
- package/_bundled_plugin/scripts/workbench_progress.py +10 -1
- package/_bundled_plugin/scripts/workbench_publication.py +14 -10
- package/_bundled_plugin/scripts/workbench_remediation.py +13 -0
- package/_bundled_plugin/scripts/workbench_saved_results.py +132 -77
- package/_bundled_plugin/scripts/workbench_scan_history.py +117 -55
- package/_bundled_plugin/scripts/workbench_scan_start.py +83 -24
- package/_bundled_plugin/scripts/workbench_scan_usage.py +644 -68
- package/_bundled_plugin/scripts/workbench_schema.py +44 -55
- package/_bundled_plugin/scripts/workbench_setup.py +13 -1
- 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 +127 -56
- package/_bundled_plugin/scripts/workbench_target_state.py +3 -0
- package/_bundled_plugin/scripts/workbench_validation.py +43 -3
- package/_bundled_plugin/shared/workbench-history-repairs.json +19 -23
- package/_bundled_plugin/shared/workbench-migrations.json +34 -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 +1 -1
- package/_bundled_plugin/skills/publish-findings/SKILL.md +32 -25
- 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 +464 -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/dist/api.d.ts +39 -4
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +774 -292
- package/dist/api.js.map +1 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +4 -6
- package/dist/auth.js.map +1 -1
- package/dist/bedrock-oss-pricing.d.ts +6 -0
- package/dist/bedrock-oss-pricing.d.ts.map +1 -0
- package/dist/bedrock-oss-pricing.js +58 -0
- package/dist/bedrock-oss-pricing.js.map +1 -0
- package/dist/bedrock-pricing.d.ts +15 -0
- package/dist/bedrock-pricing.d.ts.map +1 -0
- package/dist/bedrock-pricing.js +117 -0
- package/dist/bedrock-pricing.js.map +1 -0
- package/dist/blackduck-findings.d.ts.map +1 -1
- package/dist/blackduck-findings.js +35 -20
- 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/checkmarx-evidence.d.ts +19 -0
- package/dist/checkmarx-evidence.d.ts.map +1 -0
- package/dist/checkmarx-evidence.js +36 -0
- package/dist/checkmarx-evidence.js.map +1 -0
- package/dist/checkmarx-findings.d.ts +4 -0
- package/dist/checkmarx-findings.d.ts.map +1 -0
- package/dist/checkmarx-findings.js +27 -0
- package/dist/checkmarx-findings.js.map +1 -0
- package/dist/checkmarx-one.d.ts +4 -0
- package/dist/checkmarx-one.d.ts.map +1 -0
- package/dist/checkmarx-one.js +53 -0
- package/dist/checkmarx-one.js.map +1 -0
- package/dist/checkmarx-repository.d.ts +12 -0
- package/dist/checkmarx-repository.d.ts.map +1 -0
- package/dist/checkmarx-repository.js +181 -0
- package/dist/checkmarx-repository.js.map +1 -0
- package/dist/checkmarx-xml.d.ts +12 -0
- package/dist/checkmarx-xml.d.ts.map +1 -0
- package/dist/checkmarx-xml.js +196 -0
- package/dist/checkmarx-xml.js.map +1 -0
- package/dist/classify-severity-records.d.ts +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 +2 -4
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli.d.ts +11 -5
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1734 -1238
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.js +2 -2
- package/dist/cloud-publish.js.map +1 -1
- package/dist/component-scan.d.ts +16 -3
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +27 -2
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +100 -66
- package/dist/config.js.map +1 -1
- package/dist/continuum-findings.d.ts.map +1 -1
- package/dist/continuum-findings.js +80 -12
- 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 +483 -104
- 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/deduplication/local.d.ts +2 -2
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +2 -2
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/refusal.d.ts.map +1 -1
- package/dist/deduplication/refusal.js +25 -5
- package/dist/deduplication/refusal.js.map +1 -1
- package/dist/deduplication/scan.d.ts +3 -0
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +1 -1
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-config.d.ts +0 -1
- package/dist/deep-config.d.ts.map +1 -1
- package/dist/deep-config.js +22 -33
- package/dist/deep-config.js.map +1 -1
- package/dist/deep-scan-defaults.d.ts +2 -0
- package/dist/deep-scan-defaults.d.ts.map +1 -1
- package/dist/deep-scan-defaults.js +28 -1
- package/dist/deep-scan-defaults.js.map +1 -1
- package/dist/deep-scan.d.ts +2 -0
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +28 -4
- 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 +103 -45
- package/dist/endor-findings.js.map +1 -1
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +8 -1
- package/dist/errors.js.map +1 -1
- package/dist/external-findings-import.d.ts +5 -3
- package/dist/external-findings-import.d.ts.map +1 -1
- package/dist/external-findings-import.js +7 -6
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +7 -5
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +337 -89
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +8 -6
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +1318 -258
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +20 -2
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +148 -66
- 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 +42 -1
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-contract.d.ts +5 -1
- package/dist/external-import-contract.d.ts.map +1 -1
- package/dist/external-import-contract.js +23 -9
- 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 +15 -4
- 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 +55 -30
- 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-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/hosted-scanner-v1.d.ts +6 -0
- package/dist/hosted-scanner-v1.d.ts.map +1 -0
- package/dist/hosted-scanner-v1.js +60 -0
- package/dist/hosted-scanner-v1.js.map +1 -0
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +3 -0
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +18 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -2
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts.map +1 -1
- package/dist/inspector-findings.js +47 -65
- package/dist/inspector-findings.js.map +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +68 -5
- package/dist/knowledge-base.js.map +1 -1
- package/dist/local-git-metadata.d.ts +1 -1
- package/dist/local-git-metadata.d.ts.map +1 -1
- package/dist/local-git-metadata.js +1 -2
- package/dist/local-git-metadata.js.map +1 -1
- package/dist/multiscan.d.ts +6 -4
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +138 -65
- package/dist/multiscan.js.map +1 -1
- package/dist/native-json-findings.d.ts +2 -1
- package/dist/native-json-findings.d.ts.map +1 -1
- package/dist/native-json-findings.js +12 -2
- package/dist/native-json-findings.js.map +1 -1
- package/dist/opengrep-findings.d.ts +1 -0
- package/dist/opengrep-findings.d.ts.map +1 -1
- package/dist/opengrep-findings.js +17 -13
- 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 +97 -2
- package/dist/private-finding-import.d.ts.map +1 -1
- package/dist/private-finding-import.js +58 -34
- package/dist/private-finding-import.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 +8 -1
- 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/publish.d.ts +4 -0
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +42 -2
- package/dist/publish.js.map +1 -1
- package/dist/reader-selection.d.ts +2 -0
- package/dist/reader-selection.d.ts.map +1 -1
- package/dist/reader-selection.js +8 -0
- package/dist/reader-selection.js.map +1 -1
- package/dist/remediation.d.ts +1 -4
- package/dist/remediation.d.ts.map +1 -1
- package/dist/remediation.js +3 -7
- 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 +20 -0
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +313 -110
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +1 -0
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +18 -15
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-activity.d.ts.map +1 -1
- package/dist/scan-activity.js +141 -56
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-comparison.d.ts +10 -5
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +60 -15
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +6 -6
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +75 -42
- 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 +22 -2
- package/dist/scan-executor.js.map +1 -1
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +9 -19
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-logs.d.ts +12 -0
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +106 -77
- package/dist/scan-logs.js.map +1 -1
- package/dist/scan-measurement.d.ts +26 -0
- package/dist/scan-measurement.d.ts.map +1 -0
- package/dist/scan-measurement.js +77 -0
- package/dist/scan-measurement.js.map +1 -0
- package/dist/scan-progress.d.ts +1 -0
- package/dist/scan-progress.d.ts.map +1 -1
- package/dist/scan-progress.js +3 -0
- package/dist/scan-progress.js.map +1 -1
- package/dist/scan-sessions.d.ts.map +1 -1
- package/dist/scan-sessions.js +4 -1
- package/dist/scan-sessions.js.map +1 -1
- package/dist/scan-settings.d.ts +1 -1
- package/dist/scan-settings.d.ts.map +1 -1
- package/dist/scan-settings.js +1 -24
- package/dist/scan-settings.js.map +1 -1
- package/dist/scanner-import.d.ts +20 -2
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +200 -8
- 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.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 +107 -43
- 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 +207 -6
- package/dist/semgrep-platform-findings.d.ts.map +1 -1
- package/dist/semgrep-platform-findings.js +983 -103
- package/dist/semgrep-platform-findings.js.map +1 -1
- package/dist/semgrep-platform-v1.d.ts +6 -0
- package/dist/semgrep-platform-v1.d.ts.map +1 -0
- package/dist/semgrep-platform-v1.js +83 -0
- package/dist/semgrep-platform-v1.js.map +1 -0
- package/dist/server/api.d.ts +1 -1
- package/dist/server/api.d.ts.map +1 -1
- package/dist/server/api.js.map +1 -1
- package/dist/server/embedding-tokenizer.cdx.json +33 -0
- package/dist/server/embedding-tokenizer.d.ts +2 -0
- package/dist/server/embedding-tokenizer.d.ts.map +1 -0
- package/dist/server/embedding-tokenizer.js +322 -0
- package/dist/server/embedding-tokenizer.js.map +6 -0
- package/dist/server/embeddings.d.ts +16 -2
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +35 -5
- package/dist/server/embeddings.js.map +1 -1
- package/dist/session-lines.d.ts +5 -0
- package/dist/session-lines.d.ts.map +1 -0
- package/dist/session-lines.js +60 -0
- package/dist/session-lines.js.map +1 -0
- package/dist/severity-review.d.ts +3 -1
- package/dist/severity-review.d.ts.map +1 -1
- package/dist/severity-review.js +3 -2
- package/dist/severity-review.js.map +1 -1
- package/dist/skill-authentication.d.ts +1 -0
- package/dist/skill-authentication.d.ts.map +1 -1
- package/dist/skill-authentication.js +1 -0
- package/dist/skill-authentication.js.map +1 -1
- package/dist/snyk-findings.d.ts +7 -2
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +93 -70
- package/dist/snyk-findings.js.map +1 -1
- package/dist/snyk-rest-findings.d.ts +76 -0
- package/dist/snyk-rest-findings.d.ts.map +1 -0
- package/dist/snyk-rest-findings.js +1051 -0
- package/dist/snyk-rest-findings.js.map +1 -0
- package/dist/snyk-rest-v1.d.ts +28 -0
- package/dist/snyk-rest-v1.d.ts.map +1 -0
- package/dist/snyk-rest-v1.js +132 -0
- package/dist/snyk-rest-v1.js.map +1 -0
- package/dist/snyk-token-origin.d.ts +4 -0
- package/dist/snyk-token-origin.d.ts.map +1 -0
- package/dist/snyk-token-origin.js +82 -0
- package/dist/snyk-token-origin.js.map +1 -0
- package/dist/sonar-collector.d.ts.map +1 -1
- package/dist/sonar-collector.js +0 -3
- package/dist/sonar-collector.js.map +1 -1
- package/dist/sonar-import.d.ts.map +1 -1
- package/dist/sonar-import.js +2 -4
- package/dist/sonar-import.js.map +1 -1
- package/dist/target-drift.d.ts +9 -0
- package/dist/target-drift.d.ts.map +1 -0
- package/dist/target-drift.js +27 -0
- package/dist/target-drift.js.map +1 -0
- package/dist/targets.d.ts +2 -0
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +56 -20
- package/dist/targets.js.map +1 -1
- package/dist/tenable-findings.d.ts +9 -0
- package/dist/tenable-findings.d.ts.map +1 -0
- package/dist/tenable-findings.js +122 -0
- package/dist/tenable-findings.js.map +1 -0
- package/dist/terminal-stream.d.ts +13 -0
- package/dist/terminal-stream.d.ts.map +1 -0
- package/dist/terminal-stream.js +35 -0
- package/dist/terminal-stream.js.map +1 -0
- package/dist/trivy-findings.d.ts +19 -0
- package/dist/trivy-findings.d.ts.map +1 -0
- package/dist/trivy-findings.js +435 -0
- package/dist/trivy-findings.js.map +1 -0
- package/dist/trivy-import.d.ts +19 -0
- package/dist/trivy-import.d.ts.map +1 -0
- package/dist/trivy-import.js +151 -0
- package/dist/trivy-import.js.map +1 -0
- package/dist/validation-records.js +1 -1
- package/dist/validation-records.js.map +1 -1
- package/dist/veracode-findings.d.ts +2 -0
- package/dist/veracode-findings.d.ts.map +1 -1
- package/dist/veracode-findings.js +49 -11
- package/dist/veracode-findings.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 +4 -0
- package/dist/wiz-findings.d.ts.map +1 -1
- package/dist/wiz-findings.js +57 -3
- package/dist/wiz-findings.js.map +1 -1
- package/docs/classify-severity-records.md +27 -12
- package/docs/cli.md +497 -550
- package/docs/dedupe-records.md +44 -24
- package/docs/findings-service.md +66 -39
- package/docs/hosted-remediation.md +14 -7
- package/docs/hosted-scans.md +50 -42
- package/docs/telemetry.md +236 -0
- package/docs/validate-records.md +78 -44
- package/package.json +18 -15
- package/schemas/external-findings.schema.json +3 -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/cost.js
CHANGED
|
@@ -1,16 +1,72 @@
|
|
|
1
|
-
import { parseJson } from "./value.js";
|
|
1
|
+
import { isSafeNonNegativeInteger, parseJson } from "./value.js";
|
|
2
|
+
import { workbenchArgs } from "./workbench-arguments.js";
|
|
2
3
|
import { createHash } from "node:crypto";
|
|
3
|
-
import { open, readdir, stat } from "node:fs/promises";
|
|
4
|
-
import { join } from "node:path";
|
|
4
|
+
import { lstat, open, readFile, readdir, realpath, stat, } from "node:fs/promises";
|
|
5
|
+
import { join, relative, resolve } from "node:path";
|
|
5
6
|
import { StringDecoder } from "node:string_decoder";
|
|
6
7
|
import { isDeepStrictEqual } from "node:util";
|
|
7
8
|
import { z } from "zod";
|
|
8
9
|
import { isRecord } from "./record.js";
|
|
10
|
+
import { errorMessage } from "./errors.js";
|
|
11
|
+
import { sessionLines } from "./session-lines.js";
|
|
9
12
|
import { estimateScanCost, tokenUsage, } from "./cost-model.js";
|
|
10
13
|
import { scanActivityFromSessionEvent, sessionContentText, } from "./scan-activity.js";
|
|
11
14
|
import { isScanArtifactDirectory, sessionOwnsTurn, sessionParentThreadId, sessionStartedAt, } from "./scan-sessions.js";
|
|
12
15
|
import { scanProgressUpdatesFromText, } from "./worker-progress.js";
|
|
13
16
|
export { estimateScanCost, formatUsd } from "./cost-model.js";
|
|
17
|
+
export async function readScanBudgetUsage(workbench, scanId, threadId, validationThreadId, requireWorkerUsage = false) {
|
|
18
|
+
const result = await workbench(workbenchArgs("read-scan-usage", { scanId, threadId, validationThreadId }));
|
|
19
|
+
const counts = {
|
|
20
|
+
input_tokens: result["inputTokens"],
|
|
21
|
+
cached_input_tokens: result["cachedInputTokens"],
|
|
22
|
+
cache_write_input_tokens: result["cacheWriteInputTokens"],
|
|
23
|
+
output_tokens: result["outputTokens"],
|
|
24
|
+
reasoning_output_tokens: result["reasoningOutputTokens"],
|
|
25
|
+
};
|
|
26
|
+
const usage = Object.values(counts).every(Number.isSafeInteger)
|
|
27
|
+
? tokenUsage(counts)
|
|
28
|
+
: null;
|
|
29
|
+
const scope = result["coverageScope"];
|
|
30
|
+
const warnings = result["warnings"];
|
|
31
|
+
const ownership = {
|
|
32
|
+
...(Array.isArray(warnings) &&
|
|
33
|
+
warnings.length > 0 &&
|
|
34
|
+
warnings.every((item) => typeof item === "string")
|
|
35
|
+
? { warnings }
|
|
36
|
+
: {}),
|
|
37
|
+
...(isSafeNonNegativeInteger(result["threadCount"])
|
|
38
|
+
? { threadCount: result["threadCount"] }
|
|
39
|
+
: {}),
|
|
40
|
+
...(isSafeNonNegativeInteger(result["missingThreadCount"])
|
|
41
|
+
? { missingThreadCount: result["missingThreadCount"] }
|
|
42
|
+
: {}),
|
|
43
|
+
...(Array.isArray(scope) &&
|
|
44
|
+
scope.every((item) => typeof item === "string")
|
|
45
|
+
? { coverageScope: scope }
|
|
46
|
+
: {}),
|
|
47
|
+
};
|
|
48
|
+
const roles = result["byRole"];
|
|
49
|
+
const workers = isRecord(roles) ? roles["workers"] : undefined;
|
|
50
|
+
const coverage = result["coverage"];
|
|
51
|
+
if ((coverage !== "complete" && coverage !== "partial") ||
|
|
52
|
+
usage === null ||
|
|
53
|
+
usage.total_tokens !== result["totalTokens"])
|
|
54
|
+
return { ...ownership, usage: null, complete: false };
|
|
55
|
+
const hasWorkers = isRecord(workers) &&
|
|
56
|
+
typeof workers["threadCount"] === "number" &&
|
|
57
|
+
workers["threadCount"] > 0;
|
|
58
|
+
return {
|
|
59
|
+
...ownership,
|
|
60
|
+
// Older workbenches sum cache writes without tracking omitted counters.
|
|
61
|
+
usage: result["cacheWriteInputTokensReported"] === true
|
|
62
|
+
? usage
|
|
63
|
+
: { ...usage, cache_write_input_tokens_reported: false },
|
|
64
|
+
complete: coverage === "complete" && (!requireWorkerUsage || hasWorkers),
|
|
65
|
+
...(requireWorkerUsage && !hasWorkers
|
|
66
|
+
? { missingThreadCount: Math.max(1, ownership.missingThreadCount ?? 0) }
|
|
67
|
+
: {}),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
14
70
|
const rateLimitWindow = z
|
|
15
71
|
.object({
|
|
16
72
|
used_percent: z.number(),
|
|
@@ -75,6 +131,9 @@ function compareSourceOrder(left, right) {
|
|
|
75
131
|
return rightPosition >= left.live.after ? -1 : undefined;
|
|
76
132
|
return undefined;
|
|
77
133
|
}
|
|
134
|
+
function sessionObservation(session, value) {
|
|
135
|
+
return { position: session.eventPosition, value };
|
|
136
|
+
}
|
|
78
137
|
const COST_POLL_INTERVAL_MS = 100;
|
|
79
138
|
const SESSION_READ_SIZE = 64 * 1_024;
|
|
80
139
|
function createSessionUsage(observeUsage) {
|
|
@@ -83,6 +142,7 @@ function createSessionUsage(observeUsage) {
|
|
|
83
142
|
decoder: new StringDecoder("utf8"),
|
|
84
143
|
pendingLine: [],
|
|
85
144
|
unreadable: false,
|
|
145
|
+
compressedRead: false,
|
|
86
146
|
threadId: null,
|
|
87
147
|
parentThreadId: null,
|
|
88
148
|
workingDirectory: null,
|
|
@@ -96,6 +156,7 @@ function createSessionUsage(observeUsage) {
|
|
|
96
156
|
: null,
|
|
97
157
|
responseUsage: null,
|
|
98
158
|
responseIds: new Set(),
|
|
159
|
+
eventPosition: 0,
|
|
99
160
|
calls: new Map(),
|
|
100
161
|
activities: [],
|
|
101
162
|
progress: [],
|
|
@@ -116,10 +177,13 @@ function createSessionUsage(observeUsage) {
|
|
|
116
177
|
}
|
|
117
178
|
export class ScanCostTracker {
|
|
118
179
|
#options;
|
|
180
|
+
#lastBudgetPoll = -Infinity;
|
|
119
181
|
#sessions = new Map();
|
|
120
182
|
#receipts = new Map();
|
|
183
|
+
#workerReceipts = new Map();
|
|
121
184
|
#workers = new Map();
|
|
122
185
|
#workerProgress = new Map();
|
|
186
|
+
#reportedSessionPositions = new Map();
|
|
123
187
|
#liveParentProgress = new Set();
|
|
124
188
|
#liveParentItems = [];
|
|
125
189
|
#liveParentEvents = new WeakMap();
|
|
@@ -155,9 +219,21 @@ export class ScanCostTracker {
|
|
|
155
219
|
#observingWorkers = true;
|
|
156
220
|
#timer = null;
|
|
157
221
|
#pending = Promise.resolve();
|
|
158
|
-
#snapshot = {
|
|
222
|
+
#snapshot = {
|
|
223
|
+
usage: null,
|
|
224
|
+
cost: null,
|
|
225
|
+
measurement: {
|
|
226
|
+
usage: null,
|
|
227
|
+
cost: null,
|
|
228
|
+
coverage: "unavailable",
|
|
229
|
+
observedAt: new Date().toISOString(),
|
|
230
|
+
threadCount: 0,
|
|
231
|
+
missingThreadCount: 0,
|
|
232
|
+
},
|
|
233
|
+
};
|
|
159
234
|
#lastCost = null;
|
|
160
235
|
#lastUsage = null;
|
|
236
|
+
#lastMeasurement = null;
|
|
161
237
|
#lastObservation = null;
|
|
162
238
|
#highestFilesCompleted = 0;
|
|
163
239
|
#expectedFilesTotal;
|
|
@@ -1293,7 +1369,7 @@ export class ScanCostTracker {
|
|
|
1293
1369
|
let retainedWorker = null;
|
|
1294
1370
|
// Reconsider compact worker receipts under the proven inventory. Keep an
|
|
1295
1371
|
// oversized receipt available without counting it as reviewed coverage.
|
|
1296
|
-
for (const session of this.#
|
|
1372
|
+
for (const { source: session, } of this.#reportedSessionPositions.values()) {
|
|
1297
1373
|
if (session.threadId === null || session.threadId === this.#threadId)
|
|
1298
1374
|
continue;
|
|
1299
1375
|
for (const [total, pending] of session.pendingWorkerProgress) {
|
|
@@ -1628,6 +1704,7 @@ export class ScanCostTracker {
|
|
|
1628
1704
|
if (this.#options.maxCostUsd === undefined &&
|
|
1629
1705
|
this.#options.onCost === undefined &&
|
|
1630
1706
|
this.#options.onUsage === undefined &&
|
|
1707
|
+
this.#options.onMeasurement === undefined &&
|
|
1631
1708
|
this.#options.onUsageObservation === undefined &&
|
|
1632
1709
|
this.#options.onActivity === undefined &&
|
|
1633
1710
|
this.#options.onProgress === undefined &&
|
|
@@ -1643,7 +1720,7 @@ export class ScanCostTracker {
|
|
|
1643
1720
|
return;
|
|
1644
1721
|
}
|
|
1645
1722
|
polling = true;
|
|
1646
|
-
void this.refresh()
|
|
1723
|
+
void this.refresh(true)
|
|
1647
1724
|
.catch((error) => {
|
|
1648
1725
|
this.#options.onError?.(error);
|
|
1649
1726
|
})
|
|
@@ -1659,14 +1736,43 @@ export class ScanCostTracker {
|
|
|
1659
1736
|
this.#timer.unref();
|
|
1660
1737
|
poll();
|
|
1661
1738
|
}
|
|
1662
|
-
async refresh() {
|
|
1739
|
+
async refresh(polling = false) {
|
|
1663
1740
|
const update = this.#pending.then(async () => {
|
|
1664
|
-
|
|
1741
|
+
try {
|
|
1742
|
+
await this.#refreshUsage(polling);
|
|
1743
|
+
}
|
|
1744
|
+
catch (error) {
|
|
1745
|
+
const previous = this.#snapshot.measurement;
|
|
1746
|
+
this.#setSnapshot(previous.usage, previous.cost, false, previous.threadCount, Math.max(1, previous.missingThreadCount), previous);
|
|
1747
|
+
throw error;
|
|
1748
|
+
}
|
|
1665
1749
|
});
|
|
1666
1750
|
this.#pending = update.catch(() => { });
|
|
1667
1751
|
await update;
|
|
1668
1752
|
return this.#snapshot;
|
|
1669
1753
|
}
|
|
1754
|
+
async #refreshUsage(polling) {
|
|
1755
|
+
const { readBudgetUsage } = this.#options;
|
|
1756
|
+
if (readBudgetUsage === undefined)
|
|
1757
|
+
return this.#readSessions();
|
|
1758
|
+
if (this.#threadId === null)
|
|
1759
|
+
return;
|
|
1760
|
+
if (this.#options.onActivity ||
|
|
1761
|
+
this.#options.onProgress ||
|
|
1762
|
+
this.#options.onWorkerEvent ||
|
|
1763
|
+
this.#options.onSessionEvent ||
|
|
1764
|
+
this.#options.onUsageObservation) {
|
|
1765
|
+
await this.#readSessions().catch((error) => this.#options.onObservationError?.(error));
|
|
1766
|
+
}
|
|
1767
|
+
// Reading the indexed graph is more expensive than tailing session activity.
|
|
1768
|
+
// Always get fresh usage when stopping, even after a recent live poll.
|
|
1769
|
+
if (polling && performance.now() - this.#lastBudgetPoll < 1_000)
|
|
1770
|
+
return;
|
|
1771
|
+
const measured = await readBudgetUsage(this.#threadId);
|
|
1772
|
+
this.#lastBudgetPoll = performance.now();
|
|
1773
|
+
this.#updateCost(measured.usage, measured.complete, measured.threadCount ?? (measured.usage === null ? 0 : 1), measured.missingThreadCount ??
|
|
1774
|
+
(measured.complete || measured.warnings?.length ? 0 : 1), measured);
|
|
1775
|
+
}
|
|
1670
1776
|
async stop(fallbackUsage) {
|
|
1671
1777
|
clearInterval(this.#timer ?? undefined);
|
|
1672
1778
|
this.#timer = null;
|
|
@@ -1678,11 +1784,15 @@ export class ScanCostTracker {
|
|
|
1678
1784
|
finally {
|
|
1679
1785
|
this.#observingWorkers = false;
|
|
1680
1786
|
}
|
|
1681
|
-
if (this.#
|
|
1787
|
+
if (this.#options.readBudgetUsage ||
|
|
1788
|
+
this.#receipts.size > 0 ||
|
|
1789
|
+
this.#snapshot.measurement.usage !== null ||
|
|
1790
|
+
this.#snapshot.measurement.missingThreadCount > 0)
|
|
1682
1791
|
return this.#snapshot;
|
|
1683
|
-
const cost = estimateScanCost(this.#options.model, fallbackUsage);
|
|
1684
|
-
|
|
1685
|
-
this.#
|
|
1792
|
+
const cost = estimateScanCost(this.#options.model, fallbackUsage, this.#options.pricingContext);
|
|
1793
|
+
const usage = tokenUsage(fallbackUsage);
|
|
1794
|
+
this.#setSnapshot(usage, cost, usage !== null, usage === null ? 0 : 1, 0);
|
|
1795
|
+
this.#reportUsage(usage);
|
|
1686
1796
|
this.#reportCost(cost);
|
|
1687
1797
|
return this.#snapshot;
|
|
1688
1798
|
}
|
|
@@ -1693,24 +1803,56 @@ export class ScanCostTracker {
|
|
|
1693
1803
|
const repository = this.#options.onActivity === undefined
|
|
1694
1804
|
? undefined
|
|
1695
1805
|
: this.#options.repository;
|
|
1806
|
+
const collectionErrors = [];
|
|
1696
1807
|
const progressThread = this.#options.onProgress === undefined ? undefined : this.#threadId;
|
|
1697
|
-
const
|
|
1698
|
-
|
|
1699
|
-
|
|
1700
|
-
|
|
1701
|
-
|
|
1702
|
-
|
|
1703
|
-
|
|
1808
|
+
const observeHealthySessions = this.#options.maxCostUsd === undefined &&
|
|
1809
|
+
(this.#options.onActivity !== undefined ||
|
|
1810
|
+
this.#options.onProgress !== undefined ||
|
|
1811
|
+
this.#options.onSessionEvent !== undefined ||
|
|
1812
|
+
this.#options.onWorkerEvent !== undefined);
|
|
1813
|
+
const unreadable = new Map();
|
|
1814
|
+
let blockingReadError;
|
|
1815
|
+
directories: for (const directory of ["sessions", "archived_sessions"]) {
|
|
1704
1816
|
try {
|
|
1705
|
-
await
|
|
1817
|
+
for await (const path of sessionFiles(join(this.#options.codexHome, directory), true)) {
|
|
1818
|
+
let session = this.#sessions.get(path);
|
|
1819
|
+
if (session === undefined) {
|
|
1820
|
+
session = createSessionUsage(observeUsage);
|
|
1821
|
+
this.#sessions.set(path, session);
|
|
1822
|
+
}
|
|
1823
|
+
try {
|
|
1824
|
+
await readSessionUsage(path, session, repository, progressThread, undefined, true);
|
|
1825
|
+
}
|
|
1826
|
+
catch (error) {
|
|
1827
|
+
if (session.threadId !== null)
|
|
1828
|
+
unreadable.set(session, error);
|
|
1829
|
+
else if (isRecord(error) && typeof error["syscall"] === "string") {
|
|
1830
|
+
blockingReadError ??= error;
|
|
1831
|
+
if (!observeHealthySessions || !isBlockedLogRead(error))
|
|
1832
|
+
break directories;
|
|
1833
|
+
}
|
|
1834
|
+
else if (directory !== "archived_sessions" ||
|
|
1835
|
+
!path.endsWith(".zst")) {
|
|
1836
|
+
collectionErrors.push(error);
|
|
1837
|
+
}
|
|
1838
|
+
// A damaged cold archive with no readable identity cannot be
|
|
1839
|
+
// attributed to this scan. Registered threads still require usage.
|
|
1840
|
+
}
|
|
1841
|
+
}
|
|
1706
1842
|
}
|
|
1707
1843
|
catch (error) {
|
|
1708
|
-
if
|
|
1709
|
-
|
|
1710
|
-
|
|
1844
|
+
// Retain the blocking read if traversal also stops on a later entry.
|
|
1845
|
+
if (blockingReadError === undefined)
|
|
1846
|
+
collectionErrors.push(error);
|
|
1711
1847
|
}
|
|
1712
1848
|
}
|
|
1713
|
-
const
|
|
1849
|
+
const workerReceipts = await readWorkerReceipts(this.#options.workerReceipts, this.#workerReceipts);
|
|
1850
|
+
collectionErrors.push(...workerReceipts.errors);
|
|
1851
|
+
const included = new Set([
|
|
1852
|
+
this.#threadId,
|
|
1853
|
+
...this.#receipts.keys(),
|
|
1854
|
+
...workerReceipts.usages.keys(),
|
|
1855
|
+
]);
|
|
1714
1856
|
if (this.#options.scanDirectory !== undefined) {
|
|
1715
1857
|
const scanStartedAt = [...this.#sessions.values()].find((session) => session.threadId === this.#threadId)?.startedAt ?? null;
|
|
1716
1858
|
for (const session of this.#sessions.values()) {
|
|
@@ -1738,29 +1880,93 @@ export class ScanCostTracker {
|
|
|
1738
1880
|
}
|
|
1739
1881
|
}
|
|
1740
1882
|
} while (included.size !== previousSize);
|
|
1741
|
-
for (const
|
|
1742
|
-
if (included.has(session.threadId))
|
|
1743
|
-
|
|
1883
|
+
for (const [session, error] of unreadable) {
|
|
1884
|
+
if (session.threadId !== null && included.has(session.threadId)) {
|
|
1885
|
+
if (isBlockedLogRead(error))
|
|
1886
|
+
blockingReadError ??= error;
|
|
1887
|
+
else
|
|
1888
|
+
collectionErrors.push(error);
|
|
1889
|
+
}
|
|
1744
1890
|
}
|
|
1745
|
-
|
|
1746
|
-
|
|
1747
|
-
|
|
1891
|
+
if (blockingReadError !== undefined)
|
|
1892
|
+
collectionErrors.unshift(blockingReadError);
|
|
1893
|
+
const usages = new Map([...included].map((threadId) => [
|
|
1894
|
+
threadId,
|
|
1895
|
+
this.#receipts.get(threadId) ?? null,
|
|
1896
|
+
]));
|
|
1897
|
+
for (const [threadId, receipt] of workerReceipts.usages) {
|
|
1898
|
+
const current = usages.get(threadId);
|
|
1899
|
+
if (receipt !== null &&
|
|
1900
|
+
receipt.total_tokens > (current?.total_tokens ?? -1))
|
|
1901
|
+
usages.set(threadId, receipt);
|
|
1902
|
+
}
|
|
1903
|
+
// SDK totals retain measured usage when a rollout is unavailable.
|
|
1904
|
+
// Native rollouts also establish descendant coverage.
|
|
1905
|
+
const incomplete = new Set(workerReceipts.usages.keys());
|
|
1906
|
+
for (const [path, tracked] of this.#sessions) {
|
|
1907
|
+
const threadId = tracked.threadId;
|
|
1748
1908
|
if (threadId === null || !included.has(threadId))
|
|
1749
1909
|
continue;
|
|
1750
|
-
|
|
1910
|
+
let session = tracked;
|
|
1911
|
+
const observe = !unreadable.has(tracked) &&
|
|
1912
|
+
(blockingReadError === undefined || observeHealthySessions);
|
|
1913
|
+
if (observe && path.endsWith(".zst") && !tracked.compressedRead) {
|
|
1914
|
+
// The metadata pass associates this archive with the scan. A full read
|
|
1915
|
+
// starts at the beginning, including when retrying a partial decode.
|
|
1916
|
+
const archive = createSessionUsage(observeUsage);
|
|
1917
|
+
if (this.#options.onSessionEvent !== undefined)
|
|
1918
|
+
archive.events = [];
|
|
1919
|
+
try {
|
|
1920
|
+
await readSessionUsage(path, archive, repository, progressThread);
|
|
1921
|
+
}
|
|
1922
|
+
catch (error) {
|
|
1923
|
+
collectionErrors.push(error);
|
|
1924
|
+
}
|
|
1925
|
+
if (archive.threadId === threadId &&
|
|
1926
|
+
archive.eventPosition >= tracked.eventPosition) {
|
|
1927
|
+
session = archive;
|
|
1928
|
+
this.#sessions.set(path, archive);
|
|
1929
|
+
}
|
|
1930
|
+
}
|
|
1931
|
+
else if (observe &&
|
|
1932
|
+
this.#options.onSessionEvent !== undefined &&
|
|
1751
1933
|
session.events === undefined) {
|
|
1752
|
-
// Replay event history through the already-read snapshot without
|
|
1753
|
-
// replacing its authoritative progress, usage, or partial-line decoder.
|
|
1754
1934
|
const replay = createSessionUsage(false);
|
|
1755
1935
|
replay.events = [];
|
|
1756
|
-
|
|
1757
|
-
|
|
1758
|
-
|
|
1759
|
-
|
|
1760
|
-
if (
|
|
1761
|
-
|
|
1936
|
+
try {
|
|
1937
|
+
// Replay raw events only through the tracked snapshot. Keep its progress,
|
|
1938
|
+
// usage and decoder so a failed read cannot replace authoritative state.
|
|
1939
|
+
await readSessionUsage(path, replay, undefined, undefined, session.offset);
|
|
1940
|
+
if (replay.offset === session.offset) {
|
|
1941
|
+
session.events = replay.events;
|
|
1942
|
+
if (this.#timer === null)
|
|
1943
|
+
await readSessionUsage(path, session, repository, progressThread, "file-size");
|
|
1944
|
+
}
|
|
1945
|
+
}
|
|
1946
|
+
catch (error) {
|
|
1947
|
+
collectionErrors.push(error);
|
|
1762
1948
|
}
|
|
1763
1949
|
}
|
|
1950
|
+
const receipt = usages.get(threadId);
|
|
1951
|
+
if (session.usage !== null &&
|
|
1952
|
+
session.usage.total_tokens >=
|
|
1953
|
+
(workerReceipts.usages.get(threadId)?.total_tokens ?? 0))
|
|
1954
|
+
incomplete.delete(threadId);
|
|
1955
|
+
// A discovered thread without a receipt has unknown usage, not zero.
|
|
1956
|
+
// Retain it so a parent-only subtotal cannot appear to be complete.
|
|
1957
|
+
if (receipt === undefined)
|
|
1958
|
+
usages.set(threadId, null);
|
|
1959
|
+
if (session.usage !== null &&
|
|
1960
|
+
(session.usage.total_tokens > (receipt?.total_tokens ?? -1) ||
|
|
1961
|
+
// Worker receipts retain field presence; the SDK may default to zero.
|
|
1962
|
+
(session.usage.total_tokens === receipt?.total_tokens &&
|
|
1963
|
+
(receipt.cache_write_input_tokens_reported === false ||
|
|
1964
|
+
(receipt === this.#receipts.get(threadId) &&
|
|
1965
|
+
receipt.cache_write_input_tokens === 0))))) {
|
|
1966
|
+
usages.set(threadId, session.usage);
|
|
1967
|
+
}
|
|
1968
|
+
if (!observe)
|
|
1969
|
+
continue;
|
|
1764
1970
|
let worker;
|
|
1765
1971
|
if (threadId !== this.#threadId) {
|
|
1766
1972
|
worker = this.#workers.get(threadId);
|
|
@@ -1771,7 +1977,19 @@ export class ScanCostTracker {
|
|
|
1771
1977
|
this.#options.onWorkerEvent?.({ kind: "observed", worker });
|
|
1772
1978
|
}
|
|
1773
1979
|
}
|
|
1774
|
-
|
|
1980
|
+
// Archives and compressed copies retain the same append-only event order.
|
|
1981
|
+
// A new rollout for the same thread has a new initial metadata timestamp.
|
|
1982
|
+
const eventStream = JSON.stringify([threadId, session.startedAt]);
|
|
1983
|
+
const reported = this.#reportedSessionPositions.get(eventStream) ?? {
|
|
1984
|
+
events: 0,
|
|
1985
|
+
activities: 0,
|
|
1986
|
+
progress: 0,
|
|
1987
|
+
source: session,
|
|
1988
|
+
};
|
|
1989
|
+
for (const { position, value: event } of session.events?.splice(0) ??
|
|
1990
|
+
[]) {
|
|
1991
|
+
if (position <= reported.events)
|
|
1992
|
+
continue;
|
|
1775
1993
|
this.#options.onSessionEvent?.({
|
|
1776
1994
|
threadId,
|
|
1777
1995
|
parentThreadId: session.parentThreadId,
|
|
@@ -1779,73 +1997,136 @@ export class ScanCostTracker {
|
|
|
1779
1997
|
event,
|
|
1780
1998
|
});
|
|
1781
1999
|
}
|
|
2000
|
+
// A failed replay can leave activity/progress available without raw events.
|
|
2001
|
+
if (session.events !== undefined)
|
|
2002
|
+
reported.events = Math.max(reported.events, session.eventPosition);
|
|
1782
2003
|
if (worker !== undefined) {
|
|
1783
|
-
for (const activity of session.activities.splice(0)) {
|
|
2004
|
+
for (const { position, value: activity } of session.activities.splice(0)) {
|
|
2005
|
+
if (position <= reported.activities)
|
|
2006
|
+
continue;
|
|
1784
2007
|
this.#options.onActivity?.({
|
|
1785
2008
|
...activity,
|
|
1786
2009
|
id: `${threadId}:${activity.id}`,
|
|
1787
2010
|
worker,
|
|
1788
2011
|
});
|
|
1789
2012
|
}
|
|
2013
|
+
reported.activities = Math.max(reported.activities, session.eventPosition);
|
|
1790
2014
|
}
|
|
1791
|
-
|
|
1792
|
-
|
|
1793
|
-
|
|
1794
|
-
|
|
1795
|
-
|
|
1796
|
-
|
|
1797
|
-
|
|
1798
|
-
|
|
1799
|
-
|
|
1800
|
-
|
|
1801
|
-
|
|
1802
|
-
|
|
1803
|
-
|
|
1804
|
-
|
|
1805
|
-
|
|
1806
|
-
|
|
1807
|
-
|
|
1808
|
-
|
|
1809
|
-
|
|
1810
|
-
|
|
1811
|
-
|
|
1812
|
-
this.#
|
|
1813
|
-
|
|
1814
|
-
|
|
1815
|
-
|
|
1816
|
-
|
|
1817
|
-
|
|
1818
|
-
|
|
1819
|
-
|
|
1820
|
-
|
|
1821
|
-
(session
|
|
1822
|
-
|
|
1823
|
-
|
|
1824
|
-
|
|
1825
|
-
|
|
2015
|
+
if (session === reported.source || session.position > reported.progress) {
|
|
2016
|
+
if (session !== reported.source) {
|
|
2017
|
+
// An archive can continue an existing rollout. Keep admitted marker
|
|
2018
|
+
// state and process only the suffix unique to this copy.
|
|
2019
|
+
const prior = reported.source;
|
|
2020
|
+
session.progress = prior.progress
|
|
2021
|
+
.filter((marker) => marker.position <= reported.progress)
|
|
2022
|
+
.concat(session.progress.filter((marker) => marker.position > reported.progress));
|
|
2023
|
+
session.completions = prior.completions
|
|
2024
|
+
.filter((completion) => completion.position <= reported.progress)
|
|
2025
|
+
.concat(session.completions.filter((completion) => completion.position > reported.progress));
|
|
2026
|
+
session.latestWorkerProgress = prior.latestWorkerProgress;
|
|
2027
|
+
session.pendingWorkerProgress = prior.pendingWorkerProgress;
|
|
2028
|
+
session.filesCompleted = prior.filesCompleted;
|
|
2029
|
+
session.filesTotal = prior.filesTotal;
|
|
2030
|
+
reported.source = session;
|
|
2031
|
+
}
|
|
2032
|
+
reported.progress = session.position;
|
|
2033
|
+
let unresolvedCommand;
|
|
2034
|
+
let inventoryWitness;
|
|
2035
|
+
if (threadId === this.#threadId) {
|
|
2036
|
+
this.#parentSession = session;
|
|
2037
|
+
for (const saved of session.progress)
|
|
2038
|
+
if (saved.order !== undefined && !saved.duplicate)
|
|
2039
|
+
this.#rememberParentFact(savedProgress(saved));
|
|
2040
|
+
this.#matchParentCompletions();
|
|
2041
|
+
inventoryWitness = this.#reconcileParentProgress();
|
|
2042
|
+
unresolvedCommand = this.#unresolvedParentCommand();
|
|
2043
|
+
}
|
|
2044
|
+
const reviewWasUnpositioned = this.#parentInventoryBoundary?.reviewed !== true;
|
|
2045
|
+
this.#reportSessionProgress(session, threadId === this.#threadId, unresolvedCommand, inventoryWitness);
|
|
2046
|
+
// Fresh saved facts are observed at their source-loop position, so initial
|
|
2047
|
+
// inventory notifications keep their order. Recover after the batch too:
|
|
2048
|
+
// a later accepted parent may have hidden an eligible earlier receipt.
|
|
2049
|
+
if (threadId === this.#threadId) {
|
|
2050
|
+
// A newly admitted review locates inventories parked earlier in this
|
|
2051
|
+
// batch. Reconsider them before the final refresh returns.
|
|
2052
|
+
if (reviewWasUnpositioned &&
|
|
2053
|
+
this.#parentInventoryBoundary?.reviewed === true)
|
|
2054
|
+
this.#reportSessionProgress(session, true, unresolvedCommand, inventoryWitness);
|
|
2055
|
+
this.#reconcileParentProgress();
|
|
2056
|
+
}
|
|
1826
2057
|
}
|
|
2058
|
+
this.#reportedSessionPositions.set(eventStream, reported);
|
|
1827
2059
|
}
|
|
1828
2060
|
let usage = null;
|
|
1829
|
-
let
|
|
1830
|
-
|
|
2061
|
+
let missingThreadCount = workerReceipts.unknownAttempts;
|
|
2062
|
+
let threadCount = 0;
|
|
2063
|
+
for (const [threadId, value] of usages) {
|
|
1831
2064
|
if (value === null) {
|
|
1832
|
-
|
|
2065
|
+
missingThreadCount += 1;
|
|
1833
2066
|
continue;
|
|
1834
2067
|
}
|
|
2068
|
+
threadCount += 1;
|
|
2069
|
+
if (incomplete.has(threadId))
|
|
2070
|
+
missingThreadCount += 1;
|
|
1835
2071
|
usage = addTokenUsage(usage, value);
|
|
1836
2072
|
}
|
|
2073
|
+
if (collectionErrors.length > 0)
|
|
2074
|
+
missingThreadCount = Math.max(1, missingThreadCount);
|
|
2075
|
+
const complete = missingThreadCount === 0 && usage !== null;
|
|
1837
2076
|
if (observeUsage)
|
|
1838
2077
|
this.#reportUsageObservation(usages, complete);
|
|
1839
|
-
if (
|
|
1840
|
-
this.#
|
|
1841
|
-
|
|
1842
|
-
|
|
1843
|
-
|
|
1844
|
-
|
|
1845
|
-
|
|
2078
|
+
if (this.#options.readBudgetUsage === undefined)
|
|
2079
|
+
this.#updateCost(usage, complete, threadCount, missingThreadCount, {
|
|
2080
|
+
coverageScope: collectionErrors.length === 0
|
|
2081
|
+
? [
|
|
2082
|
+
...[...included].map((id) => `thread:${id}`),
|
|
2083
|
+
...[...workerReceipts.attemptIds].map((id) => `worker-attempt:${id}`),
|
|
2084
|
+
].sort()
|
|
2085
|
+
: undefined,
|
|
2086
|
+
},
|
|
2087
|
+
// A blocking read leaves a native-only subtotal unconfirmed until the retry.
|
|
2088
|
+
blockingReadError === undefined ||
|
|
2089
|
+
this.#receipts.size > 0 ||
|
|
2090
|
+
workerReceipts.usages.size > 0);
|
|
2091
|
+
// Preserve measured usage and every diagnostic when several logs fail together.
|
|
2092
|
+
if (collectionErrors.length === 1)
|
|
2093
|
+
throw collectionErrors[0];
|
|
2094
|
+
if (collectionErrors.length > 1)
|
|
2095
|
+
throw new AggregateError(collectionErrors, collectionErrors.map(errorMessage).join("\n"));
|
|
2096
|
+
}
|
|
2097
|
+
#updateCost(usage, complete, threadCount, missingThreadCount, details, reportCost = true) {
|
|
2098
|
+
const cost = estimateScanCost(this.#options.model, usage, this.#options.pricingContext);
|
|
2099
|
+
this.#setSnapshot(usage, cost, complete, threadCount, missingThreadCount, details);
|
|
2100
|
+
if (complete)
|
|
1846
2101
|
this.#reportUsage(usage);
|
|
1847
|
-
|
|
1848
|
-
|
|
2102
|
+
if (reportCost)
|
|
2103
|
+
this.#reportCost(cost, complete);
|
|
2104
|
+
}
|
|
2105
|
+
#setSnapshot(usage, cost, complete, threadCount, missingThreadCount, details) {
|
|
2106
|
+
const data = {
|
|
2107
|
+
usage,
|
|
2108
|
+
cost,
|
|
2109
|
+
coverage: usage === null ? "unavailable" : complete ? "complete" : "partial",
|
|
2110
|
+
threadCount,
|
|
2111
|
+
missingThreadCount,
|
|
2112
|
+
...(details?.coverageScope === undefined
|
|
2113
|
+
? {}
|
|
2114
|
+
: { coverageScope: details.coverageScope }),
|
|
2115
|
+
...(details?.warnings === undefined
|
|
2116
|
+
? {}
|
|
2117
|
+
: { warnings: details.warnings }),
|
|
2118
|
+
};
|
|
2119
|
+
const measurement = { ...data, observedAt: new Date().toISOString() };
|
|
2120
|
+
this.#snapshot = {
|
|
2121
|
+
usage: complete ? usage : null,
|
|
2122
|
+
cost: complete ? cost : null,
|
|
2123
|
+
measurement,
|
|
2124
|
+
};
|
|
2125
|
+
const signature = JSON.stringify(data);
|
|
2126
|
+
if (signature === this.#lastMeasurement)
|
|
2127
|
+
return;
|
|
2128
|
+
this.#lastMeasurement = signature;
|
|
2129
|
+
this.#options.onMeasurement?.(measurement);
|
|
1849
2130
|
}
|
|
1850
2131
|
#reportUsageObservation(usages, complete) {
|
|
1851
2132
|
const limits = new Map();
|
|
@@ -1864,8 +2145,8 @@ export class ScanCostTracker {
|
|
|
1864
2145
|
tokensUpdatedAt = session.tokensUpdatedAt;
|
|
1865
2146
|
}
|
|
1866
2147
|
}
|
|
1867
|
-
if (!complete) {
|
|
1868
|
-
//
|
|
2148
|
+
if (!complete && this.#lastUsage !== null) {
|
|
2149
|
+
// Keep the last complete total's time while a worker is unmeasured.
|
|
1869
2150
|
tokensUpdatedAt = this.#lastObservation?.tokensUpdatedAt ?? null;
|
|
1870
2151
|
}
|
|
1871
2152
|
else if (usages
|
|
@@ -2132,6 +2413,76 @@ export class ScanCostTracker {
|
|
|
2132
2413
|
this.#options.onUsage?.(usage);
|
|
2133
2414
|
}
|
|
2134
2415
|
}
|
|
2416
|
+
async function readWorkerReceipts(store, retained) {
|
|
2417
|
+
const usages = new Map();
|
|
2418
|
+
const attempts = new Set();
|
|
2419
|
+
const result = {
|
|
2420
|
+
usages,
|
|
2421
|
+
unknownAttempts: 0,
|
|
2422
|
+
attemptIds: attempts,
|
|
2423
|
+
errors: [],
|
|
2424
|
+
};
|
|
2425
|
+
if (store === undefined)
|
|
2426
|
+
return result;
|
|
2427
|
+
const { directory, scanId } = store;
|
|
2428
|
+
try {
|
|
2429
|
+
const directoryInfo = await lstat(directory);
|
|
2430
|
+
if (!directoryInfo.isDirectory() ||
|
|
2431
|
+
relative(resolve(directory), await realpath(directory)) !== "")
|
|
2432
|
+
throw new Error(`Worker usage directory must use a canonical directory: ${directory}`);
|
|
2433
|
+
for (const entry of await readdir(directory, { withFileTypes: true })) {
|
|
2434
|
+
if (!entry.isFile() || !entry.name.endsWith(".json"))
|
|
2435
|
+
continue;
|
|
2436
|
+
let receipt;
|
|
2437
|
+
try {
|
|
2438
|
+
receipt = JSON.parse(await readFile(join(directory, entry.name), "utf8"));
|
|
2439
|
+
}
|
|
2440
|
+
catch (error) {
|
|
2441
|
+
if (isMissingFile(error))
|
|
2442
|
+
continue;
|
|
2443
|
+
throw error;
|
|
2444
|
+
}
|
|
2445
|
+
if (!isRecord(receipt) ||
|
|
2446
|
+
receipt["schemaVersion"] !== 1 ||
|
|
2447
|
+
receipt["source"] !== "codex_sdk" ||
|
|
2448
|
+
receipt["usageScope"] !== "thread_cumulative" ||
|
|
2449
|
+
receipt["scanId"] !== scanId ||
|
|
2450
|
+
typeof receipt["attemptId"] !== "string" ||
|
|
2451
|
+
entry.name !== `${receipt["attemptId"]}.json` ||
|
|
2452
|
+
attempts.has(receipt["attemptId"]))
|
|
2453
|
+
continue;
|
|
2454
|
+
attempts.add(receipt["attemptId"]);
|
|
2455
|
+
retained.set(receipt["attemptId"], {
|
|
2456
|
+
threadId: typeof receipt["threadId"] === "string" ? receipt["threadId"] : null,
|
|
2457
|
+
usage: tokenUsage(receipt["usage"]),
|
|
2458
|
+
});
|
|
2459
|
+
}
|
|
2460
|
+
}
|
|
2461
|
+
catch (error) {
|
|
2462
|
+
if (!isMissingFile(error))
|
|
2463
|
+
result.errors.push(error);
|
|
2464
|
+
}
|
|
2465
|
+
// As with native sessions, a later read failure cannot erase observed usage.
|
|
2466
|
+
// Keep attempts separate so a worker's initial unknown identity can resolve.
|
|
2467
|
+
for (const [attemptId, { threadId, usage }] of retained) {
|
|
2468
|
+
attempts.add(attemptId);
|
|
2469
|
+
if (threadId === null) {
|
|
2470
|
+
result.unknownAttempts += 1;
|
|
2471
|
+
continue;
|
|
2472
|
+
}
|
|
2473
|
+
const existing = usages.get(threadId) ?? null;
|
|
2474
|
+
// Native SDK completions include earlier turns of a resumed thread.
|
|
2475
|
+
usages.set(threadId, usage !== null &&
|
|
2476
|
+
(existing === null ||
|
|
2477
|
+
usage.total_tokens > existing.total_tokens ||
|
|
2478
|
+
(usage.total_tokens === existing.total_tokens &&
|
|
2479
|
+
existing.cache_write_input_tokens_reported === false &&
|
|
2480
|
+
usage.cache_write_input_tokens_reported !== false))
|
|
2481
|
+
? usage
|
|
2482
|
+
: existing);
|
|
2483
|
+
}
|
|
2484
|
+
return result;
|
|
2485
|
+
}
|
|
2135
2486
|
export async function* sessionFiles(directory, compressed = false) {
|
|
2136
2487
|
let entries;
|
|
2137
2488
|
try {
|
|
@@ -2154,16 +2505,36 @@ export async function* sessionFiles(directory, compressed = false) {
|
|
|
2154
2505
|
}
|
|
2155
2506
|
}
|
|
2156
2507
|
}
|
|
2157
|
-
async function readSessionUsage(path, session, repository, progressThread, throughOffset) {
|
|
2508
|
+
async function readSessionUsage(path, session, repository, progressThread, throughOffset, metadataOnly = false) {
|
|
2158
2509
|
if (session.unreadable)
|
|
2159
2510
|
return;
|
|
2511
|
+
if (path.endsWith(".zst")) {
|
|
2512
|
+
if (session.compressedRead)
|
|
2513
|
+
return;
|
|
2514
|
+
if (metadataOnly && session.threadId !== null)
|
|
2515
|
+
return;
|
|
2516
|
+
try {
|
|
2517
|
+
for await (const line of sessionLines(path)) {
|
|
2518
|
+
readSessionEvent(line, session, repository, progressThread);
|
|
2519
|
+
if (metadataOnly && session.threadId !== null)
|
|
2520
|
+
return;
|
|
2521
|
+
}
|
|
2522
|
+
}
|
|
2523
|
+
catch (error) {
|
|
2524
|
+
if (isMissingFile(error))
|
|
2525
|
+
return;
|
|
2526
|
+
throw error;
|
|
2527
|
+
}
|
|
2528
|
+
session.compressedRead = true;
|
|
2529
|
+
return;
|
|
2530
|
+
}
|
|
2160
2531
|
let file;
|
|
2161
2532
|
try {
|
|
2162
|
-
const
|
|
2163
|
-
if (size === session.offset)
|
|
2533
|
+
const metadata = await stat(path);
|
|
2534
|
+
if (metadata.isFile() && metadata.size === session.offset)
|
|
2164
2535
|
return;
|
|
2165
2536
|
if (throughOffset === "file-size")
|
|
2166
|
-
throughOffset = size;
|
|
2537
|
+
throughOffset = metadata.size;
|
|
2167
2538
|
file = await open(path, "r");
|
|
2168
2539
|
}
|
|
2169
2540
|
catch (error) {
|
|
@@ -2207,12 +2578,13 @@ function readSessionEvent(line, session, repository, progressThread) {
|
|
|
2207
2578
|
const event = parseJson(() => line);
|
|
2208
2579
|
if (!isRecord(event) || !isRecord(event["payload"]))
|
|
2209
2580
|
return;
|
|
2581
|
+
session.eventPosition += 1;
|
|
2210
2582
|
const payload = event["payload"];
|
|
2211
2583
|
if (event["type"] === "session_meta") {
|
|
2212
2584
|
if (session.threadId !== null) {
|
|
2213
2585
|
session.replaying = payload["id"] !== session.threadId;
|
|
2214
2586
|
if (!session.replaying)
|
|
2215
|
-
session.events?.push(event);
|
|
2587
|
+
session.events?.push(sessionObservation(session, event));
|
|
2216
2588
|
return;
|
|
2217
2589
|
}
|
|
2218
2590
|
if (typeof payload["id"] === "string") {
|
|
@@ -2223,7 +2595,7 @@ function readSessionEvent(line, session, repository, progressThread) {
|
|
|
2223
2595
|
}
|
|
2224
2596
|
session.startedAt = sessionStartedAt(payload["timestamp"]);
|
|
2225
2597
|
session.parentThreadId = sessionParentThreadId(payload);
|
|
2226
|
-
session.events?.push(event);
|
|
2598
|
+
session.events?.push(sessionObservation(session, event));
|
|
2227
2599
|
return;
|
|
2228
2600
|
}
|
|
2229
2601
|
if (session.replaying) {
|
|
@@ -2237,11 +2609,11 @@ function readSessionEvent(line, session, repository, progressThread) {
|
|
|
2237
2609
|
if (payload["type"] === "task_started" &&
|
|
2238
2610
|
sessionOwnsTurn(session, payload)) {
|
|
2239
2611
|
session.replaying = false;
|
|
2240
|
-
session.events?.push(event);
|
|
2612
|
+
session.events?.push(sessionObservation(session, event));
|
|
2241
2613
|
}
|
|
2242
2614
|
return;
|
|
2243
2615
|
}
|
|
2244
|
-
session.events?.push(event);
|
|
2616
|
+
session.events?.push(sessionObservation(session, event));
|
|
2245
2617
|
const position = ++session.position;
|
|
2246
2618
|
if (event["type"] === "token_usage_record") {
|
|
2247
2619
|
const responseId = payload["response_id"];
|
|
@@ -2346,7 +2718,7 @@ function readSessionEvent(line, session, repository, progressThread) {
|
|
|
2346
2718
|
if (activity.status === "running") {
|
|
2347
2719
|
session.calls.set(activity.id, activity);
|
|
2348
2720
|
}
|
|
2349
|
-
session.activities.push(activity);
|
|
2721
|
+
session.activities.push(sessionObservation(session, activity));
|
|
2350
2722
|
return;
|
|
2351
2723
|
}
|
|
2352
2724
|
if ((payload["type"] === "function_call_output" ||
|
|
@@ -2354,10 +2726,10 @@ function readSessionEvent(line, session, repository, progressThread) {
|
|
|
2354
2726
|
typeof payload["call_id"] === "string") {
|
|
2355
2727
|
const call = session.calls.get(payload["call_id"]);
|
|
2356
2728
|
if (call !== undefined) {
|
|
2357
|
-
session.activities.push({
|
|
2729
|
+
session.activities.push(sessionObservation(session, {
|
|
2358
2730
|
...call,
|
|
2359
2731
|
status: payload["status"] === "failed" ? "failed" : "completed",
|
|
2360
|
-
});
|
|
2732
|
+
}));
|
|
2361
2733
|
session.calls.delete(call.id);
|
|
2362
2734
|
}
|
|
2363
2735
|
}
|
|
@@ -2444,7 +2816,7 @@ function readSessionEvent(line, session, repository, progressThread) {
|
|
|
2444
2816
|
if (activity !== null &&
|
|
2445
2817
|
!session.prose.has(`${activity.kind}:${activity.description}`)) {
|
|
2446
2818
|
session.prose.add(`${activity.kind}:${activity.description}`);
|
|
2447
|
-
session.activities.push(activity);
|
|
2819
|
+
session.activities.push(sessionObservation(session, activity));
|
|
2448
2820
|
}
|
|
2449
2821
|
return;
|
|
2450
2822
|
}
|
|
@@ -2539,7 +2911,7 @@ function recordReasoningActivity(session, activity) {
|
|
|
2539
2911
|
}
|
|
2540
2912
|
reasoning.activity = activity;
|
|
2541
2913
|
session.prose.add(`${activity.kind}:${activity.description}`);
|
|
2542
|
-
session.activities.push(activity);
|
|
2914
|
+
session.activities.push(sessionObservation(session, activity));
|
|
2543
2915
|
}
|
|
2544
2916
|
const PERSISTED_OUTPUT_GAP = "\n... command output truncated for persistence ...\n";
|
|
2545
2917
|
// Native Codex 0.162.1 persists command output with a 64 KiB UTF-8 budget.
|
|
@@ -2795,7 +3167,7 @@ function sessionProgressUpdates(payload) {
|
|
|
2795
3167
|
}
|
|
2796
3168
|
return scanProgressUpdatesFromText(output);
|
|
2797
3169
|
}
|
|
2798
|
-
function addTokenUsage(previous, next) {
|
|
3170
|
+
export function addTokenUsage(previous, next) {
|
|
2799
3171
|
if (previous === null)
|
|
2800
3172
|
return next;
|
|
2801
3173
|
return {
|
|
@@ -2824,6 +3196,13 @@ function subtractTokenUsage(usage, inherited) {
|
|
|
2824
3196
|
reasoning_output_tokens: usage.reasoning_output_tokens - inherited.reasoning_output_tokens,
|
|
2825
3197
|
});
|
|
2826
3198
|
}
|
|
3199
|
+
function isBlockedLogRead(error) {
|
|
3200
|
+
return (isRecord(error) &&
|
|
3201
|
+
(error["code"] === "EACCES" ||
|
|
3202
|
+
error["code"] === "EPERM" ||
|
|
3203
|
+
error["code"] === "EIO") &&
|
|
3204
|
+
(error["syscall"] === "open" || error["syscall"] === "read"));
|
|
3205
|
+
}
|
|
2827
3206
|
function isMissingFile(error) {
|
|
2828
3207
|
return isRecord(error) && error["code"] === "ENOENT";
|
|
2829
3208
|
}
|