@memnexus-ai/mx-agent-cli 0.1.294 → 0.1.295-next.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/dist/__tests__/agents-md-canonicalization.test.js +31 -1
- package/dist/__tests__/agents-md-canonicalization.test.js.map +1 -1
- package/dist/__tests__/behavioral-extraction.test.js +50 -0
- package/dist/__tests__/behavioral-extraction.test.js.map +1 -1
- package/dist/__tests__/bootstrap-behavioral-contract.test.js +6 -3
- package/dist/__tests__/bootstrap-behavioral-contract.test.js.map +1 -1
- package/dist/__tests__/bundle-config.test.js +28 -2
- package/dist/__tests__/bundle-config.test.js.map +1 -1
- package/dist/__tests__/catalog-interaction.test.d.ts +25 -0
- package/dist/__tests__/catalog-interaction.test.d.ts.map +1 -0
- package/dist/__tests__/catalog-interaction.test.js +269 -0
- package/dist/__tests__/catalog-interaction.test.js.map +1 -0
- package/dist/__tests__/catalog-named-memories.test.d.ts +2 -0
- package/dist/__tests__/catalog-named-memories.test.d.ts.map +1 -0
- package/dist/__tests__/catalog-named-memories.test.js +204 -0
- package/dist/__tests__/catalog-named-memories.test.js.map +1 -0
- package/dist/__tests__/catalog-origin-main.test.d.ts +15 -0
- package/dist/__tests__/catalog-origin-main.test.d.ts.map +1 -0
- package/dist/__tests__/catalog-origin-main.test.js +296 -0
- package/dist/__tests__/catalog-origin-main.test.js.map +1 -0
- package/dist/__tests__/catalog.test.d.ts +2 -0
- package/dist/__tests__/catalog.test.d.ts.map +1 -0
- package/dist/__tests__/catalog.test.js +131 -0
- package/dist/__tests__/catalog.test.js.map +1 -0
- package/dist/__tests__/cli-build-integration.test.d.ts +2 -0
- package/dist/__tests__/cli-build-integration.test.d.ts.map +1 -0
- package/dist/__tests__/cli-build-integration.test.js +64 -0
- package/dist/__tests__/cli-build-integration.test.js.map +1 -0
- package/dist/__tests__/cli-build.test.d.ts +2 -0
- package/dist/__tests__/cli-build.test.d.ts.map +1 -0
- package/dist/__tests__/cli-build.test.js +640 -0
- package/dist/__tests__/cli-build.test.js.map +1 -0
- package/dist/__tests__/codex-deploy-config.test.js +60 -0
- package/dist/__tests__/codex-deploy-config.test.js.map +1 -1
- package/dist/__tests__/completion-rows-discriminate.test.d.ts +20 -0
- package/dist/__tests__/completion-rows-discriminate.test.d.ts.map +1 -0
- package/dist/__tests__/completion-rows-discriminate.test.js +481 -0
- package/dist/__tests__/completion-rows-discriminate.test.js.map +1 -0
- package/dist/__tests__/config-fidelity-archived-symlinks.test.d.ts +2 -0
- package/dist/__tests__/config-fidelity-archived-symlinks.test.d.ts.map +1 -0
- package/dist/__tests__/config-fidelity-archived-symlinks.test.js +127 -0
- package/dist/__tests__/config-fidelity-archived-symlinks.test.js.map +1 -0
- package/dist/__tests__/config-fidelity-display.test.d.ts +2 -0
- package/dist/__tests__/config-fidelity-display.test.d.ts.map +1 -0
- package/dist/__tests__/config-fidelity-display.test.js +77 -0
- package/dist/__tests__/config-fidelity-display.test.js.map +1 -0
- package/dist/__tests__/config-fidelity.test.js +166 -33
- package/dist/__tests__/config-fidelity.test.js.map +1 -1
- package/dist/__tests__/config-generation-gate.test.js +78 -0
- package/dist/__tests__/config-generation-gate.test.js.map +1 -1
- package/dist/__tests__/config-sync.test.js +89 -1
- package/dist/__tests__/config-sync.test.js.map +1 -1
- package/dist/__tests__/coordination-401-production-wiring.test.js +12 -7
- package/dist/__tests__/coordination-401-production-wiring.test.js.map +1 -1
- package/dist/__tests__/coordination-401-recovery.test.js +39 -32
- package/dist/__tests__/coordination-401-recovery.test.js.map +1 -1
- package/dist/__tests__/coordination-brief-pin.test.js +21 -8
- package/dist/__tests__/coordination-brief-pin.test.js.map +1 -1
- package/dist/__tests__/coordination-client.test.js +227 -3
- package/dist/__tests__/coordination-client.test.js.map +1 -1
- package/dist/__tests__/coordination-credential-endpoint.test.d.ts +24 -0
- package/dist/__tests__/coordination-credential-endpoint.test.d.ts.map +1 -0
- package/dist/__tests__/coordination-credential-endpoint.test.js +1230 -0
- package/dist/__tests__/coordination-credential-endpoint.test.js.map +1 -0
- package/dist/__tests__/coordination-memory.test.js +20 -4
- package/dist/__tests__/coordination-memory.test.js.map +1 -1
- package/dist/__tests__/coordination-provision.test.js +22 -14
- package/dist/__tests__/coordination-provision.test.js.map +1 -1
- package/dist/__tests__/coordination-status-registration.test.d.ts +16 -0
- package/dist/__tests__/coordination-status-registration.test.d.ts.map +1 -0
- package/dist/__tests__/coordination-status-registration.test.js +480 -0
- package/dist/__tests__/coordination-status-registration.test.js.map +1 -0
- package/dist/__tests__/coordination-token-multitenant.test.js +11 -11
- package/dist/__tests__/coordination-token-multitenant.test.js.map +1 -1
- package/dist/__tests__/coordination-token.test.js +35 -28
- package/dist/__tests__/coordination-token.test.js.map +1 -1
- package/dist/__tests__/creation-pr-class-check.test.d.ts +17 -0
- package/dist/__tests__/creation-pr-class-check.test.d.ts.map +1 -0
- package/dist/__tests__/creation-pr-class-check.test.js +346 -0
- package/dist/__tests__/creation-pr-class-check.test.js.map +1 -0
- package/dist/__tests__/decision-check.test.d.ts +2 -0
- package/dist/__tests__/decision-check.test.d.ts.map +1 -0
- package/dist/__tests__/decision-check.test.js +105 -0
- package/dist/__tests__/decision-check.test.js.map +1 -0
- package/dist/__tests__/digest-team-omission.test.d.ts +15 -0
- package/dist/__tests__/digest-team-omission.test.d.ts.map +1 -0
- package/dist/__tests__/digest-team-omission.test.js +247 -0
- package/dist/__tests__/digest-team-omission.test.js.map +1 -0
- package/dist/__tests__/doctor-worktree-path.test.d.ts +17 -0
- package/dist/__tests__/doctor-worktree-path.test.d.ts.map +1 -0
- package/dist/__tests__/doctor-worktree-path.test.js +158 -0
- package/dist/__tests__/doctor-worktree-path.test.js.map +1 -0
- package/dist/__tests__/fleet-data.test.js +40 -7
- package/dist/__tests__/fleet-data.test.js.map +1 -1
- package/dist/__tests__/fleet-tmux.test.js +2 -2
- package/dist/__tests__/fleet-tmux.test.js.map +1 -1
- package/dist/__tests__/generate-claude.test.js +137 -3
- package/dist/__tests__/generate-claude.test.js.map +1 -1
- package/dist/__tests__/git-env.test.d.ts +14 -0
- package/dist/__tests__/git-env.test.d.ts.map +1 -0
- package/dist/__tests__/git-env.test.js +131 -0
- package/dist/__tests__/git-env.test.js.map +1 -0
- package/dist/__tests__/git-identity-isolation.test.d.ts +33 -0
- package/dist/__tests__/git-identity-isolation.test.d.ts.map +1 -0
- package/dist/__tests__/git-identity-isolation.test.js +626 -0
- package/dist/__tests__/git-identity-isolation.test.js.map +1 -0
- package/dist/__tests__/harness-extract.test.d.ts +19 -0
- package/dist/__tests__/harness-extract.test.d.ts.map +1 -0
- package/dist/__tests__/harness-extract.test.js +566 -0
- package/dist/__tests__/harness-extract.test.js.map +1 -0
- package/dist/__tests__/harness-wiring.test.d.ts +16 -0
- package/dist/__tests__/harness-wiring.test.d.ts.map +1 -0
- package/dist/__tests__/harness-wiring.test.js +469 -0
- package/dist/__tests__/harness-wiring.test.js.map +1 -0
- package/dist/__tests__/hook-heal.test.js +17 -0
- package/dist/__tests__/hook-heal.test.js.map +1 -1
- package/dist/__tests__/init-coordination-url.test.d.ts +11 -0
- package/dist/__tests__/init-coordination-url.test.d.ts.map +1 -0
- package/dist/__tests__/init-coordination-url.test.js +114 -0
- package/dist/__tests__/init-coordination-url.test.js.map +1 -0
- package/dist/__tests__/memory-autocreate.test.js +574 -8
- package/dist/__tests__/memory-autocreate.test.js.map +1 -1
- package/dist/__tests__/memory-log-result.test.d.ts +13 -0
- package/dist/__tests__/memory-log-result.test.d.ts.map +1 -0
- package/dist/__tests__/memory-log-result.test.js +113 -0
- package/dist/__tests__/memory-log-result.test.js.map +1 -0
- package/dist/__tests__/memory-named-exists.test.d.ts +16 -0
- package/dist/__tests__/memory-named-exists.test.d.ts.map +1 -0
- package/dist/__tests__/memory-named-exists.test.js +288 -0
- package/dist/__tests__/memory-named-exists.test.js.map +1 -0
- package/dist/__tests__/mx-agent-cli-pin-validation.test.js +23 -47
- package/dist/__tests__/mx-agent-cli-pin-validation.test.js.map +1 -1
- package/dist/__tests__/mx-agent-cli-version-pin.test.js +34 -88
- package/dist/__tests__/mx-agent-cli-version-pin.test.js.map +1 -1
- package/dist/__tests__/new-project-first-team.test.d.ts +15 -0
- package/dist/__tests__/new-project-first-team.test.d.ts.map +1 -0
- package/dist/__tests__/new-project-first-team.test.js +263 -0
- package/dist/__tests__/new-project-first-team.test.js.map +1 -0
- package/dist/__tests__/otel-env.test.d.ts +2 -0
- package/dist/__tests__/otel-env.test.d.ts.map +1 -0
- package/dist/__tests__/otel-env.test.js +127 -0
- package/dist/__tests__/otel-env.test.js.map +1 -0
- package/dist/__tests__/project-config.test.js +283 -1
- package/dist/__tests__/project-config.test.js.map +1 -1
- package/dist/__tests__/provision-behavioral-contract.test.js +96 -4
- package/dist/__tests__/provision-behavioral-contract.test.js.map +1 -1
- package/dist/__tests__/provision-catalog-precondition.test.d.ts +26 -0
- package/dist/__tests__/provision-catalog-precondition.test.d.ts.map +1 -0
- package/dist/__tests__/provision-catalog-precondition.test.js +620 -0
- package/dist/__tests__/provision-catalog-precondition.test.js.map +1 -0
- package/dist/__tests__/provision-completion-rows.test.d.ts +17 -0
- package/dist/__tests__/provision-completion-rows.test.d.ts.map +1 -0
- package/dist/__tests__/provision-completion-rows.test.js +3095 -0
- package/dist/__tests__/provision-completion-rows.test.js.map +1 -0
- package/dist/__tests__/provision-identity-gate.test.d.ts +20 -0
- package/dist/__tests__/provision-identity-gate.test.d.ts.map +1 -0
- package/dist/__tests__/provision-identity-gate.test.js +600 -0
- package/dist/__tests__/provision-identity-gate.test.js.map +1 -0
- package/dist/__tests__/provision-resume.test.d.ts +26 -0
- package/dist/__tests__/provision-resume.test.d.ts.map +1 -0
- package/dist/__tests__/provision-resume.test.js +1164 -0
- package/dist/__tests__/provision-resume.test.js.map +1 -0
- package/dist/__tests__/provision-roleguide-anchors.test.d.ts +27 -0
- package/dist/__tests__/provision-roleguide-anchors.test.d.ts.map +1 -0
- package/dist/__tests__/provision-roleguide-anchors.test.js +747 -0
- package/dist/__tests__/provision-roleguide-anchors.test.js.map +1 -0
- package/dist/__tests__/provision-skeleton-fill.test.d.ts +16 -0
- package/dist/__tests__/provision-skeleton-fill.test.d.ts.map +1 -0
- package/dist/__tests__/provision-skeleton-fill.test.js +488 -0
- package/dist/__tests__/provision-skeleton-fill.test.js.map +1 -0
- package/dist/__tests__/provision-teambuilder-flow.test.js +93 -7
- package/dist/__tests__/provision-teambuilder-flow.test.js.map +1 -1
- package/dist/__tests__/repo-guard-wiring.test.d.ts +21 -0
- package/dist/__tests__/repo-guard-wiring.test.d.ts.map +1 -0
- package/dist/__tests__/repo-guard-wiring.test.js +638 -0
- package/dist/__tests__/repo-guard-wiring.test.js.map +1 -0
- package/dist/__tests__/report-format.test.d.ts +2 -0
- package/dist/__tests__/report-format.test.d.ts.map +1 -0
- package/dist/__tests__/report-format.test.js +219 -0
- package/dist/__tests__/report-format.test.js.map +1 -0
- package/dist/__tests__/runtime-codex-gateway-pilot.test.d.ts +2 -0
- package/dist/__tests__/runtime-codex-gateway-pilot.test.d.ts.map +1 -0
- package/dist/__tests__/runtime-codex-gateway-pilot.test.js +309 -0
- package/dist/__tests__/runtime-codex-gateway-pilot.test.js.map +1 -0
- package/dist/__tests__/runtime-codex-gateway-provider.test.d.ts +2 -0
- package/dist/__tests__/runtime-codex-gateway-provider.test.d.ts.map +1 -0
- package/dist/__tests__/runtime-codex-gateway-provider.test.js +163 -0
- package/dist/__tests__/runtime-codex-gateway-provider.test.js.map +1 -0
- package/dist/__tests__/runtime-identity.test.d.ts +2 -0
- package/dist/__tests__/runtime-identity.test.d.ts.map +1 -0
- package/dist/__tests__/runtime-identity.test.js +117 -0
- package/dist/__tests__/runtime-identity.test.js.map +1 -0
- package/dist/__tests__/session-pause-provisioning.test.js +6 -1
- package/dist/__tests__/session-pause-provisioning.test.js.map +1 -1
- package/dist/__tests__/session-record-disclosure.test.d.ts +24 -0
- package/dist/__tests__/session-record-disclosure.test.d.ts.map +1 -0
- package/dist/__tests__/session-record-disclosure.test.js +494 -0
- package/dist/__tests__/session-record-disclosure.test.js.map +1 -0
- package/dist/__tests__/session.test.js +35 -0
- package/dist/__tests__/session.test.js.map +1 -1
- package/dist/__tests__/slug-validation.test.js +27 -21
- package/dist/__tests__/slug-validation.test.js.map +1 -1
- package/dist/__tests__/standards-injection.test.d.ts +2 -0
- package/dist/__tests__/standards-injection.test.d.ts.map +1 -0
- package/dist/__tests__/standards-injection.test.js +179 -0
- package/dist/__tests__/standards-injection.test.js.map +1 -0
- package/dist/__tests__/start-interactive-role.test.d.ts +22 -0
- package/dist/__tests__/start-interactive-role.test.d.ts.map +1 -0
- package/dist/__tests__/start-interactive-role.test.js +204 -0
- package/dist/__tests__/start-interactive-role.test.js.map +1 -0
- package/dist/__tests__/start-team-identity.test.d.ts +25 -0
- package/dist/__tests__/start-team-identity.test.d.ts.map +1 -0
- package/dist/__tests__/start-team-identity.test.js +307 -0
- package/dist/__tests__/start-team-identity.test.js.map +1 -0
- package/dist/__tests__/team-memory-commands.test.js +142 -19
- package/dist/__tests__/team-memory-commands.test.js.map +1 -1
- package/dist/__tests__/template-sync.test.d.ts +19 -0
- package/dist/__tests__/template-sync.test.d.ts.map +1 -0
- package/dist/__tests__/template-sync.test.js +270 -0
- package/dist/__tests__/template-sync.test.js.map +1 -0
- package/dist/__tests__/test-project.test.d.ts +18 -0
- package/dist/__tests__/test-project.test.d.ts.map +1 -0
- package/dist/__tests__/test-project.test.js +465 -0
- package/dist/__tests__/test-project.test.js.map +1 -0
- package/dist/__tests__/usage-per-call-grouping.test.d.ts +25 -0
- package/dist/__tests__/usage-per-call-grouping.test.d.ts.map +1 -0
- package/dist/__tests__/usage-per-call-grouping.test.js +952 -0
- package/dist/__tests__/usage-per-call-grouping.test.js.map +1 -0
- package/dist/__tests__/verify-hooks-check-all.test.d.ts +32 -0
- package/dist/__tests__/verify-hooks-check-all.test.d.ts.map +1 -0
- package/dist/__tests__/verify-hooks-check-all.test.js +553 -0
- package/dist/__tests__/verify-hooks-check-all.test.js.map +1 -0
- package/dist/__tests__/worktree-sync-fixture.test.d.ts +17 -0
- package/dist/__tests__/worktree-sync-fixture.test.d.ts.map +1 -0
- package/dist/__tests__/worktree-sync-fixture.test.js +519 -0
- package/dist/__tests__/worktree-sync-fixture.test.js.map +1 -0
- package/dist/__tests__/worktree-sync-hardening.test.d.ts +13 -0
- package/dist/__tests__/worktree-sync-hardening.test.d.ts.map +1 -0
- package/dist/__tests__/worktree-sync-hardening.test.js +919 -0
- package/dist/__tests__/worktree-sync-hardening.test.js.map +1 -0
- package/dist/__tests__/worktree-sync-shell-free.test.d.ts +25 -0
- package/dist/__tests__/worktree-sync-shell-free.test.d.ts.map +1 -0
- package/dist/__tests__/worktree-sync-shell-free.test.js +185 -0
- package/dist/__tests__/worktree-sync-shell-free.test.js.map +1 -0
- package/dist/__tests__/worktree.test.js +75 -1
- package/dist/__tests__/worktree.test.js.map +1 -1
- package/dist/agent-config/.mx-config-generation.json +2 -2
- package/dist/agent-config/AGENTS.md.template +2 -2
- package/dist/agent-config/agents/bar-raiser.md +34 -1
- package/dist/agent-config/agents/red-team.md +34 -1
- package/dist/agent-config/agents/security-reviewer.md +22 -1
- package/dist/agent-config/claude-md/CLAUDE.core.md +6 -1
- package/dist/agent-config/claude-md/CLAUDE.overlay.memnexus.md +1 -3
- package/dist/agent-config/coordination-rosters.generated.json +10 -0
- package/dist/agent-config/hooks/HOOK-TIMEOUTS.md +27 -1
- package/dist/agent-config/hooks/OR-TRUE-AUDIT.md +8 -8
- package/dist/agent-config/hooks/auto-capture-precompact.sh +180 -83
- package/dist/agent-config/hooks/auto-capture-session-end.sh +216 -87
- package/dist/agent-config/hooks/auto-checkpoint.sh +75 -5
- package/dist/agent-config/hooks/coordination-brief.sh +290 -245
- package/dist/agent-config/hooks/deploy-verification-reminder.sh +359 -22
- package/dist/agent-config/hooks/git-mutation-guard.sh +85 -13
- package/dist/agent-config/hooks/observability-sync.sh +46 -9
- package/dist/agent-config/hooks/session-idle-gate.sh +177 -12
- package/dist/agent-config/hooks/subagent-write-guard.sh +670 -0
- package/dist/agent-config/hooks/worktree-guard.sh +36 -7
- package/dist/agent-config/settings.json +15 -2
- package/dist/agent-config/shared/creation-pr-review-checklist.md +317 -0
- package/dist/commands/bootstrap.d.ts.map +1 -1
- package/dist/commands/bootstrap.js +22 -10
- package/dist/commands/bootstrap.js.map +1 -1
- package/dist/commands/config-sync.d.ts +37 -0
- package/dist/commands/config-sync.d.ts.map +1 -1
- package/dist/commands/config-sync.js +36 -18
- package/dist/commands/config-sync.js.map +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +28 -1
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/coordination.d.ts +150 -8
- package/dist/commands/coordination.d.ts.map +1 -1
- package/dist/commands/coordination.js +519 -25
- package/dist/commands/coordination.js.map +1 -1
- package/dist/commands/create.d.ts +913 -1
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +4879 -345
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/dashboard.d.ts.map +1 -1
- package/dist/commands/dashboard.js +10 -2
- package/dist/commands/dashboard.js.map +1 -1
- package/dist/commands/decision.d.ts +20 -0
- package/dist/commands/decision.d.ts.map +1 -0
- package/dist/commands/decision.js +54 -0
- package/dist/commands/decision.js.map +1 -0
- package/dist/commands/digest.d.ts.map +1 -1
- package/dist/commands/digest.js +91 -7
- package/dist/commands/digest.js.map +1 -1
- package/dist/commands/fleet-tmux.js +1 -1
- package/dist/commands/fleet-tmux.js.map +1 -1
- package/dist/commands/init.d.ts +8 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +26 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/list.d.ts +32 -1
- package/dist/commands/list.d.ts.map +1 -1
- package/dist/commands/list.js +98 -5
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/monitor.d.ts.map +1 -1
- package/dist/commands/monitor.js +8 -2
- package/dist/commands/monitor.js.map +1 -1
- package/dist/commands/new.d.ts +2 -0
- package/dist/commands/new.d.ts.map +1 -1
- package/dist/commands/new.js +114 -21
- package/dist/commands/new.js.map +1 -1
- package/dist/commands/report.d.ts +33 -0
- package/dist/commands/report.d.ts.map +1 -0
- package/dist/commands/report.js +73 -0
- package/dist/commands/report.js.map +1 -0
- package/dist/commands/session.js +1 -1
- package/dist/commands/session.js.map +1 -1
- package/dist/commands/start.d.ts +42 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +177 -8
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/sync.d.ts +57 -0
- package/dist/commands/sync.d.ts.map +1 -1
- package/dist/commands/sync.js +117 -3
- package/dist/commands/sync.js.map +1 -1
- package/dist/commands/update.d.ts +13 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +50 -1
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/usage.d.ts +64 -0
- package/dist/commands/usage.d.ts.map +1 -1
- package/dist/commands/usage.js +96 -3
- package/dist/commands/usage.js.map +1 -1
- package/dist/commands/verify-hooks.d.ts +37 -1
- package/dist/commands/verify-hooks.d.ts.map +1 -1
- package/dist/commands/verify-hooks.js +114 -2
- package/dist/commands/verify-hooks.js.map +1 -1
- package/dist/commands/window.d.ts +10 -0
- package/dist/commands/window.d.ts.map +1 -0
- package/dist/commands/window.js +265 -0
- package/dist/commands/window.js.map +1 -0
- package/dist/commands/worktree-sync.d.ts +54 -0
- package/dist/commands/worktree-sync.d.ts.map +1 -0
- package/dist/commands/worktree-sync.js +135 -0
- package/dist/commands/worktree-sync.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +189 -14
- package/dist/index.js.map +1 -1
- package/dist/lib/agent-session.d.ts +12 -0
- package/dist/lib/agent-session.d.ts.map +1 -1
- package/dist/lib/agent-session.js +189 -42
- package/dist/lib/agent-session.js.map +1 -1
- package/dist/lib/catalog.d.ts +321 -2
- package/dist/lib/catalog.d.ts.map +1 -1
- package/dist/lib/catalog.js +490 -11
- package/dist/lib/catalog.js.map +1 -1
- package/dist/lib/claude.d.ts +65 -23
- package/dist/lib/claude.d.ts.map +1 -1
- package/dist/lib/claude.js +335 -19
- package/dist/lib/claude.js.map +1 -1
- package/dist/lib/cli-build.d.ts +172 -0
- package/dist/lib/cli-build.d.ts.map +1 -0
- package/dist/lib/cli-build.js +654 -0
- package/dist/lib/cli-build.js.map +1 -0
- package/dist/lib/code-context-file.d.ts +109 -0
- package/dist/lib/code-context-file.d.ts.map +1 -0
- package/dist/lib/code-context-file.js +219 -0
- package/dist/lib/code-context-file.js.map +1 -0
- package/dist/lib/code-context-file.test.d.ts +19 -0
- package/dist/lib/code-context-file.test.d.ts.map +1 -0
- package/dist/lib/code-context-file.test.js +202 -0
- package/dist/lib/code-context-file.test.js.map +1 -0
- package/dist/lib/config-fidelity.d.ts +40 -20
- package/dist/lib/config-fidelity.d.ts.map +1 -1
- package/dist/lib/config-fidelity.js +144 -56
- package/dist/lib/config-fidelity.js.map +1 -1
- package/dist/lib/coordination-client.d.ts +73 -0
- package/dist/lib/coordination-client.d.ts.map +1 -1
- package/dist/lib/coordination-client.js +180 -8
- package/dist/lib/coordination-client.js.map +1 -1
- package/dist/lib/coordination-token.d.ts +304 -6
- package/dist/lib/coordination-token.d.ts.map +1 -1
- package/dist/lib/coordination-token.js +851 -52
- package/dist/lib/coordination-token.js.map +1 -1
- package/dist/lib/decision-check.d.ts +48 -0
- package/dist/lib/decision-check.d.ts.map +1 -0
- package/dist/lib/decision-check.js +149 -0
- package/dist/lib/decision-check.js.map +1 -0
- package/dist/lib/fleet-data.d.ts +34 -0
- package/dist/lib/fleet-data.d.ts.map +1 -1
- package/dist/lib/fleet-data.js +37 -9
- package/dist/lib/fleet-data.js.map +1 -1
- package/dist/lib/fleet-render.js +1 -1
- package/dist/lib/fleet-render.js.map +1 -1
- package/dist/lib/git-identity.d.ts +302 -0
- package/dist/lib/git-identity.d.ts.map +1 -0
- package/dist/lib/git-identity.js +546 -0
- package/dist/lib/git-identity.js.map +1 -0
- package/dist/lib/harness/console/announce.d.ts +45 -0
- package/dist/lib/harness/console/announce.d.ts.map +1 -0
- package/dist/lib/harness/console/announce.js +48 -0
- package/dist/lib/harness/console/announce.js.map +1 -0
- package/dist/lib/harness/console/announce.test.d.ts +2 -0
- package/dist/lib/harness/console/announce.test.d.ts.map +1 -0
- package/dist/lib/harness/console/announce.test.js +104 -0
- package/dist/lib/harness/console/announce.test.js.map +1 -0
- package/dist/lib/harness/console/by-session.d.ts +50 -0
- package/dist/lib/harness/console/by-session.d.ts.map +1 -0
- package/dist/lib/harness/console/by-session.js +83 -0
- package/dist/lib/harness/console/by-session.js.map +1 -0
- package/dist/lib/harness/console/by-session.test.d.ts +2 -0
- package/dist/lib/harness/console/by-session.test.d.ts.map +1 -0
- package/dist/lib/harness/console/by-session.test.js +86 -0
- package/dist/lib/harness/console/by-session.test.js.map +1 -0
- package/dist/lib/harness/console/console.d.ts +67 -0
- package/dist/lib/harness/console/console.d.ts.map +1 -0
- package/dist/lib/harness/console/console.js +373 -0
- package/dist/lib/harness/console/console.js.map +1 -0
- package/dist/lib/harness/console/console.test.d.ts +2 -0
- package/dist/lib/harness/console/console.test.d.ts.map +1 -0
- package/dist/lib/harness/console/console.test.js +269 -0
- package/dist/lib/harness/console/console.test.js.map +1 -0
- package/dist/lib/harness/console/decision-request.d.ts +32 -0
- package/dist/lib/harness/console/decision-request.d.ts.map +1 -0
- package/dist/lib/harness/console/decision-request.js +112 -0
- package/dist/lib/harness/console/decision-request.js.map +1 -0
- package/dist/lib/harness/console/decision-request.test.d.ts +2 -0
- package/dist/lib/harness/console/decision-request.test.d.ts.map +1 -0
- package/dist/lib/harness/console/decision-request.test.js +75 -0
- package/dist/lib/harness/console/decision-request.test.js.map +1 -0
- package/dist/lib/harness/console/fixtures.d.ts +16 -0
- package/dist/lib/harness/console/fixtures.d.ts.map +1 -0
- package/dist/lib/harness/console/fixtures.js +49 -0
- package/dist/lib/harness/console/fixtures.js.map +1 -0
- package/dist/lib/harness/console/index.d.ts +15 -0
- package/dist/lib/harness/console/index.d.ts.map +1 -0
- package/dist/lib/harness/console/index.js +14 -0
- package/dist/lib/harness/console/index.js.map +1 -0
- package/dist/lib/harness/console/rank.d.ts +73 -0
- package/dist/lib/harness/console/rank.d.ts.map +1 -0
- package/dist/lib/harness/console/rank.js +113 -0
- package/dist/lib/harness/console/rank.js.map +1 -0
- package/dist/lib/harness/console/rank.test.d.ts +2 -0
- package/dist/lib/harness/console/rank.test.d.ts.map +1 -0
- package/dist/lib/harness/console/rank.test.js +124 -0
- package/dist/lib/harness/console/rank.test.js.map +1 -0
- package/dist/lib/harness/console/render.d.ts +22 -0
- package/dist/lib/harness/console/render.d.ts.map +1 -0
- package/dist/lib/harness/console/render.js +65 -0
- package/dist/lib/harness/console/render.js.map +1 -0
- package/dist/lib/harness/console/render.test.d.ts +2 -0
- package/dist/lib/harness/console/render.test.d.ts.map +1 -0
- package/dist/lib/harness/console/render.test.js +96 -0
- package/dist/lib/harness/console/render.test.js.map +1 -0
- package/dist/lib/harness/console/replay-cli.test.d.ts +2 -0
- package/dist/lib/harness/console/replay-cli.test.d.ts.map +1 -0
- package/dist/lib/harness/console/replay-cli.test.js +96 -0
- package/dist/lib/harness/console/replay-cli.test.js.map +1 -0
- package/dist/lib/harness/console/replay.d.ts +36 -0
- package/dist/lib/harness/console/replay.d.ts.map +1 -0
- package/dist/lib/harness/console/replay.js +59 -0
- package/dist/lib/harness/console/replay.js.map +1 -0
- package/dist/lib/harness/console/replay.test.d.ts +2 -0
- package/dist/lib/harness/console/replay.test.d.ts.map +1 -0
- package/dist/lib/harness/console/replay.test.js +81 -0
- package/dist/lib/harness/console/replay.test.js.map +1 -0
- package/dist/lib/harness/console/turn-reader.d.ts +50 -0
- package/dist/lib/harness/console/turn-reader.d.ts.map +1 -0
- package/dist/lib/harness/console/turn-reader.js +184 -0
- package/dist/lib/harness/console/turn-reader.js.map +1 -0
- package/dist/lib/harness/console/turn-reader.test.d.ts +2 -0
- package/dist/lib/harness/console/turn-reader.test.d.ts.map +1 -0
- package/dist/lib/harness/console/turn-reader.test.js +108 -0
- package/dist/lib/harness/console/turn-reader.test.js.map +1 -0
- package/dist/lib/harness/console/types.d.ts +109 -0
- package/dist/lib/harness/console/types.d.ts.map +1 -0
- package/dist/lib/harness/console/types.js +2 -0
- package/dist/lib/harness/console/types.js.map +1 -0
- package/dist/lib/harness/contract.d.ts +229 -0
- package/dist/lib/harness/contract.d.ts.map +1 -0
- package/dist/lib/harness/contract.js +22 -0
- package/dist/lib/harness/contract.js.map +1 -0
- package/dist/lib/harness/credential.d.ts +23 -0
- package/dist/lib/harness/credential.d.ts.map +1 -0
- package/dist/lib/harness/credential.js +81 -0
- package/dist/lib/harness/credential.js.map +1 -0
- package/dist/lib/harness/credential.test.d.ts +2 -0
- package/dist/lib/harness/credential.test.d.ts.map +1 -0
- package/dist/lib/harness/credential.test.js +74 -0
- package/dist/lib/harness/credential.test.js.map +1 -0
- package/dist/lib/harness/evaluate.d.ts +390 -0
- package/dist/lib/harness/evaluate.d.ts.map +1 -0
- package/dist/lib/harness/evaluate.js +988 -0
- package/dist/lib/harness/evaluate.js.map +1 -0
- package/dist/lib/harness/evaluate.test.d.ts +2 -0
- package/dist/lib/harness/evaluate.test.d.ts.map +1 -0
- package/dist/lib/harness/evaluate.test.js +621 -0
- package/dist/lib/harness/evaluate.test.js.map +1 -0
- package/dist/lib/harness/extract.d.ts +152 -0
- package/dist/lib/harness/extract.d.ts.map +1 -0
- package/dist/lib/harness/extract.js +1601 -0
- package/dist/lib/harness/extract.js.map +1 -0
- package/dist/lib/harness/gate.d.ts +48 -0
- package/dist/lib/harness/gate.d.ts.map +1 -0
- package/dist/lib/harness/gate.js +60 -0
- package/dist/lib/harness/gate.js.map +1 -0
- package/dist/lib/harness/gate.test.d.ts +2 -0
- package/dist/lib/harness/gate.test.d.ts.map +1 -0
- package/dist/lib/harness/gate.test.js +111 -0
- package/dist/lib/harness/gate.test.js.map +1 -0
- package/dist/lib/harness/self-check.d.ts +59 -0
- package/dist/lib/harness/self-check.d.ts.map +1 -0
- package/dist/lib/harness/self-check.js +56 -0
- package/dist/lib/harness/self-check.js.map +1 -0
- package/dist/lib/harness/self-check.test.d.ts +2 -0
- package/dist/lib/harness/self-check.test.d.ts.map +1 -0
- package/dist/lib/harness/self-check.test.js +43 -0
- package/dist/lib/harness/self-check.test.js.map +1 -0
- package/dist/lib/harness/transcript.d.ts +65 -0
- package/dist/lib/harness/transcript.d.ts.map +1 -0
- package/dist/lib/harness/transcript.js +144 -0
- package/dist/lib/harness/transcript.js.map +1 -0
- package/dist/lib/harness/transcript.test.d.ts +2 -0
- package/dist/lib/harness/transcript.test.d.ts.map +1 -0
- package/dist/lib/harness/transcript.test.js +118 -0
- package/dist/lib/harness/transcript.test.js.map +1 -0
- package/dist/lib/harness-wiring.d.ts +145 -0
- package/dist/lib/harness-wiring.d.ts.map +1 -0
- package/dist/lib/harness-wiring.js +280 -0
- package/dist/lib/harness-wiring.js.map +1 -0
- package/dist/lib/hook-staleness.d.ts +95 -0
- package/dist/lib/hook-staleness.d.ts.map +1 -0
- package/dist/lib/hook-staleness.js +304 -0
- package/dist/lib/hook-staleness.js.map +1 -0
- package/dist/lib/jsonl.d.ts +270 -2
- package/dist/lib/jsonl.d.ts.map +1 -1
- package/dist/lib/jsonl.js +472 -76
- package/dist/lib/jsonl.js.map +1 -1
- package/dist/lib/memory.d.ts +350 -23
- package/dist/lib/memory.d.ts.map +1 -1
- package/dist/lib/memory.js +751 -38
- package/dist/lib/memory.js.map +1 -1
- package/dist/lib/otel-env.d.ts +90 -0
- package/dist/lib/otel-env.d.ts.map +1 -0
- package/dist/lib/otel-env.js +98 -0
- package/dist/lib/otel-env.js.map +1 -0
- package/dist/lib/project-config.d.ts +167 -0
- package/dist/lib/project-config.d.ts.map +1 -1
- package/dist/lib/project-config.js +321 -5
- package/dist/lib/project-config.js.map +1 -1
- package/dist/lib/projects-registry.d.ts +82 -0
- package/dist/lib/projects-registry.d.ts.map +1 -0
- package/dist/lib/projects-registry.js +145 -0
- package/dist/lib/projects-registry.js.map +1 -0
- package/dist/lib/projects-registry.test.d.ts +2 -0
- package/dist/lib/projects-registry.test.d.ts.map +1 -0
- package/dist/lib/projects-registry.test.js +176 -0
- package/dist/lib/projects-registry.test.js.map +1 -0
- package/dist/lib/repo-guard-scope.d.ts +126 -0
- package/dist/lib/repo-guard-scope.d.ts.map +1 -0
- package/dist/lib/repo-guard-scope.js +249 -0
- package/dist/lib/repo-guard-scope.js.map +1 -0
- package/dist/lib/report-format.d.ts +132 -0
- package/dist/lib/report-format.d.ts.map +1 -0
- package/dist/lib/report-format.js +317 -0
- package/dist/lib/report-format.js.map +1 -0
- package/dist/lib/roster.d.ts +87 -0
- package/dist/lib/roster.d.ts.map +1 -0
- package/dist/lib/roster.js +332 -0
- package/dist/lib/roster.js.map +1 -0
- package/dist/lib/roster.test.d.ts +15 -0
- package/dist/lib/roster.test.d.ts.map +1 -0
- package/dist/lib/roster.test.js +299 -0
- package/dist/lib/roster.test.js.map +1 -0
- package/dist/lib/runtime/codex-adapter.d.ts.map +1 -1
- package/dist/lib/runtime/codex-adapter.js +5 -0
- package/dist/lib/runtime/codex-adapter.js.map +1 -1
- package/dist/lib/runtime/codex-config.d.ts +129 -0
- package/dist/lib/runtime/codex-config.d.ts.map +1 -1
- package/dist/lib/runtime/codex-config.js +225 -0
- package/dist/lib/runtime/codex-config.js.map +1 -1
- package/dist/lib/runtime/identity.d.ts +72 -0
- package/dist/lib/runtime/identity.d.ts.map +1 -0
- package/dist/lib/runtime/identity.js +128 -0
- package/dist/lib/runtime/identity.js.map +1 -0
- package/dist/lib/standards.d.ts +99 -0
- package/dist/lib/standards.d.ts.map +1 -0
- package/dist/lib/standards.js +201 -0
- package/dist/lib/standards.js.map +1 -0
- package/dist/lib/team-identity.d.ts +134 -0
- package/dist/lib/team-identity.d.ts.map +1 -0
- package/dist/lib/team-identity.js +193 -0
- package/dist/lib/team-identity.js.map +1 -0
- package/dist/lib/templates.d.ts +29 -2
- package/dist/lib/templates.d.ts.map +1 -1
- package/dist/lib/templates.js +1042 -82
- package/dist/lib/templates.js.map +1 -1
- package/dist/lib/terminal-ui.d.ts.map +1 -1
- package/dist/lib/terminal-ui.js +12 -1
- package/dist/lib/terminal-ui.js.map +1 -1
- package/dist/lib/test-project.d.ts +95 -0
- package/dist/lib/test-project.d.ts.map +1 -0
- package/dist/lib/test-project.js +103 -0
- package/dist/lib/test-project.js.map +1 -0
- package/dist/lib/vault.d.ts +60 -0
- package/dist/lib/vault.d.ts.map +1 -0
- package/dist/lib/vault.js +102 -0
- package/dist/lib/vault.js.map +1 -0
- package/dist/lib/vault.test.d.ts +17 -0
- package/dist/lib/vault.test.d.ts.map +1 -0
- package/dist/lib/vault.test.js +169 -0
- package/dist/lib/vault.test.js.map +1 -0
- package/dist/lib/window-view.d.ts +63 -0
- package/dist/lib/window-view.d.ts.map +1 -0
- package/dist/lib/window-view.js +217 -0
- package/dist/lib/window-view.js.map +1 -0
- package/dist/lib/window-view.test.d.ts +2 -0
- package/dist/lib/window-view.test.d.ts.map +1 -0
- package/dist/lib/window-view.test.js +168 -0
- package/dist/lib/window-view.test.js.map +1 -0
- package/dist/lib/worktree-sync.d.ts +439 -0
- package/dist/lib/worktree-sync.d.ts.map +1 -0
- package/dist/lib/worktree-sync.js +1167 -0
- package/dist/lib/worktree-sync.js.map +1 -0
- package/dist/lib/worktree.d.ts +58 -1
- package/dist/lib/worktree.d.ts.map +1 -1
- package/dist/lib/worktree.js +91 -4
- package/dist/lib/worktree.js.map +1 -1
- package/dist/standards/decision-request.md +98 -0
- package/dist/standards/fail-loud-standard.md +495 -0
- package/dist/standards/po-communication-standard.md +126 -0
- package/dist/standards/report-format.md +128 -0
- package/dist/standards/writing-standard.md +382 -0
- package/package.json +3 -2
- package/scripts/generate-claude.mjs +119 -46
|
@@ -0,0 +1,952 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for per-billed-call usage counting (#307).
|
|
3
|
+
*
|
|
4
|
+
* One API call writes several transcript lines. A streamed response records
|
|
5
|
+
* `message_start`, which fixes input and cache usage, then `message_delta` lines
|
|
6
|
+
* whose `output_tokens` grows. Every line repeats the same input and cache
|
|
7
|
+
* numbers. readProjectUsage and parseAgentAttribution summed per line, so each
|
|
8
|
+
* streamed call was counted two or three times.
|
|
9
|
+
*
|
|
10
|
+
* Measured over 29 days of fleet transcripts before the fix: input and cache read
|
|
11
|
+
* overstated 2.057x, cache write 2.648x, cost 2.183x.
|
|
12
|
+
*
|
|
13
|
+
* The three-line fixture reproduces the SHAPE of a real streamed group measured
|
|
14
|
+
* in our own fleet traffic: one requestId, one message.id, three lines,
|
|
15
|
+
* cache_creation_input_tokens 138016 repeated on each. The identifiers are
|
|
16
|
+
* synthetic, because a committed fixture is permanent and a made-up value works
|
|
17
|
+
* as well. The shape and the 138016 are what the fix is pinned to. Fixtures carry
|
|
18
|
+
* token values and identifiers only, and no message content.
|
|
19
|
+
*
|
|
20
|
+
* Fixtures use two project dirs so the two discovery walks cannot interfere: the
|
|
21
|
+
* plain path reads top-level transcripts, the attribution path reads
|
|
22
|
+
* <sessionId>/subagents/agent-<id>.jsonl children.
|
|
23
|
+
*/
|
|
24
|
+
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
25
|
+
import { mkdirSync, rmSync, writeFileSync } from 'fs';
|
|
26
|
+
import { join } from 'path';
|
|
27
|
+
import { tmpdir } from 'os';
|
|
28
|
+
import { readProjectUsage, parseAgentAttribution, parseSessionRecords, newUsageGrouper, addUsageLine, drainUsageGroups, usageGroupKey, hasRates, usageTokenCount, usageEntryTs, calcLineCost, getRates, newTotals, } from '../lib/jsonl.js';
|
|
29
|
+
import { renderTable, renderCostTable, mxUndatedLine, groupingSummaryLine, OVERCOUNT_NOTE, OVERCOUNT_NOTE_REF, } from '../commands/usage.js';
|
|
30
|
+
const SESSION = 'session-307';
|
|
31
|
+
const MODEL = 'claude-opus-5';
|
|
32
|
+
const RECENT_MS = 365 * 24 * 60 * 60 * 1000; // wide window — fixtures are dated
|
|
33
|
+
// The measured shape: one requestId, one message.id, three lines. Synthetic ids.
|
|
34
|
+
const REQ = 'req_test0000000000000001';
|
|
35
|
+
const MSG_ID = 'msg_test0000000000000001';
|
|
36
|
+
const CACHE_WRITE = 138016;
|
|
37
|
+
const CACHE_READ = 14503;
|
|
38
|
+
const INPUT = 4;
|
|
39
|
+
const T = ['2026-08-06T10:00:00.000Z', '2026-08-06T10:00:02.000Z', '2026-08-06T10:00:07.000Z'];
|
|
40
|
+
let plainDir;
|
|
41
|
+
let childDir;
|
|
42
|
+
let childSubagents;
|
|
43
|
+
let sessionDir;
|
|
44
|
+
beforeEach(() => {
|
|
45
|
+
const stamp = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
|
|
46
|
+
plainDir = join(tmpdir(), `mx-group-plain-${stamp}`);
|
|
47
|
+
childDir = join(tmpdir(), `mx-group-child-${stamp}`);
|
|
48
|
+
sessionDir = join(tmpdir(), `mx-group-session-${stamp}`);
|
|
49
|
+
childSubagents = join(childDir, SESSION, 'subagents');
|
|
50
|
+
mkdirSync(plainDir, { recursive: true });
|
|
51
|
+
mkdirSync(childSubagents, { recursive: true });
|
|
52
|
+
mkdirSync(sessionDir, { recursive: true });
|
|
53
|
+
});
|
|
54
|
+
afterEach(() => {
|
|
55
|
+
rmSync(plainDir, { recursive: true, force: true });
|
|
56
|
+
rmSync(childDir, { recursive: true, force: true });
|
|
57
|
+
rmSync(sessionDir, { recursive: true, force: true });
|
|
58
|
+
});
|
|
59
|
+
function usageLine(o) {
|
|
60
|
+
const entry = {
|
|
61
|
+
type: 'assistant',
|
|
62
|
+
timestamp: o.ts ?? T[0],
|
|
63
|
+
sessionId: SESSION,
|
|
64
|
+
message: {
|
|
65
|
+
role: 'assistant',
|
|
66
|
+
...(o.messageId ? { id: o.messageId } : {}),
|
|
67
|
+
model: o.model ?? MODEL,
|
|
68
|
+
usage: {
|
|
69
|
+
input_tokens: o.input ?? INPUT,
|
|
70
|
+
output_tokens: o.output,
|
|
71
|
+
cache_read_input_tokens: o.cacheR ?? CACHE_READ,
|
|
72
|
+
cache_creation_input_tokens: o.cacheW ?? CACHE_WRITE,
|
|
73
|
+
},
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
if (o.requestId)
|
|
77
|
+
entry.requestId = o.requestId;
|
|
78
|
+
return JSON.stringify(entry);
|
|
79
|
+
}
|
|
80
|
+
/** The three lines one streamed call writes: same input and cache, growing output. */
|
|
81
|
+
function streamedCall(requestId, messageId, outputs) {
|
|
82
|
+
return outputs.map((output, i) => usageLine({ requestId, messageId, output, ts: T[Math.min(i, T.length - 1)] }));
|
|
83
|
+
}
|
|
84
|
+
function writeLead(lines) {
|
|
85
|
+
writeFileSync(join(plainDir, `${SESSION}.jsonl`), lines.join('\n') + '\n');
|
|
86
|
+
}
|
|
87
|
+
function writeChild(lines) {
|
|
88
|
+
writeFileSync(join(childSubagents, 'agent-aORPHAN.jsonl'), lines.join('\n') + '\n');
|
|
89
|
+
}
|
|
90
|
+
/** Write one transcript file the parseSessionRecords walk reads. */
|
|
91
|
+
function writeSession(lines, file = `${SESSION}.jsonl`) {
|
|
92
|
+
writeFileSync(join(sessionDir, file), lines.join('\n') + '\n');
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* A transcript line whose usage object and timestamp are written as given, so a
|
|
96
|
+
* malformed shape can be tested. Values and identifiers only, no message content.
|
|
97
|
+
*/
|
|
98
|
+
function rawLine(o) {
|
|
99
|
+
const entry = {
|
|
100
|
+
type: 'assistant',
|
|
101
|
+
sessionId: SESSION,
|
|
102
|
+
message: {
|
|
103
|
+
role: 'assistant',
|
|
104
|
+
...(o.messageId ? { id: o.messageId } : {}),
|
|
105
|
+
model: MODEL,
|
|
106
|
+
usage: o.usage,
|
|
107
|
+
},
|
|
108
|
+
};
|
|
109
|
+
if (o.requestId)
|
|
110
|
+
entry.requestId = o.requestId;
|
|
111
|
+
if (o.timestamp !== undefined)
|
|
112
|
+
entry.timestamp = o.timestamp;
|
|
113
|
+
return JSON.stringify(entry);
|
|
114
|
+
}
|
|
115
|
+
/** Total cost the --by-agent view reports (attributed plus residual). */
|
|
116
|
+
function attributionCost(dir) {
|
|
117
|
+
const r = parseAgentAttribution(dir);
|
|
118
|
+
let cost = r.unattributed.cost;
|
|
119
|
+
for (const agent of r.agents.values())
|
|
120
|
+
cost += agent.cost;
|
|
121
|
+
return cost;
|
|
122
|
+
}
|
|
123
|
+
// ── The measured three-line group ────────────────────────────────────────────
|
|
124
|
+
describe('readProjectUsage counts one row per billed call (#307)', () => {
|
|
125
|
+
it('collapses a three-line streamed group to one row', () => {
|
|
126
|
+
const lines = streamedCall(REQ, MSG_ID, [1, 47, 312]);
|
|
127
|
+
expect(lines).toHaveLength(3);
|
|
128
|
+
writeLead(lines);
|
|
129
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
130
|
+
// After: one row, each constant field counted once.
|
|
131
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
132
|
+
expect(allTime.usageUngrouped).toBe(0);
|
|
133
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
134
|
+
expect(allTime.cacheWriteTokens).toBe(CACHE_WRITE);
|
|
135
|
+
expect(allTime.cacheReadTokens).toBe(CACHE_READ);
|
|
136
|
+
expect(allTime.inputTokens).toBe(INPUT);
|
|
137
|
+
expect(allTime.outputTokens).toBe(312);
|
|
138
|
+
});
|
|
139
|
+
it('reports 1x rather than the 3x per-line sum the old code produced', () => {
|
|
140
|
+
writeLead(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
141
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
142
|
+
// Before: the per-line sum, which is what shipped until this fix.
|
|
143
|
+
const beforeCacheWrite = CACHE_WRITE * 3;
|
|
144
|
+
const beforeCacheRead = CACHE_READ * 3;
|
|
145
|
+
const beforeInput = INPUT * 3;
|
|
146
|
+
const beforeOutput = 1 + 47 + 312;
|
|
147
|
+
expect(allTime.cacheWriteTokens).not.toBe(beforeCacheWrite);
|
|
148
|
+
expect(allTime.cacheReadTokens).not.toBe(beforeCacheRead);
|
|
149
|
+
expect(allTime.inputTokens).not.toBe(beforeInput);
|
|
150
|
+
expect(allTime.outputTokens).not.toBe(beforeOutput);
|
|
151
|
+
// After: exactly one third of the repeated fields, and the final output value.
|
|
152
|
+
expect(allTime.cacheWriteTokens).toBe(beforeCacheWrite / 3);
|
|
153
|
+
expect(allTime.cacheReadTokens).toBe(beforeCacheRead / 3);
|
|
154
|
+
expect(allTime.inputTokens).toBe(beforeInput / 3);
|
|
155
|
+
expect(allTime.outputTokens).toBe(312);
|
|
156
|
+
});
|
|
157
|
+
it('prices the group once', () => {
|
|
158
|
+
writeLead(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
159
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
160
|
+
const expected = calcLineCost(INPUT, 312, CACHE_READ, CACHE_WRITE, getRates(MODEL));
|
|
161
|
+
expect(allTime.cost).toBeCloseTo(expected, 10);
|
|
162
|
+
});
|
|
163
|
+
it('takes the maximum output_tokens when it grows 10, 25, 40', () => {
|
|
164
|
+
writeLead(streamedCall(REQ, MSG_ID, [10, 25, 40]));
|
|
165
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
166
|
+
expect(allTime.outputTokens).toBe(40);
|
|
167
|
+
expect(allTime.outputTokens).not.toBe(10 + 25 + 40);
|
|
168
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
169
|
+
});
|
|
170
|
+
it('keeps two distinct requestIds as two billed calls', () => {
|
|
171
|
+
writeLead([
|
|
172
|
+
...streamedCall(REQ, MSG_ID, [10, 40]),
|
|
173
|
+
...streamedCall('req_test0000000000000002', 'msg_test0000000000000002', [5, 9]),
|
|
174
|
+
]);
|
|
175
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
176
|
+
expect(allTime.usageGrouped).toBe(2);
|
|
177
|
+
expect(allTime.cacheWriteTokens).toBe(CACHE_WRITE * 2);
|
|
178
|
+
expect(allTime.outputTokens).toBe(40 + 9);
|
|
179
|
+
});
|
|
180
|
+
});
|
|
181
|
+
// ── Key fallback, ungrouped lines, inconsistency ─────────────────────────────
|
|
182
|
+
describe('grouping key: requestId, then message.id (#307 criterion 1)', () => {
|
|
183
|
+
it('prefers requestId', () => {
|
|
184
|
+
expect(usageGroupKey({ requestId: REQ, message: { id: MSG_ID } })).toBe(REQ);
|
|
185
|
+
});
|
|
186
|
+
it('falls back to message.id when requestId is absent', () => {
|
|
187
|
+
expect(usageGroupKey({ message: { id: MSG_ID } })).toBe(MSG_ID);
|
|
188
|
+
});
|
|
189
|
+
it('returns an empty key when the entry carries neither', () => {
|
|
190
|
+
expect(usageGroupKey({ message: { model: MODEL } })).toBe('');
|
|
191
|
+
});
|
|
192
|
+
it('groups lines that share message.id with no requestId', () => {
|
|
193
|
+
writeLead([
|
|
194
|
+
usageLine({ messageId: MSG_ID, output: 10, ts: T[0] }),
|
|
195
|
+
usageLine({ messageId: MSG_ID, output: 40, ts: T[1] }),
|
|
196
|
+
]);
|
|
197
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
198
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
199
|
+
expect(allTime.usageUngrouped).toBe(0);
|
|
200
|
+
expect(allTime.cacheWriteTokens).toBe(CACHE_WRITE);
|
|
201
|
+
expect(allTime.outputTokens).toBe(40);
|
|
202
|
+
});
|
|
203
|
+
});
|
|
204
|
+
describe('lines with no key at all (#307 criterion 4)', () => {
|
|
205
|
+
it('counts each once and reports them apart from grouped rows', () => {
|
|
206
|
+
writeLead([
|
|
207
|
+
usageLine({ output: 10, ts: T[0] }),
|
|
208
|
+
usageLine({ output: 20, ts: T[1] }),
|
|
209
|
+
...streamedCall(REQ, MSG_ID, [5, 30]),
|
|
210
|
+
]);
|
|
211
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
212
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
213
|
+
expect(allTime.usageUngrouped).toBe(2);
|
|
214
|
+
// Two unkeyed lines plus one grouped call: three billed rows, no merging and
|
|
215
|
+
// nothing dropped.
|
|
216
|
+
expect(allTime.cacheWriteTokens).toBe(CACHE_WRITE * 3);
|
|
217
|
+
expect(allTime.outputTokens).toBe(10 + 20 + 30);
|
|
218
|
+
});
|
|
219
|
+
});
|
|
220
|
+
describe('constancy assertion (#307 criterion 2)', () => {
|
|
221
|
+
it('reports a usage-inconsistent count and never sums the varying field', () => {
|
|
222
|
+
writeLead([
|
|
223
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 10, cacheW: CACHE_WRITE, ts: T[0] }),
|
|
224
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 40, cacheW: CACHE_WRITE + 7, ts: T[1] }),
|
|
225
|
+
]);
|
|
226
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
227
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
228
|
+
expect(allTime.usageInconsistent).toBe(1);
|
|
229
|
+
expect(allTime.cacheWriteTokens).toBe(CACHE_WRITE + 7);
|
|
230
|
+
expect(allTime.cacheWriteTokens).not.toBe(CACHE_WRITE + CACHE_WRITE + 7);
|
|
231
|
+
});
|
|
232
|
+
it('flags a group whose lines name different models', () => {
|
|
233
|
+
// model selects the rate, and it was the one grouped field the check did not
|
|
234
|
+
// cover: the first line set the price for the whole group. Measured before
|
|
235
|
+
// the check covered it, a haiku-then-opus group priced at $0.0055 instead of
|
|
236
|
+
// $0.0275 and reported usageInconsistent 0.
|
|
237
|
+
writeLead([
|
|
238
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 10, model: 'claude-haiku-4-5', ts: T[0] }),
|
|
239
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 900, model: 'claude-opus-5', ts: T[1] }),
|
|
240
|
+
]);
|
|
241
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
242
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
243
|
+
expect(allTime.usageInconsistent).toBe(1);
|
|
244
|
+
});
|
|
245
|
+
it('does not flag a line that names no model at all', () => {
|
|
246
|
+
// A message_delta line carries no model. That is not a disagreement, so the
|
|
247
|
+
// comparison runs only when both sides are non-empty.
|
|
248
|
+
const g = newUsageGrouper();
|
|
249
|
+
for (const entry of [
|
|
250
|
+
{ requestId: REQ, timestamp: T[0], message: { id: MSG_ID, model: MODEL, usage: { input_tokens: 4, output_tokens: 10, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } } },
|
|
251
|
+
{ requestId: REQ, timestamp: T[1], message: { id: MSG_ID, usage: { input_tokens: 4, output_tokens: 900, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } } },
|
|
252
|
+
])
|
|
253
|
+
addUsageLine(g, entry);
|
|
254
|
+
const { rows, stats } = drainUsageGroups(g);
|
|
255
|
+
expect(stats.inconsistent).toBe(0);
|
|
256
|
+
expect(rows[0].model).toBe(MODEL);
|
|
257
|
+
});
|
|
258
|
+
it('reports zero inconsistency for a well-formed group', () => {
|
|
259
|
+
writeLead(streamedCall(REQ, MSG_ID, [10, 25, 40]));
|
|
260
|
+
expect(readProjectUsage(plainDir, RECENT_MS).allTime.usageInconsistent).toBe(0);
|
|
261
|
+
});
|
|
262
|
+
});
|
|
263
|
+
// ── The grouper itself ───────────────────────────────────────────────────────
|
|
264
|
+
describe('usage grouper primitives (#307)', () => {
|
|
265
|
+
it('returns false for an entry with no usage object', () => {
|
|
266
|
+
const g = newUsageGrouper();
|
|
267
|
+
expect(addUsageLine(g, { type: 'user', message: { role: 'user' } })).toBe(false);
|
|
268
|
+
expect(drainUsageGroups(g).rows).toHaveLength(0);
|
|
269
|
+
});
|
|
270
|
+
it('merges three lines into one row and counts the lines it merged', () => {
|
|
271
|
+
const g = newUsageGrouper();
|
|
272
|
+
for (const line of streamedCall(REQ, MSG_ID, [1, 47, 312]))
|
|
273
|
+
addUsageLine(g, JSON.parse(line));
|
|
274
|
+
const { rows, stats } = drainUsageGroups(g);
|
|
275
|
+
expect(rows).toHaveLength(1);
|
|
276
|
+
expect(rows[0].lines).toBe(3);
|
|
277
|
+
expect(rows[0].key).toBe(REQ);
|
|
278
|
+
expect(rows[0].keyed).toBe(true);
|
|
279
|
+
expect(rows[0].cacheWrite).toBe(CACHE_WRITE);
|
|
280
|
+
expect(rows[0].output).toBe(312);
|
|
281
|
+
expect(stats).toEqual({ grouped: 1, ungrouped: 0, inconsistent: 0, undated: 0 });
|
|
282
|
+
});
|
|
283
|
+
it('takes the latest timestamp in the group', () => {
|
|
284
|
+
const g = newUsageGrouper();
|
|
285
|
+
for (const line of streamedCall(REQ, MSG_ID, [1, 47, 312]))
|
|
286
|
+
addUsageLine(g, JSON.parse(line));
|
|
287
|
+
expect(drainUsageGroups(g).rows[0].ts).toBe(new Date(T[2]).getTime());
|
|
288
|
+
});
|
|
289
|
+
});
|
|
290
|
+
// ── A malformed model field must not abort the report ────────────────────────
|
|
291
|
+
describe('non-string message.model (security review, #307)', () => {
|
|
292
|
+
it('keeps every good row when one line carries a numeric model', () => {
|
|
293
|
+
// `(message?.model as string) || ''` kept the number, normalizeModelId called
|
|
294
|
+
// .replace on it, and the throw escaped the per-file loop. Pricing runs once
|
|
295
|
+
// per group after the file is read, so a single bad line took the whole
|
|
296
|
+
// report with it, naming no file.
|
|
297
|
+
const good = [
|
|
298
|
+
usageLine({ requestId: 'req_test0000000000000003', messageId: 'msg_test0000000000000003', output: 10 }),
|
|
299
|
+
usageLine({ requestId: 'req_test0000000000000004', messageId: 'msg_test0000000000000004', output: 20 }),
|
|
300
|
+
];
|
|
301
|
+
const bad = JSON.stringify({
|
|
302
|
+
type: 'assistant',
|
|
303
|
+
timestamp: T[0],
|
|
304
|
+
sessionId: SESSION,
|
|
305
|
+
requestId: 'req_test0000000000000005',
|
|
306
|
+
message: {
|
|
307
|
+
role: 'assistant',
|
|
308
|
+
id: 'msg_test0000000000000005',
|
|
309
|
+
model: 7,
|
|
310
|
+
usage: {
|
|
311
|
+
input_tokens: INPUT,
|
|
312
|
+
output_tokens: 30,
|
|
313
|
+
cache_read_input_tokens: CACHE_READ,
|
|
314
|
+
cache_creation_input_tokens: CACHE_WRITE,
|
|
315
|
+
},
|
|
316
|
+
},
|
|
317
|
+
});
|
|
318
|
+
writeLead([...good, bad]);
|
|
319
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
320
|
+
expect(allTime.usageGrouped).toBe(3);
|
|
321
|
+
expect(allTime.outputTokens).toBe(10 + 20 + 30);
|
|
322
|
+
expect(allTime.inputTokens).toBe(INPUT * 3);
|
|
323
|
+
// The bad line prices at the fallback rate rather than throwing, and its
|
|
324
|
+
// empty model never reaches the models set.
|
|
325
|
+
expect(allTime.models.has(MODEL)).toBe(true);
|
|
326
|
+
expect(Array.from(allTime.models).every((m) => typeof m === 'string')).toBe(true);
|
|
327
|
+
});
|
|
328
|
+
it('keeps a second transcript in the same project dir', () => {
|
|
329
|
+
writeLead([
|
|
330
|
+
JSON.stringify({
|
|
331
|
+
type: 'assistant',
|
|
332
|
+
timestamp: T[0],
|
|
333
|
+
sessionId: SESSION,
|
|
334
|
+
requestId: 'req_test0000000000000006',
|
|
335
|
+
message: {
|
|
336
|
+
role: 'assistant',
|
|
337
|
+
id: 'msg_test0000000000000006',
|
|
338
|
+
model: 7,
|
|
339
|
+
usage: { input_tokens: INPUT, output_tokens: 30, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
340
|
+
},
|
|
341
|
+
}),
|
|
342
|
+
]);
|
|
343
|
+
writeFileSync(join(plainDir, 'session-307-clean.jsonl'), usageLine({ requestId: 'req_test0000000000000007', messageId: 'msg_test0000000000000007', output: 99 }) + '\n');
|
|
344
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
345
|
+
expect(allTime.usageGrouped).toBe(2);
|
|
346
|
+
expect(allTime.outputTokens).toBe(30 + 99);
|
|
347
|
+
});
|
|
348
|
+
it('keeps the good rows in parseAgentAttribution too', () => {
|
|
349
|
+
writeChild([
|
|
350
|
+
usageLine({ requestId: 'req_test0000000000000008', messageId: 'msg_test0000000000000008', output: 10 }),
|
|
351
|
+
JSON.stringify({
|
|
352
|
+
type: 'assistant',
|
|
353
|
+
timestamp: T[0],
|
|
354
|
+
sessionId: SESSION,
|
|
355
|
+
requestId: 'req_test0000000000000009',
|
|
356
|
+
message: {
|
|
357
|
+
role: 'assistant',
|
|
358
|
+
id: 'msg_test0000000000000009',
|
|
359
|
+
model: 7,
|
|
360
|
+
usage: { input_tokens: INPUT, output_tokens: 20, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
361
|
+
},
|
|
362
|
+
}),
|
|
363
|
+
]);
|
|
364
|
+
const r = parseAgentAttribution(childDir);
|
|
365
|
+
expect(r.usageGrouped).toBe(2);
|
|
366
|
+
expect(r.unattributed.outputTokens).toBe(30);
|
|
367
|
+
});
|
|
368
|
+
});
|
|
369
|
+
// ── The recent window ────────────────────────────────────────────────────────
|
|
370
|
+
describe('recent window (#307)', () => {
|
|
371
|
+
it('counts a group once in the recent totals', () => {
|
|
372
|
+
const now = Date.now();
|
|
373
|
+
const inWindow = [
|
|
374
|
+
new Date(now - 60_000).toISOString(),
|
|
375
|
+
new Date(now - 30_000).toISOString(),
|
|
376
|
+
];
|
|
377
|
+
writeLead([
|
|
378
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 10, ts: inWindow[0] }),
|
|
379
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 40, ts: inWindow[1] }),
|
|
380
|
+
]);
|
|
381
|
+
const { recent } = readProjectUsage(plainDir, 24 * 60 * 60 * 1000);
|
|
382
|
+
expect(recent.usageGrouped).toBe(1);
|
|
383
|
+
expect(recent.cacheWriteTokens).toBe(CACHE_WRITE);
|
|
384
|
+
expect(recent.outputTokens).toBe(40);
|
|
385
|
+
});
|
|
386
|
+
});
|
|
387
|
+
// ── parseAgentAttribution ────────────────────────────────────────────────────
|
|
388
|
+
describe('parseAgentAttribution counts one row per billed call (#307)', () => {
|
|
389
|
+
it('collapses the three-line group in a child transcript', () => {
|
|
390
|
+
writeChild(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
391
|
+
const r = parseAgentAttribution(childDir);
|
|
392
|
+
expect(r.usageGrouped).toBe(1);
|
|
393
|
+
expect(r.usageUngrouped).toBe(0);
|
|
394
|
+
expect(r.usageInconsistent).toBe(0);
|
|
395
|
+
expect(r.unattributed.cacheWriteTokens).toBe(CACHE_WRITE);
|
|
396
|
+
expect(r.unattributed.cacheWriteTokens).not.toBe(CACHE_WRITE * 3);
|
|
397
|
+
expect(r.unattributed.outputTokens).toBe(312);
|
|
398
|
+
});
|
|
399
|
+
it('prices the group once', () => {
|
|
400
|
+
writeChild(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
401
|
+
const expected = calcLineCost(INPUT, 312, CACHE_READ, CACHE_WRITE, getRates(MODEL));
|
|
402
|
+
expect(attributionCost(childDir)).toBeCloseTo(expected, 10);
|
|
403
|
+
});
|
|
404
|
+
it('takes the maximum output_tokens when it grows 10, 25, 40', () => {
|
|
405
|
+
writeChild(streamedCall(REQ, MSG_ID, [10, 25, 40]));
|
|
406
|
+
expect(parseAgentAttribution(childDir).unattributed.outputTokens).toBe(40);
|
|
407
|
+
});
|
|
408
|
+
it('counts unkeyed usage lines once each and reports them apart', () => {
|
|
409
|
+
writeChild([
|
|
410
|
+
usageLine({ output: 10, ts: T[0] }),
|
|
411
|
+
...streamedCall(REQ, MSG_ID, [5, 30]),
|
|
412
|
+
]);
|
|
413
|
+
const r = parseAgentAttribution(childDir);
|
|
414
|
+
expect(r.usageGrouped).toBe(1);
|
|
415
|
+
expect(r.usageUngrouped).toBe(1);
|
|
416
|
+
expect(r.unattributed.cacheWriteTokens).toBe(CACHE_WRITE * 2);
|
|
417
|
+
});
|
|
418
|
+
it('leaves coverage arithmetic consistent with the grouped totals', () => {
|
|
419
|
+
writeChild(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
420
|
+
const r = parseAgentAttribution(childDir);
|
|
421
|
+
expect(r.unattributedTokens).toBe(INPUT + 312 + CACHE_READ + CACHE_WRITE);
|
|
422
|
+
expect(r.attributedTokens).toBe(0);
|
|
423
|
+
});
|
|
424
|
+
});
|
|
425
|
+
// ── Two known limits of the keying, pinned rather than fixed (#307) ──────────
|
|
426
|
+
describe('known limits of the grouping key (#307)', () => {
|
|
427
|
+
it('splits one call whose lines carry mixed keys, and prices it twice', () => {
|
|
428
|
+
// A line with requestId groups under it; a line of the same call carrying
|
|
429
|
+
// only message.id groups under that. 2 rows, each priced. This errs toward
|
|
430
|
+
// the old overcount, the direction an operator can see, and requestId is on
|
|
431
|
+
// 72,158 of 72,159 usage-bearing lines in the measured corpus. Pinned, not
|
|
432
|
+
// fixed: do not restructure the keying to chase it.
|
|
433
|
+
writeLead([
|
|
434
|
+
usageLine({ requestId: REQ, messageId: MSG_ID, output: 100, ts: T[0] }),
|
|
435
|
+
usageLine({ messageId: MSG_ID, output: 900, ts: T[1] }),
|
|
436
|
+
]);
|
|
437
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
438
|
+
expect(allTime.usageGrouped).toBe(2);
|
|
439
|
+
expect(allTime.inputTokens).toBe(INPUT * 2);
|
|
440
|
+
expect(allTime.cacheWriteTokens).toBe(CACHE_WRITE * 2);
|
|
441
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
442
|
+
});
|
|
443
|
+
it('collapses two lines sharing a requestId however far apart they are', () => {
|
|
444
|
+
// If a provider ever reuses a requestId across separately billed attempts of
|
|
445
|
+
// a retry, this undercounts a real bill, the opposite direction from the
|
|
446
|
+
// defect being fixed. We cannot settle provider retry semantics from this
|
|
447
|
+
// repository, so the current behaviour is pinned and the question is open.
|
|
448
|
+
writeLead([
|
|
449
|
+
usageLine({ requestId: REQ, messageId: 'msg_test0000000000000040', output: 900, ts: T[0] }),
|
|
450
|
+
usageLine({ requestId: REQ, messageId: 'msg_test0000000000000041', output: 900, ts: T[2] }),
|
|
451
|
+
]);
|
|
452
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
453
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
454
|
+
expect(allTime.inputTokens).toBe(INPUT);
|
|
455
|
+
expect(allTime.outputTokens).toBe(900);
|
|
456
|
+
expect(allTime.outputTokens).not.toBe(1800);
|
|
457
|
+
// Nothing varied across the two lines, so no inconsistency is reported.
|
|
458
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
459
|
+
});
|
|
460
|
+
});
|
|
461
|
+
// ── Pricing lookups never reach Object.prototype (#307) ──────────────────────
|
|
462
|
+
describe('getRates agrees with hasRates on prototype keys (#307)', () => {
|
|
463
|
+
const PROTO_KEYS = ['constructor', 'toString', 'valueOf', '__proto__', 'hasOwnProperty'];
|
|
464
|
+
it('prices a prototype-named model at the fallback rate, never NaN', () => {
|
|
465
|
+
for (const key of PROTO_KEYS) {
|
|
466
|
+
const rates = getRates(key);
|
|
467
|
+
expect(hasRates(key)).toBe(false);
|
|
468
|
+
expect(typeof rates.input).toBe('number');
|
|
469
|
+
expect(Number.isNaN(calcLineCost(100, 10, 0, 0, rates))).toBe(false);
|
|
470
|
+
}
|
|
471
|
+
});
|
|
472
|
+
it('keeps one such line from turning a fleet cost total into NaN', () => {
|
|
473
|
+
writeLead([
|
|
474
|
+
...streamedCall(REQ, MSG_ID, [10, 40]),
|
|
475
|
+
usageLine({
|
|
476
|
+
requestId: 'req_test0000000000000030', messageId: 'msg_test0000000000000030',
|
|
477
|
+
output: 5, model: 'constructor', ts: T[1],
|
|
478
|
+
}),
|
|
479
|
+
]);
|
|
480
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
481
|
+
expect(Number.isNaN(allTime.cost)).toBe(false);
|
|
482
|
+
expect(allTime.cost).toBeGreaterThan(0);
|
|
483
|
+
});
|
|
484
|
+
it('still prices a known model from its own entry', () => {
|
|
485
|
+
expect(getRates(MODEL)).toEqual(getRates('claude-opus-5'));
|
|
486
|
+
expect(hasRates(MODEL)).toBe(true);
|
|
487
|
+
});
|
|
488
|
+
});
|
|
489
|
+
// ── The one-release correction note (#307 criterion 5) ───────────────────────
|
|
490
|
+
describe('per-call correction note (#307 criterion 5)', () => {
|
|
491
|
+
it('states all four overstatement factors and is one line', () => {
|
|
492
|
+
// The four measured in issue #307: input and cache read 2.057x, cache write
|
|
493
|
+
// 2.648x, output 1.514x, cost 2.183x. Output and cost were missing while the
|
|
494
|
+
// note printed directly under a cost table.
|
|
495
|
+
expect(OVERCOUNT_NOTE).toContain('2x');
|
|
496
|
+
expect(OVERCOUNT_NOTE).toContain('2.6x');
|
|
497
|
+
expect(OVERCOUNT_NOTE).toContain('1.5x');
|
|
498
|
+
expect(OVERCOUNT_NOTE).toContain('2.2x');
|
|
499
|
+
expect(OVERCOUNT_NOTE).toContain('input and cache read');
|
|
500
|
+
expect(OVERCOUNT_NOTE).toContain('cache write');
|
|
501
|
+
expect(OVERCOUNT_NOTE).toContain('output');
|
|
502
|
+
expect(OVERCOUNT_NOTE).toContain('cost');
|
|
503
|
+
expect(OVERCOUNT_NOTE.split('\n')).toHaveLength(1);
|
|
504
|
+
});
|
|
505
|
+
it('is suppressed on the Token Usage table when the cost table follows', () => {
|
|
506
|
+
// A default run renders this table then the cost table, which prints the
|
|
507
|
+
// note itself. Both printing it put the note on screen twice.
|
|
508
|
+
const logs = [];
|
|
509
|
+
const spy = vi.spyOn(console, 'log').mockImplementation((m) => { logs.push(String(m)); });
|
|
510
|
+
const allTime = newTotals();
|
|
511
|
+
allTime.inputTokens = 100;
|
|
512
|
+
allTime.models.add(MODEL);
|
|
513
|
+
try {
|
|
514
|
+
renderTable([{ slug: 'gateway', allTime, recent: newTotals(), hasLogs: true }], 'Last 30d', { note: false });
|
|
515
|
+
}
|
|
516
|
+
finally {
|
|
517
|
+
spy.mockRestore();
|
|
518
|
+
}
|
|
519
|
+
expect(logs.join('\n')).not.toContain(OVERCOUNT_NOTE);
|
|
520
|
+
});
|
|
521
|
+
it('is printed by the Token Usage table, which shows the affected numbers', () => {
|
|
522
|
+
const logs = [];
|
|
523
|
+
const spy = vi.spyOn(console, 'log').mockImplementation((m) => { logs.push(String(m)); });
|
|
524
|
+
const allTime = newTotals();
|
|
525
|
+
allTime.inputTokens = 100;
|
|
526
|
+
allTime.models.add(MODEL);
|
|
527
|
+
try {
|
|
528
|
+
renderTable([{ slug: 'gateway', allTime, recent: newTotals(), hasLogs: true }], 'Last 30d');
|
|
529
|
+
}
|
|
530
|
+
finally {
|
|
531
|
+
spy.mockRestore();
|
|
532
|
+
}
|
|
533
|
+
expect(logs.join('\n')).toContain(OVERCOUNT_NOTE);
|
|
534
|
+
});
|
|
535
|
+
it('cites issue #307, the literal criterion 5 asks for', () => {
|
|
536
|
+
// The literal, not the constant. `OVERCOUNT_NOTE` interpolates
|
|
537
|
+
// `OVERCOUNT_NOTE_REF`, so asserting one against the other passes whatever
|
|
538
|
+
// the constant says and can never fail. Criterion 5 as amended asks for the
|
|
539
|
+
// issue number, so the expected value is written out here.
|
|
540
|
+
expect(OVERCOUNT_NOTE_REF).toBe('#307');
|
|
541
|
+
expect(OVERCOUNT_NOTE).toContain('#307');
|
|
542
|
+
});
|
|
543
|
+
it('is printed by the cost table, with the three grouping outcomes', () => {
|
|
544
|
+
const logs = [];
|
|
545
|
+
const spy = vi.spyOn(console, 'log').mockImplementation((m) => { logs.push(String(m)); });
|
|
546
|
+
const allTime = newTotals();
|
|
547
|
+
allTime.usageGrouped = 2;
|
|
548
|
+
allTime.usageUngrouped = 1;
|
|
549
|
+
allTime.usageInconsistent = 0;
|
|
550
|
+
allTime.usageUndated = 0;
|
|
551
|
+
try {
|
|
552
|
+
renderCostTable([{ slug: 'gateway', allTime, recent: newTotals(), hasLogs: true }], 'Last 30d');
|
|
553
|
+
}
|
|
554
|
+
finally {
|
|
555
|
+
spy.mockRestore();
|
|
556
|
+
}
|
|
557
|
+
const output = logs.join('\n');
|
|
558
|
+
expect(output).toContain(OVERCOUNT_NOTE);
|
|
559
|
+
expect(output).toContain('grouped');
|
|
560
|
+
expect(output).toContain('ungrouped');
|
|
561
|
+
expect(output).toContain('usage-inconsistent');
|
|
562
|
+
});
|
|
563
|
+
it('renders the four outcomes at zero as well', () => {
|
|
564
|
+
const line = groupingSummaryLine({
|
|
565
|
+
usageGrouped: 0, usageUngrouped: 0, usageInconsistent: 0, usageUndated: 0,
|
|
566
|
+
});
|
|
567
|
+
expect(line).toContain('0 grouped');
|
|
568
|
+
expect(line).toContain('0 ungrouped');
|
|
569
|
+
expect(line).toContain('0 usage-inconsistent');
|
|
570
|
+
expect(line).toContain('0 undated (counted as recent)');
|
|
571
|
+
});
|
|
572
|
+
it('reports the undated count the window rule holds', () => {
|
|
573
|
+
const line = groupingSummaryLine({
|
|
574
|
+
usageGrouped: 12, usageUngrouped: 1, usageInconsistent: 0, usageUndated: 3,
|
|
575
|
+
});
|
|
576
|
+
// The policy is unchanged; only its invisibility is. An operator reading a
|
|
577
|
+
// recent column can now see how many rows it holds on the undated rule
|
|
578
|
+
// rather than on a date.
|
|
579
|
+
expect(line).toContain('3 undated (counted as recent)');
|
|
580
|
+
});
|
|
581
|
+
it('counts an undated row under usageUndated in both totals', () => {
|
|
582
|
+
writeLead([rawLine({
|
|
583
|
+
requestId: REQ, messageId: MSG_ID, timestamp: { iso: T[0] },
|
|
584
|
+
usage: { input_tokens: 10, output_tokens: 5, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
585
|
+
})]);
|
|
586
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
587
|
+
expect(allTime.usageUndated).toBe(1);
|
|
588
|
+
expect(recent.usageUndated).toBe(1);
|
|
589
|
+
});
|
|
590
|
+
it('counts no undated rows for a dated group', () => {
|
|
591
|
+
writeLead(streamedCall(REQ, MSG_ID, [10, 40]));
|
|
592
|
+
expect(readProjectUsage(plainDir, RECENT_MS).allTime.usageUndated).toBe(0);
|
|
593
|
+
expect(drainUsageGroups(newUsageGrouper()).stats.undated).toBe(0);
|
|
594
|
+
});
|
|
595
|
+
});
|
|
596
|
+
// ── parseSessionRecords: the rows mx-agent sync POSTs (#307) ─────────────────
|
|
597
|
+
//
|
|
598
|
+
// parseSessionRecords feeds commands/sync.ts:87, which serialises the
|
|
599
|
+
// SessionRecord array and POSTs it to /v1/sessions/sync. A per-line sum here
|
|
600
|
+
// writes the overcount into the observability store, where correcting it needs a
|
|
601
|
+
// backfill. Measured on the pre-change code with the three-line fixture below:
|
|
602
|
+
// in=12, out=360, cacheRead=43509, cacheWrite=414048 — three times each constant
|
|
603
|
+
// field and the sum of the growing output.
|
|
604
|
+
describe('parseSessionRecords counts one row per billed call (#307)', () => {
|
|
605
|
+
it('collapses a three-line streamed group to one row', () => {
|
|
606
|
+
writeSession(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
607
|
+
const records = parseSessionRecords(sessionDir);
|
|
608
|
+
expect(records).toHaveLength(1);
|
|
609
|
+
expect(records[0].inputTokens).toBe(INPUT);
|
|
610
|
+
expect(records[0].cacheReadTokens).toBe(CACHE_READ);
|
|
611
|
+
expect(records[0].cacheWriteTokens).toBe(CACHE_WRITE);
|
|
612
|
+
expect(records[0].outputTokens).toBe(312);
|
|
613
|
+
});
|
|
614
|
+
it('reports 1x rather than the 3x per-line sum the old code produced', () => {
|
|
615
|
+
writeSession(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
616
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
617
|
+
// The measured pre-change values, which are what sync wrote to the store.
|
|
618
|
+
expect(rec.inputTokens).not.toBe(12);
|
|
619
|
+
expect(rec.outputTokens).not.toBe(360);
|
|
620
|
+
expect(rec.cacheReadTokens).not.toBe(43509);
|
|
621
|
+
expect(rec.cacheWriteTokens).not.toBe(414048);
|
|
622
|
+
});
|
|
623
|
+
it('keeps two distinct requestIds as two billed calls', () => {
|
|
624
|
+
writeSession([
|
|
625
|
+
...streamedCall(REQ, MSG_ID, [10, 40]),
|
|
626
|
+
...streamedCall('req_test0000000000000002', 'msg_test0000000000000002', [5, 9]),
|
|
627
|
+
]);
|
|
628
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
629
|
+
expect(rec.inputTokens).toBe(INPUT * 2);
|
|
630
|
+
expect(rec.cacheWriteTokens).toBe(CACHE_WRITE * 2);
|
|
631
|
+
expect(rec.outputTokens).toBe(40 + 9);
|
|
632
|
+
});
|
|
633
|
+
it('counts a line with neither requestId nor message.id once, and drops nothing', () => {
|
|
634
|
+
writeSession([
|
|
635
|
+
usageLine({ output: 10, ts: T[0] }),
|
|
636
|
+
...streamedCall(REQ, MSG_ID, [5, 30]),
|
|
637
|
+
]);
|
|
638
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
639
|
+
// One unkeyed row plus one grouped call: two billed rows.
|
|
640
|
+
expect(rec.inputTokens).toBe(INPUT * 2);
|
|
641
|
+
expect(rec.cacheWriteTokens).toBe(CACHE_WRITE * 2);
|
|
642
|
+
expect(rec.outputTokens).toBe(10 + 30);
|
|
643
|
+
});
|
|
644
|
+
it('groups within one transcript file, never across two', () => {
|
|
645
|
+
// Grouping scope matches readProjectUsage: every line of one call is written
|
|
646
|
+
// by the file that made it. A session spans files, so the same key in two
|
|
647
|
+
// files is two calls.
|
|
648
|
+
writeSession(streamedCall(REQ, MSG_ID, [10, 40]), `${SESSION}.jsonl`);
|
|
649
|
+
writeSession(streamedCall(REQ, MSG_ID, [10, 40]), `${SESSION}-2.jsonl`);
|
|
650
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
651
|
+
expect(rec.inputTokens).toBe(INPUT * 2);
|
|
652
|
+
expect(rec.cacheWriteTokens).toBe(CACHE_WRITE * 2);
|
|
653
|
+
});
|
|
654
|
+
it('reports the model of the most billed calls, not of the most lines', () => {
|
|
655
|
+
writeSession([
|
|
656
|
+
...streamedCall(REQ, MSG_ID, [1, 47, 312]),
|
|
657
|
+
usageLine({ requestId: 'req_test0000000000000003', messageId: 'msg_test0000000000000003', output: 5, model: 'claude-sonnet-4-5', ts: T[1] }),
|
|
658
|
+
usageLine({ requestId: 'req_test0000000000000004', messageId: 'msg_test0000000000000004', output: 5, model: 'claude-sonnet-4-5', ts: T[2] }),
|
|
659
|
+
]);
|
|
660
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
661
|
+
// Per line: 3 for MODEL against 2. Per billed call: 1 against 2.
|
|
662
|
+
expect(rec.model).toBe('claude-sonnet-4-5');
|
|
663
|
+
expect(rec.model).not.toBe(MODEL);
|
|
664
|
+
});
|
|
665
|
+
it('emits no record for a sessionId that is not a string', () => {
|
|
666
|
+
// Both `sessions` and `fileGroupers` key on this value, and a JS Map keys an
|
|
667
|
+
// object by reference. Measured on the code that cast: three such lines gave
|
|
668
|
+
// three SessionRecords, each with `sessionId` an object, and that array is
|
|
669
|
+
// what mx-agent sync POSTs to /v1/sessions/sync.
|
|
670
|
+
writeSession([0, 1, 2].map((i) => JSON.stringify({
|
|
671
|
+
type: 'assistant', timestamp: T[0], sessionId: { id: 'x' },
|
|
672
|
+
requestId: `req_test000000000000005${i}`,
|
|
673
|
+
message: { role: 'assistant', id: `msg_test000000000000005${i}`, model: MODEL,
|
|
674
|
+
usage: { input_tokens: 10, output_tokens: 1, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } },
|
|
675
|
+
})));
|
|
676
|
+
expect(parseSessionRecords(sessionDir)).toHaveLength(0);
|
|
677
|
+
});
|
|
678
|
+
it('still emits one record for a string sessionId', () => {
|
|
679
|
+
writeSession(streamedCall(REQ, MSG_ID, [10, 40]));
|
|
680
|
+
const records = parseSessionRecords(sessionDir);
|
|
681
|
+
expect(records).toHaveLength(1);
|
|
682
|
+
expect(records[0].sessionId).toBe(SESSION);
|
|
683
|
+
});
|
|
684
|
+
it('leaves human turns, tool calls and duration unchanged', () => {
|
|
685
|
+
writeSession(streamedCall(REQ, MSG_ID, [1, 47, 312]));
|
|
686
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
687
|
+
expect(rec.sessionId).toBe(SESSION);
|
|
688
|
+
expect(rec.humanTurns).toBe(0);
|
|
689
|
+
expect(rec.toolCalls).toBe(0);
|
|
690
|
+
expect(rec.durationMs).toBe(new Date(T[2]).getTime() - new Date(T[0]).getTime());
|
|
691
|
+
});
|
|
692
|
+
});
|
|
693
|
+
// ── A usage field that is not a number (#307) ────────────────────────────────
|
|
694
|
+
//
|
|
695
|
+
// Measured on the pre-change code: one line with `input_tokens: '100'` reported
|
|
696
|
+
// inputTokens as the STRING '0100', because `0 + '100'` concatenates. The figure
|
|
697
|
+
// printed as a token count and was priced.
|
|
698
|
+
describe('usage fields are read as numbers (#307)', () => {
|
|
699
|
+
it('usageTokenCount takes a finite number and rejects every other shape', () => {
|
|
700
|
+
expect(usageTokenCount(100)).toBe(100);
|
|
701
|
+
expect(usageTokenCount(0)).toBe(0);
|
|
702
|
+
expect(usageTokenCount('100')).toBe(0);
|
|
703
|
+
expect(usageTokenCount(true)).toBe(0);
|
|
704
|
+
expect(usageTokenCount(null)).toBe(0);
|
|
705
|
+
expect(usageTokenCount(undefined)).toBe(0);
|
|
706
|
+
expect(usageTokenCount(NaN)).toBe(0);
|
|
707
|
+
expect(usageTokenCount(Infinity)).toBe(0);
|
|
708
|
+
expect(usageTokenCount({ value: 100 })).toBe(0);
|
|
709
|
+
// No API call bills a negative number of tokens, and a negative subtracts.
|
|
710
|
+
expect(usageTokenCount(-1)).toBe(0);
|
|
711
|
+
expect(usageTokenCount(-6e9)).toBe(0);
|
|
712
|
+
expect(usageTokenCount(-0)).toBe(0);
|
|
713
|
+
expect(usageTokenCount(-Infinity)).toBe(0);
|
|
714
|
+
});
|
|
715
|
+
it('never lets one negative line cancel a fleet total', () => {
|
|
716
|
+
// The measured case: 6e9 on one billed call, -6e9 on another, against a
|
|
717
|
+
// corrected fleet input total of 6,649,443,346 (issue #307). Before this
|
|
718
|
+
// rule the pair reported inputTokens 0 across two healthy grouped rows.
|
|
719
|
+
writeLead([
|
|
720
|
+
rawLine({
|
|
721
|
+
requestId: REQ, messageId: MSG_ID, timestamp: T[0],
|
|
722
|
+
usage: { input_tokens: 6_000_000_000, output_tokens: 10, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
723
|
+
}),
|
|
724
|
+
rawLine({
|
|
725
|
+
requestId: 'req_test0000000000000009', messageId: 'msg_test0000000000000009', timestamp: T[1],
|
|
726
|
+
usage: { input_tokens: -6_000_000_000, output_tokens: 10, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
727
|
+
}),
|
|
728
|
+
]);
|
|
729
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
730
|
+
expect(allTime.inputTokens).toBe(6_000_000_000);
|
|
731
|
+
expect(allTime.inputTokens).not.toBe(0);
|
|
732
|
+
expect(allTime.usageGrouped).toBe(2);
|
|
733
|
+
});
|
|
734
|
+
it('never reports the string 0100 a string input_tokens used to produce', () => {
|
|
735
|
+
writeLead([rawLine({
|
|
736
|
+
requestId: REQ,
|
|
737
|
+
messageId: MSG_ID,
|
|
738
|
+
timestamp: T[0],
|
|
739
|
+
usage: {
|
|
740
|
+
input_tokens: '100',
|
|
741
|
+
output_tokens: 5,
|
|
742
|
+
cache_read_input_tokens: 0,
|
|
743
|
+
cache_creation_input_tokens: 0,
|
|
744
|
+
},
|
|
745
|
+
})]);
|
|
746
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
747
|
+
expect(allTime.inputTokens).not.toBe('0100');
|
|
748
|
+
expect(typeof allTime.inputTokens).toBe('number');
|
|
749
|
+
// An unreadable count is 0, the same as an absent one. The line is still a
|
|
750
|
+
// billed row: nothing is dropped, only the unreadable field is not summed.
|
|
751
|
+
expect(allTime.inputTokens).toBe(0);
|
|
752
|
+
expect(allTime.outputTokens).toBe(5);
|
|
753
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
754
|
+
});
|
|
755
|
+
it('counts no session for a sessionId that is not a string', () => {
|
|
756
|
+
// `allTime.sessions` is a Set, and it treats each object as distinct, so a
|
|
757
|
+
// cast let N malformed lines inflate the session count by N. Measured
|
|
758
|
+
// before the type read: sessions.size 3, every member an object.
|
|
759
|
+
writeLead([0, 1, 2].map((i) => JSON.stringify({
|
|
760
|
+
type: 'assistant', timestamp: T[0], sessionId: { id: 'x' },
|
|
761
|
+
requestId: `req_test000000000000002${i}`,
|
|
762
|
+
message: { role: 'assistant', id: `msg_test000000000000002${i}`, model: MODEL,
|
|
763
|
+
usage: { input_tokens: 1, output_tokens: 1, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } },
|
|
764
|
+
})));
|
|
765
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
766
|
+
expect(allTime.sessions.size).toBe(0);
|
|
767
|
+
expect(allTime.usageGrouped).toBe(3);
|
|
768
|
+
});
|
|
769
|
+
it('still counts one session for a string sessionId', () => {
|
|
770
|
+
writeLead(streamedCall(REQ, MSG_ID, [10, 40]));
|
|
771
|
+
expect(readProjectUsage(plainDir, RECENT_MS).allTime.sessions.size).toBe(1);
|
|
772
|
+
});
|
|
773
|
+
it('prices the row from the numeric fields alone', () => {
|
|
774
|
+
writeLead([rawLine({
|
|
775
|
+
requestId: REQ,
|
|
776
|
+
messageId: MSG_ID,
|
|
777
|
+
timestamp: T[0],
|
|
778
|
+
usage: {
|
|
779
|
+
input_tokens: '100',
|
|
780
|
+
output_tokens: 5,
|
|
781
|
+
cache_read_input_tokens: { tokens: 7 },
|
|
782
|
+
cache_creation_input_tokens: true,
|
|
783
|
+
},
|
|
784
|
+
})]);
|
|
785
|
+
const { allTime } = readProjectUsage(plainDir, RECENT_MS);
|
|
786
|
+
expect(allTime.cacheReadTokens).toBe(0);
|
|
787
|
+
expect(allTime.cacheWriteTokens).toBe(0);
|
|
788
|
+
expect(allTime.cost).toBeCloseTo(calcLineCost(0, 5, 0, 0, getRates(MODEL)), 10);
|
|
789
|
+
});
|
|
790
|
+
});
|
|
791
|
+
// ── A timestamp this code cannot read (#307) ─────────────────────────────────
|
|
792
|
+
//
|
|
793
|
+
// Measured on the pre-change code: one line whose timestamp was an object gave
|
|
794
|
+
// `in=10` with `recentIn=0`. `new Date({}).getTime()` is NaN, every comparison
|
|
795
|
+
// against NaN is false, so the row counted in the all-time total and never in
|
|
796
|
+
// the recent window — an understated window with no signal to the operator.
|
|
797
|
+
const HOUR_MS = 60 * 60 * 1000;
|
|
798
|
+
describe('unreadable timestamps do not silently leave the recent window (#307)', () => {
|
|
799
|
+
it('usageEntryTs reads a string or a number and rejects every other shape', () => {
|
|
800
|
+
expect(usageEntryTs({ timestamp: T[0] })).toBe(new Date(T[0]).getTime());
|
|
801
|
+
expect(usageEntryTs({ timestamp: 1_756_684_800_000 })).toBe(1_756_684_800_000);
|
|
802
|
+
expect(usageEntryTs({ timestamp: { iso: T[0] } })).toBeUndefined();
|
|
803
|
+
expect(usageEntryTs({ timestamp: [T[0]] })).toBeUndefined();
|
|
804
|
+
expect(usageEntryTs({ timestamp: true })).toBeUndefined();
|
|
805
|
+
expect(usageEntryTs({ timestamp: 'not-a-date' })).toBeUndefined();
|
|
806
|
+
expect(usageEntryTs({})).toBeUndefined();
|
|
807
|
+
});
|
|
808
|
+
it('counts a row no line of which is dated in the recent window', () => {
|
|
809
|
+
writeLead([rawLine({
|
|
810
|
+
requestId: REQ,
|
|
811
|
+
messageId: MSG_ID,
|
|
812
|
+
timestamp: { iso: T[0] },
|
|
813
|
+
usage: {
|
|
814
|
+
input_tokens: 10,
|
|
815
|
+
output_tokens: 5,
|
|
816
|
+
cache_read_input_tokens: 0,
|
|
817
|
+
cache_creation_input_tokens: 0,
|
|
818
|
+
},
|
|
819
|
+
})]);
|
|
820
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
821
|
+
expect(allTime.inputTokens).toBe(10);
|
|
822
|
+
// The pre-change pair was in=10 with recentIn=0.
|
|
823
|
+
expect(recent.inputTokens).toBe(10);
|
|
824
|
+
expect(recent.usageGrouped).toBe(1);
|
|
825
|
+
});
|
|
826
|
+
it('takes the group timestamp from a dated line when an earlier line is not', () => {
|
|
827
|
+
const nowIso = new Date().toISOString();
|
|
828
|
+
writeLead([
|
|
829
|
+
rawLine({
|
|
830
|
+
requestId: REQ, messageId: MSG_ID, timestamp: { iso: T[0] },
|
|
831
|
+
usage: { input_tokens: 10, output_tokens: 1, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
832
|
+
}),
|
|
833
|
+
rawLine({
|
|
834
|
+
requestId: REQ, messageId: MSG_ID, timestamp: nowIso,
|
|
835
|
+
usage: { input_tokens: 10, output_tokens: 40, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
836
|
+
}),
|
|
837
|
+
]);
|
|
838
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
839
|
+
// NaN on the first line used to hold the group's ts, and `ts > NaN` is false,
|
|
840
|
+
// so the dated second line could never replace it and the call stayed out of
|
|
841
|
+
// the window.
|
|
842
|
+
expect(allTime.usageGrouped).toBe(1);
|
|
843
|
+
expect(recent.inputTokens).toBe(10);
|
|
844
|
+
expect(recent.outputTokens).toBe(40);
|
|
845
|
+
});
|
|
846
|
+
it('still keeps a dated row outside the window out of the recent totals', () => {
|
|
847
|
+
// The control: the fix does not put every row in the window. T[0] is dated
|
|
848
|
+
// and older than an hour.
|
|
849
|
+
writeLead(streamedCall(REQ, MSG_ID, [10, 40]));
|
|
850
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
851
|
+
expect(allTime.inputTokens).toBe(INPUT);
|
|
852
|
+
expect(recent.inputTokens).toBe(0);
|
|
853
|
+
expect(recent.usageGrouped).toBe(0);
|
|
854
|
+
});
|
|
855
|
+
it('counts a MemNexus tool call with an unreadable timestamp in the recent window', () => {
|
|
856
|
+
// The same walk reads this timestamp. Measured before the read was shared:
|
|
857
|
+
// a call made one minute ago with an object timestamp gave allTime.mxCalls 1
|
|
858
|
+
// and recent.mxCalls 0, so a call in the last minute read as none.
|
|
859
|
+
// Identifiers and a tool name only, no tool input and no result content.
|
|
860
|
+
writeLead([
|
|
861
|
+
JSON.stringify({
|
|
862
|
+
type: 'assistant', timestamp: { iso: T[0] }, sessionId: SESSION,
|
|
863
|
+
message: { role: 'assistant', content: [
|
|
864
|
+
{ type: 'tool_use', id: 'tu_test01', name: 'mcp__memnexus__search_memories', input: {} },
|
|
865
|
+
] },
|
|
866
|
+
}),
|
|
867
|
+
JSON.stringify({
|
|
868
|
+
type: 'user', timestamp: { iso: T[0] }, sessionId: SESSION,
|
|
869
|
+
message: { role: 'user', content: [
|
|
870
|
+
{ type: 'tool_result', tool_use_id: 'tu_test01', content: '' },
|
|
871
|
+
] },
|
|
872
|
+
}),
|
|
873
|
+
]);
|
|
874
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
875
|
+
expect(allTime.mxCalls).toBe(1);
|
|
876
|
+
expect(recent.mxCalls).toBe(1);
|
|
877
|
+
expect(recent.mxEstTokens).toBe(allTime.mxEstTokens);
|
|
878
|
+
});
|
|
879
|
+
it('counts an undated MemNexus call under mxUndated in both totals', () => {
|
|
880
|
+
// The undated rule reached these counters when the timestamp read was
|
|
881
|
+
// shared. On origin/main a missing timestamp gave 0 and `0 >= cutoff` was
|
|
882
|
+
// false, so such a line did not count as recent; it does now. The counter is
|
|
883
|
+
// what tells the operator how much of the recent column rests on that.
|
|
884
|
+
writeLead([
|
|
885
|
+
JSON.stringify({
|
|
886
|
+
type: 'assistant', timestamp: { iso: T[0] }, sessionId: SESSION,
|
|
887
|
+
message: { role: 'assistant', content: [
|
|
888
|
+
{ type: 'tool_use', id: 'tu_test02', name: 'mcp__memnexus__search_memories', input: {} },
|
|
889
|
+
] },
|
|
890
|
+
}),
|
|
891
|
+
]);
|
|
892
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
893
|
+
expect(allTime.mxCalls).toBe(1);
|
|
894
|
+
expect(recent.mxCalls).toBe(1);
|
|
895
|
+
expect(allTime.mxUndated).toBe(1);
|
|
896
|
+
expect(recent.mxUndated).toBe(1);
|
|
897
|
+
expect(mxUndatedLine(allTime)).toContain('1 calls with no readable timestamp');
|
|
898
|
+
});
|
|
899
|
+
it('counts no undated MemNexus call for a dated one', () => {
|
|
900
|
+
writeLead([
|
|
901
|
+
JSON.stringify({
|
|
902
|
+
type: 'assistant', timestamp: new Date().toISOString(), sessionId: SESSION,
|
|
903
|
+
message: { role: 'assistant', content: [
|
|
904
|
+
{ type: 'tool_use', id: 'tu_test03', name: 'mcp__memnexus__search_memories', input: {} },
|
|
905
|
+
] },
|
|
906
|
+
}),
|
|
907
|
+
]);
|
|
908
|
+
const { allTime, recent } = readProjectUsage(plainDir, HOUR_MS);
|
|
909
|
+
expect(allTime.mxCalls).toBe(1);
|
|
910
|
+
expect(recent.mxCalls).toBe(1);
|
|
911
|
+
expect(allTime.mxUndated).toBe(0);
|
|
912
|
+
expect(mxUndatedLine(allTime)).toContain('0 calls');
|
|
913
|
+
});
|
|
914
|
+
it('keeps a session whose first line is undated from losing its dated range', () => {
|
|
915
|
+
// parseSessionRecords initialised firstTs and lastTs from the session's
|
|
916
|
+
// first line. NaN there is never replaced, because `ts < NaN` and
|
|
917
|
+
// `ts > NaN` are both false. Measured before the shared read: durationMs 0
|
|
918
|
+
// and a `date` of the moment the report ran. Both are POSTed to
|
|
919
|
+
// /v1/sessions/sync, so both were durable.
|
|
920
|
+
writeSession([
|
|
921
|
+
rawLine({ requestId: 'req_test0000000000000010', messageId: 'msg_test0000000000000010', timestamp: { iso: T[0] },
|
|
922
|
+
usage: { input_tokens: 10, output_tokens: 1, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } }),
|
|
923
|
+
rawLine({ requestId: 'req_test0000000000000011', messageId: 'msg_test0000000000000011', timestamp: '2026-08-06T10:00:00.000Z',
|
|
924
|
+
usage: { input_tokens: 10, output_tokens: 2, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } }),
|
|
925
|
+
rawLine({ requestId: 'req_test0000000000000012', messageId: 'msg_test0000000000000012', timestamp: '2026-08-06T11:00:00.000Z',
|
|
926
|
+
usage: { input_tokens: 10, output_tokens: 3, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 } }),
|
|
927
|
+
]);
|
|
928
|
+
const [rec] = parseSessionRecords(sessionDir);
|
|
929
|
+
expect(rec.durationMs).toBe(60 * 60 * 1000);
|
|
930
|
+
expect(rec.date).toBe('2026-08-06T10:00:00.000Z');
|
|
931
|
+
});
|
|
932
|
+
it('records the group as dated when any line carries a timestamp', () => {
|
|
933
|
+
const g = newUsageGrouper();
|
|
934
|
+
addUsageLine(g, JSON.parse(rawLine({
|
|
935
|
+
requestId: REQ, messageId: MSG_ID, timestamp: { iso: T[0] },
|
|
936
|
+
usage: { input_tokens: 4, output_tokens: 1, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
937
|
+
})));
|
|
938
|
+
let [row] = drainUsageGroups(g).rows;
|
|
939
|
+
expect(row.dated).toBe(false);
|
|
940
|
+
expect(row.ts).toBe(0);
|
|
941
|
+
const g2 = newUsageGrouper();
|
|
942
|
+
addUsageLine(g2, JSON.parse(rawLine({
|
|
943
|
+
requestId: REQ, messageId: MSG_ID, timestamp: { iso: T[0] },
|
|
944
|
+
usage: { input_tokens: 4, output_tokens: 1, cache_read_input_tokens: 0, cache_creation_input_tokens: 0 },
|
|
945
|
+
})));
|
|
946
|
+
addUsageLine(g2, JSON.parse(usageLine({ requestId: REQ, messageId: MSG_ID, output: 40, ts: T[1] })));
|
|
947
|
+
[row] = drainUsageGroups(g2).rows;
|
|
948
|
+
expect(row.dated).toBe(true);
|
|
949
|
+
expect(row.ts).toBe(new Date(T[1]).getTime());
|
|
950
|
+
});
|
|
951
|
+
});
|
|
952
|
+
//# sourceMappingURL=usage-per-call-grouping.test.js.map
|