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