@memnexus-ai/mx-agent-cli 0.1.294-next.0 → 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 +35 -0
- 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__/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__/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__/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.js +23 -1
- package/dist/__tests__/standards-injection.test.js.map +1 -1
- 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 +279 -0
- package/dist/agent-config/hooks/auto-capture-session-end.sh +277 -0
- 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/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.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/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/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/session.js +1 -1
- package/dist/commands/session.js.map +1 -1
- package/dist/commands/start.d.ts +38 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +171 -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/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 +122 -11
- package/dist/index.js.map +1 -1
- package/dist/lib/agent-session.d.ts.map +1 -1
- package/dist/lib/agent-session.js +6 -1
- 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 +53 -23
- package/dist/lib/claude.d.ts.map +1 -1
- package/dist/lib/claude.js +306 -17
- 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/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/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/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 +10 -1
- package/dist/lib/standards.d.ts.map +1 -1
- package/dist/lib/standards.js +8 -1
- package/dist/lib/standards.js.map +1 -1
- 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/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 +8 -0
- package/dist/standards/po-communication-standard.md +126 -0
- package/dist/standards/report-format.md +8 -0
- package/dist/standards/writing-standard.md +146 -4
- package/package.json +1 -1
- package/scripts/generate-claude.mjs +119 -46
|
@@ -0,0 +1,494 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Two findings from the bootstrap team's security review of PR #325, both
|
|
3
|
+
* pre-existing on `origin/main` and neither introduced by that pull request.
|
|
4
|
+
*
|
|
5
|
+
* SF-2. `Object.fromEntries(s.subagentTypes)` built the wire object from keys
|
|
6
|
+
* the model writing the Agent tool call chooses, so `subagent_type: "__proto__"`
|
|
7
|
+
* put an own `__proto__` key in the body `mx-agent sync` POSTs to
|
|
8
|
+
* /v1/sessions/sync. Nothing is polluted locally, because the accumulator is a
|
|
9
|
+
* Map. Whether the key reaches a merge sink is a question about the
|
|
10
|
+
* observability service, which nobody here has reviewed, so these tests assert
|
|
11
|
+
* what the serializer emits and claim nothing about exploitability.
|
|
12
|
+
*
|
|
13
|
+
* SF-3. `parseSessionRecords` dropped a line whose `sessionId` was not a string
|
|
14
|
+
* before counting it, while `readProjectUsage` kept the line and counted its
|
|
15
|
+
* tokens. The two published totals disagreed and no counter moved. Measured on
|
|
16
|
+
* the pre-change code with the fixture below: `syncInput=7 usageInput=1007
|
|
17
|
+
* grouped=2 ungrouped=0 inconsistent=0 undated=0`. The disagreement itself is
|
|
18
|
+
* unchanged and pinned here; what changes is that a count now reports it.
|
|
19
|
+
*
|
|
20
|
+
* Fixtures carry token values and synthetic identifiers only. No transcript
|
|
21
|
+
* content, no prompts, no credential-shaped values.
|
|
22
|
+
*/
|
|
23
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
24
|
+
import { mkdirSync, rmSync, writeFileSync } from 'fs';
|
|
25
|
+
import { join } from 'path';
|
|
26
|
+
import { tmpdir } from 'os';
|
|
27
|
+
import { parseSessionRecords, parseSessionRecordsWithStats, readProjectUsage, toWireSubagentTypes, unsafeWireKeyCount, } from '../lib/jsonl.js';
|
|
28
|
+
import { skippedLinesSummary, serverDroppedKeys, serverDropReasons, } from '../commands/sync.js';
|
|
29
|
+
const SESSION = 'session-disclosure';
|
|
30
|
+
const MODEL = 'claude-opus-5';
|
|
31
|
+
const TS = '2026-08-30T10:00:00.000Z';
|
|
32
|
+
const RECENT_MS = 365 * 24 * 60 * 60 * 1000; // wide window — fixtures are dated
|
|
33
|
+
let dir;
|
|
34
|
+
beforeEach(() => {
|
|
35
|
+
dir = join(tmpdir(), `mx-disclosure-${Date.now()}-${Math.random().toString(36).slice(2)}`);
|
|
36
|
+
mkdirSync(dir, { recursive: true });
|
|
37
|
+
});
|
|
38
|
+
afterEach(() => {
|
|
39
|
+
rmSync(dir, { recursive: true, force: true });
|
|
40
|
+
});
|
|
41
|
+
/** One usage-bearing assistant line. `sessionId` is written as given. */
|
|
42
|
+
function usageLine(o) {
|
|
43
|
+
return JSON.stringify({
|
|
44
|
+
type: 'assistant',
|
|
45
|
+
timestamp: TS,
|
|
46
|
+
sessionId: o.sessionId,
|
|
47
|
+
requestId: o.requestId,
|
|
48
|
+
message: {
|
|
49
|
+
role: 'assistant',
|
|
50
|
+
id: o.messageId,
|
|
51
|
+
model: MODEL,
|
|
52
|
+
usage: {
|
|
53
|
+
input_tokens: o.input,
|
|
54
|
+
output_tokens: 1,
|
|
55
|
+
cache_read_input_tokens: o.cacheRead ?? 0,
|
|
56
|
+
cache_creation_input_tokens: o.cacheWrite ?? 0,
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
/** One assistant line that spawns a subagent and bills 5 input tokens. */
|
|
62
|
+
function spawnLine(subagentType, toolUseId) {
|
|
63
|
+
return JSON.stringify({
|
|
64
|
+
type: 'assistant',
|
|
65
|
+
timestamp: TS,
|
|
66
|
+
sessionId: SESSION,
|
|
67
|
+
requestId: `req_disclosure_${toolUseId}`,
|
|
68
|
+
message: {
|
|
69
|
+
role: 'assistant',
|
|
70
|
+
id: `msg_disclosure_${toolUseId}`,
|
|
71
|
+
model: MODEL,
|
|
72
|
+
content: [{ type: 'tool_use', id: toolUseId, name: 'Agent', input: { subagent_type: subagentType } }],
|
|
73
|
+
usage: {
|
|
74
|
+
input_tokens: 5,
|
|
75
|
+
output_tokens: 1,
|
|
76
|
+
cache_read_input_tokens: 0,
|
|
77
|
+
cache_creation_input_tokens: 0,
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
function write(lines) {
|
|
83
|
+
writeFileSync(join(dir, `${SESSION}.jsonl`), lines.join('\n') + '\n');
|
|
84
|
+
}
|
|
85
|
+
// ── SF-2: the wire object's keys ─────────────────────────────────────────────
|
|
86
|
+
describe('subagentTypes keys reaching /v1/sessions/sync (SF-2)', () => {
|
|
87
|
+
it('pins what Object.fromEntries did: an own __proto__ key that JSON.stringify keeps', () => {
|
|
88
|
+
// The pre-change serializer, run here directly so the behaviour this fix
|
|
89
|
+
// removes is stated rather than described.
|
|
90
|
+
const before = Object.fromEntries(new Map([['__proto__', 1], ['qa-tester', 2]]));
|
|
91
|
+
expect(Object.prototype.hasOwnProperty.call(before, '__proto__')).toBe(true);
|
|
92
|
+
expect(JSON.stringify(before)).toContain('"__proto__"');
|
|
93
|
+
});
|
|
94
|
+
it('drops __proto__, constructor and prototype from the wire object', () => {
|
|
95
|
+
write([
|
|
96
|
+
spawnLine('__proto__', 'toolu_disclosure_01'),
|
|
97
|
+
spawnLine('constructor', 'toolu_disclosure_02'),
|
|
98
|
+
spawnLine('prototype', 'toolu_disclosure_03'),
|
|
99
|
+
spawnLine('qa-tester', 'toolu_disclosure_04'),
|
|
100
|
+
]);
|
|
101
|
+
const [rec] = parseSessionRecords(dir);
|
|
102
|
+
expect(Object.prototype.hasOwnProperty.call(rec.subagentTypes, '__proto__')).toBe(false);
|
|
103
|
+
expect(Object.prototype.hasOwnProperty.call(rec.subagentTypes, 'constructor')).toBe(false);
|
|
104
|
+
expect(Object.prototype.hasOwnProperty.call(rec.subagentTypes, 'prototype')).toBe(false);
|
|
105
|
+
expect(rec.subagentTypes).toEqual({ 'qa-tester': 1 });
|
|
106
|
+
});
|
|
107
|
+
it('leaves no dangerous key in the body sync POSTs', () => {
|
|
108
|
+
write([
|
|
109
|
+
spawnLine('__proto__', 'toolu_disclosure_01'),
|
|
110
|
+
spawnLine('qa-tester', 'toolu_disclosure_04'),
|
|
111
|
+
]);
|
|
112
|
+
const [rec] = parseSessionRecords(dir);
|
|
113
|
+
const body = JSON.stringify({ team: 'gateway', worktree: 'w', machine: 'm', sessions: [rec] });
|
|
114
|
+
expect(body).not.toContain('"__proto__"');
|
|
115
|
+
expect(body).toContain('"qa-tester"');
|
|
116
|
+
});
|
|
117
|
+
it('keeps counting the spawns it will not name, and reports the dropped keys', () => {
|
|
118
|
+
write([
|
|
119
|
+
spawnLine('__proto__', 'toolu_disclosure_01'),
|
|
120
|
+
spawnLine('constructor', 'toolu_disclosure_02'),
|
|
121
|
+
spawnLine('prototype', 'toolu_disclosure_03'),
|
|
122
|
+
spawnLine('qa-tester', 'toolu_disclosure_04'),
|
|
123
|
+
]);
|
|
124
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
125
|
+
// agentSpawns counts all four. Only the per-type breakdown loses three.
|
|
126
|
+
expect(records[0].agentSpawns).toBe(4);
|
|
127
|
+
expect(stats.droppedSubagentTypeKeys).toBe(3);
|
|
128
|
+
});
|
|
129
|
+
it('does not pollute Object.prototype on either the old path or the new one', () => {
|
|
130
|
+
write([spawnLine('__proto__', 'toolu_disclosure_01')]);
|
|
131
|
+
parseSessionRecords(dir);
|
|
132
|
+
expect({}.polluted).toBeUndefined();
|
|
133
|
+
expect(Object.prototype).toBe(Object.getPrototypeOf({}));
|
|
134
|
+
});
|
|
135
|
+
it('toWireSubagentTypes filters exactly three keys and keeps every other', () => {
|
|
136
|
+
const counts = new Map([
|
|
137
|
+
['__proto__', 1], ['constructor', 2], ['prototype', 3],
|
|
138
|
+
['qa-tester', 4], ['git-expert', 5], ['proto', 6], ['__proto__x', 7],
|
|
139
|
+
]);
|
|
140
|
+
expect(toWireSubagentTypes(counts)).toEqual({
|
|
141
|
+
'qa-tester': 4, 'git-expert': 5, 'proto': 6, '__proto__x': 7,
|
|
142
|
+
});
|
|
143
|
+
expect(unsafeWireKeyCount(counts)).toBe(3);
|
|
144
|
+
});
|
|
145
|
+
it('reports zero dropped keys for an ordinary session', () => {
|
|
146
|
+
write([spawnLine('qa-tester', 'toolu_disclosure_04')]);
|
|
147
|
+
const { stats } = parseSessionRecordsWithStats(dir);
|
|
148
|
+
expect(stats.droppedSubagentTypeKeys).toBe(0);
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
// ── SF-3: the two totals, and the count that reconciles them ─────────────────
|
|
152
|
+
describe('a line dropped for an unreadable sessionId (SF-3)', () => {
|
|
153
|
+
/** The measured fixture: one bad line worth 1000 input, one good line worth 7. */
|
|
154
|
+
function writeDisagreement() {
|
|
155
|
+
write([
|
|
156
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, requestId: 'req_disclosure_bad', messageId: 'msg_disclosure_bad' }),
|
|
157
|
+
usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_good', messageId: 'msg_disclosure_good' }),
|
|
158
|
+
]);
|
|
159
|
+
}
|
|
160
|
+
it('pins the measured disagreement: syncInput 7 against usageInput 1007', () => {
|
|
161
|
+
writeDisagreement();
|
|
162
|
+
const records = parseSessionRecords(dir);
|
|
163
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
164
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
165
|
+
expect(syncInput).toBe(7);
|
|
166
|
+
expect(allTime.inputTokens).toBe(1007);
|
|
167
|
+
});
|
|
168
|
+
it('shows why no existing counter finds it: every usage-path count reads clean', () => {
|
|
169
|
+
writeDisagreement();
|
|
170
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
171
|
+
// Two billed calls, both keyed, neither inconsistent, neither undated. The
|
|
172
|
+
// usage path never learns that the sync path dropped one of them.
|
|
173
|
+
expect(allTime.usageGrouped).toBe(2);
|
|
174
|
+
expect(allTime.usageUngrouped).toBe(0);
|
|
175
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
176
|
+
expect(allTime.usageUndated).toBe(0);
|
|
177
|
+
expect(allTime.mxUndated).toBe(0);
|
|
178
|
+
});
|
|
179
|
+
it('counts the dropped line, and counts that it carried usage', () => {
|
|
180
|
+
writeDisagreement();
|
|
181
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
182
|
+
expect(records).toHaveLength(1);
|
|
183
|
+
expect(stats.skippedLines).toBe(1);
|
|
184
|
+
expect(stats.skippedUsageLines).toBe(1);
|
|
185
|
+
});
|
|
186
|
+
it('counts a missing sessionId the same as a non-string one', () => {
|
|
187
|
+
write([
|
|
188
|
+
JSON.stringify({ type: 'assistant', timestamp: TS, requestId: 'req_disclosure_nosid' }),
|
|
189
|
+
usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_good', messageId: 'msg_disclosure_good' }),
|
|
190
|
+
]);
|
|
191
|
+
const { stats } = parseSessionRecordsWithStats(dir);
|
|
192
|
+
// Skipped, and not usage-bearing: 995 of this machine's 192,555 transcript
|
|
193
|
+
// lines are this shape and none of them costs a token, which is why the two
|
|
194
|
+
// counts are reported separately.
|
|
195
|
+
expect(stats.skippedLines).toBe(1);
|
|
196
|
+
expect(stats.skippedUsageLines).toBe(0);
|
|
197
|
+
});
|
|
198
|
+
it('counts the tokens the gap is worth, and the count closes the subtraction', () => {
|
|
199
|
+
writeDisagreement();
|
|
200
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
201
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
202
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
203
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
204
|
+
// One step, no hand arithmetic: the counter IS the difference.
|
|
205
|
+
expect(allTime.inputTokens - syncInput).toBe(stats.skippedUsageInputTokens);
|
|
206
|
+
});
|
|
207
|
+
it('counts skipped tokens once per billed call, not once per transcript line', () => {
|
|
208
|
+
// Two lines of ONE streamed call, both dropped. They repeat the same
|
|
209
|
+
// input number, so a per-line sum reports 2,000 for a 1,000-token gap.
|
|
210
|
+
// That is the #307 overcount, and the disclosure that measures what #307
|
|
211
|
+
// left behind must not carry it.
|
|
212
|
+
write([
|
|
213
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, requestId: 'req_disclosure_stream', messageId: 'msg_disclosure_s1' }),
|
|
214
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, requestId: 'req_disclosure_stream', messageId: 'msg_disclosure_s2' }),
|
|
215
|
+
usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_good', messageId: 'msg_disclosure_good' }),
|
|
216
|
+
]);
|
|
217
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
218
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
219
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
220
|
+
expect(stats.skippedLines).toBe(2);
|
|
221
|
+
expect(stats.skippedUsageLines).toBe(2);
|
|
222
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
223
|
+
expect(stats.skippedUsageInputTokens).not.toBe(2000);
|
|
224
|
+
expect(allTime.inputTokens - syncInput).toBe(stats.skippedUsageInputTokens);
|
|
225
|
+
});
|
|
226
|
+
it('mixed skip/keep with UNEQUAL inputs: usageInconsistent fires on the values, not on the skip', () => {
|
|
227
|
+
// Kept for the contrast it draws with the test below, and renamed because
|
|
228
|
+
// its earlier name claimed this case is never silent. It is not silent HERE
|
|
229
|
+
// only because 1,000 and 7 differ, which trips the constancy check.
|
|
230
|
+
write([
|
|
231
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, requestId: 'req_disclosure_shared', messageId: 'msg_disclosure_m1' }),
|
|
232
|
+
usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_shared', messageId: 'msg_disclosure_m2' }),
|
|
233
|
+
]);
|
|
234
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
235
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
236
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
237
|
+
expect(allTime.inputTokens - syncInput).toBe(993);
|
|
238
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
239
|
+
expect(allTime.usageInconsistent).toBe(1);
|
|
240
|
+
});
|
|
241
|
+
it('mixed skip/keep with EQUAL inputs, the shape the corpus says is the real one, is SILENT', () => {
|
|
242
|
+
// Two lines of one billed call repeat the same input: the module header
|
|
243
|
+
// measured 26,940 multi-line groups with zero exceptions. So the realistic
|
|
244
|
+
// mixed group carries equal inputs, and then nothing fires on either path.
|
|
245
|
+
// The counter reads 1,000 while the gap is 0, and usageInconsistent is 0.
|
|
246
|
+
// This is the case the docblock calls a reconciliation aid rather than a
|
|
247
|
+
// guarantee.
|
|
248
|
+
write([
|
|
249
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, requestId: 'req_disclosure_equal', messageId: 'msg_disclosure_e1' }),
|
|
250
|
+
usageLine({ sessionId: SESSION, input: 1000, requestId: 'req_disclosure_equal', messageId: 'msg_disclosure_e2' }),
|
|
251
|
+
]);
|
|
252
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
253
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
254
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
255
|
+
expect(allTime.inputTokens - syncInput).toBe(0);
|
|
256
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
257
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
258
|
+
expect(allTime.usageUngrouped).toBe(0);
|
|
259
|
+
});
|
|
260
|
+
it('is silent in the same way when the skipped line is the blank sessionId this PR adds', () => {
|
|
261
|
+
write([
|
|
262
|
+
usageLine({ sessionId: ' ', input: 1000, requestId: 'req_disclosure_equal', messageId: 'msg_disclosure_e1' }),
|
|
263
|
+
usageLine({ sessionId: SESSION, input: 1000, requestId: 'req_disclosure_equal', messageId: 'msg_disclosure_e2' }),
|
|
264
|
+
]);
|
|
265
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
266
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
267
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
268
|
+
expect(allTime.inputTokens - syncInput).toBe(0);
|
|
269
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
270
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
271
|
+
});
|
|
272
|
+
it('pins the split-sessionId gap, pre-existing from #325, which no counter reports', () => {
|
|
273
|
+
// One requestId, two different VALID string sessionIds, in one file.
|
|
274
|
+
// Nothing is skipped, so this PR's counters read 0 and the docblock's
|
|
275
|
+
// stated condition is met, yet the two totals still disagree: fileGroupers
|
|
276
|
+
// keys by sessionId and builds two rows, readProjectUsage uses one grouper
|
|
277
|
+
// per file with no session key and builds one. Not changed here. The test
|
|
278
|
+
// pins the behaviour so the docblock's claim stays checkable.
|
|
279
|
+
write([
|
|
280
|
+
usageLine({ sessionId: 'session-a', input: 1000, requestId: 'req_disclosure_split', messageId: 'msg_disclosure_p1' }),
|
|
281
|
+
usageLine({ sessionId: 'session-b', input: 1000, requestId: 'req_disclosure_split', messageId: 'msg_disclosure_p2' }),
|
|
282
|
+
]);
|
|
283
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
284
|
+
const syncInput = records.reduce((sum, r) => sum + r.inputTokens, 0);
|
|
285
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
286
|
+
expect(syncInput).toBe(2000);
|
|
287
|
+
expect(allTime.inputTokens).toBe(1000);
|
|
288
|
+
expect(stats.skippedLines).toBe(0);
|
|
289
|
+
expect(stats.skippedUsageInputTokens).toBe(0);
|
|
290
|
+
expect(allTime.usageInconsistent).toBe(0);
|
|
291
|
+
});
|
|
292
|
+
it('discloses cache read, which is the larger number a skipped line drops', () => {
|
|
293
|
+
// A 1,000-token input gap beside a 4,000,000-token cache-read gap on the
|
|
294
|
+
// same line. Reporting input alone repeats the blind spot the token counter
|
|
295
|
+
// exists to close, one field over.
|
|
296
|
+
write([
|
|
297
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, cacheRead: 4_000_000, cacheWrite: 250,
|
|
298
|
+
requestId: 'req_disclosure_cache', messageId: 'msg_disclosure_c1' }),
|
|
299
|
+
usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_good', messageId: 'msg_disclosure_good' }),
|
|
300
|
+
]);
|
|
301
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
302
|
+
const { allTime } = readProjectUsage(dir, RECENT_MS);
|
|
303
|
+
const syncCacheRead = records.reduce((sum, r) => sum + r.cacheReadTokens, 0);
|
|
304
|
+
expect(allTime.cacheReadTokens - syncCacheRead).toBe(4_000_000);
|
|
305
|
+
expect(stats.skippedUsageCacheReadTokens).toBe(4_000_000);
|
|
306
|
+
expect(stats.skippedUsageCacheWriteTokens).toBe(250);
|
|
307
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
308
|
+
});
|
|
309
|
+
it('counts every skipped token class once per billed call, not once per line', () => {
|
|
310
|
+
// Two lines of one streamed call, both dropped. Input and both cache fields
|
|
311
|
+
// repeat across the lines; output grows and the group takes the maximum.
|
|
312
|
+
write([
|
|
313
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, cacheRead: 4000, cacheWrite: 250,
|
|
314
|
+
requestId: 'req_disclosure_cstream', messageId: 'msg_disclosure_cs' }),
|
|
315
|
+
usageLine({ sessionId: { id: 'x' }, input: 1000, cacheRead: 4000, cacheWrite: 250,
|
|
316
|
+
requestId: 'req_disclosure_cstream', messageId: 'msg_disclosure_cs' }),
|
|
317
|
+
]);
|
|
318
|
+
const { stats } = parseSessionRecordsWithStats(dir);
|
|
319
|
+
expect(stats.skippedLines).toBe(2);
|
|
320
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
321
|
+
expect(stats.skippedUsageCacheReadTokens).toBe(4000);
|
|
322
|
+
expect(stats.skippedUsageCacheWriteTokens).toBe(250);
|
|
323
|
+
});
|
|
324
|
+
it('reads zero on a clean dir rather than going absent', () => {
|
|
325
|
+
write([usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_good', messageId: 'msg_disclosure_good' })]);
|
|
326
|
+
const { stats } = parseSessionRecordsWithStats(dir);
|
|
327
|
+
expect(stats.skippedLines).toBe(0);
|
|
328
|
+
expect(stats.skippedUsageLines).toBe(0);
|
|
329
|
+
expect(stats.skippedUsageInputTokens).toBe(0);
|
|
330
|
+
});
|
|
331
|
+
it('treats a sessionId of blanks as unreadable, and counts it', () => {
|
|
332
|
+
// Pre-existing and one case over from SF-3: `!sessionId` is false for
|
|
333
|
+
// ' ', so the line was neither dropped nor counted. Measured on the code
|
|
334
|
+
// without the trim, this fixture gave 2 records with sessionIds
|
|
335
|
+
// [' ', 'session-good'] and every counter at 0, and mx-agent sync POSTed
|
|
336
|
+
// a session keyed by three spaces.
|
|
337
|
+
write([
|
|
338
|
+
usageLine({ sessionId: ' ', input: 1000, requestId: 'req_disclosure_blank', messageId: 'msg_disclosure_blank' }),
|
|
339
|
+
usageLine({ sessionId: SESSION, input: 7, requestId: 'req_disclosure_good', messageId: 'msg_disclosure_good' }),
|
|
340
|
+
]);
|
|
341
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
342
|
+
expect(records.map((r) => r.sessionId)).toEqual([SESSION]);
|
|
343
|
+
expect(stats.skippedLines).toBe(1);
|
|
344
|
+
expect(stats.skippedUsageLines).toBe(1);
|
|
345
|
+
expect(stats.skippedUsageInputTokens).toBe(1000);
|
|
346
|
+
});
|
|
347
|
+
it('counts a tab-and-newline sessionId the same way', () => {
|
|
348
|
+
write([usageLine({ sessionId: '\t\n ', input: 5, requestId: 'req_disclosure_tab', messageId: 'msg_disclosure_tab' })]);
|
|
349
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
350
|
+
expect(records).toHaveLength(0);
|
|
351
|
+
expect(stats.skippedLines).toBe(1);
|
|
352
|
+
});
|
|
353
|
+
it('keeps a sessionId that merely contains a space, untrimmed, as its own key', () => {
|
|
354
|
+
// Only the emptiness test trims. A non-blank id keeps every byte it had, so
|
|
355
|
+
// no session that syncs today changes identity.
|
|
356
|
+
write([usageLine({ sessionId: ' session with space ', input: 5, requestId: 'req_disclosure_sp', messageId: 'msg_disclosure_sp' })]);
|
|
357
|
+
const { records, stats } = parseSessionRecordsWithStats(dir);
|
|
358
|
+
expect(records.map((r) => r.sessionId)).toEqual([' session with space ']);
|
|
359
|
+
expect(stats.skippedLines).toBe(0);
|
|
360
|
+
});
|
|
361
|
+
it('leaves parseSessionRecords returning the records its callers already read', () => {
|
|
362
|
+
writeDisagreement();
|
|
363
|
+
const records = parseSessionRecords(dir);
|
|
364
|
+
const { records: withStats } = parseSessionRecordsWithStats(dir);
|
|
365
|
+
expect(records).toEqual(withStats);
|
|
366
|
+
});
|
|
367
|
+
it('prints the counts as digits at zero, so a residual is never hidden', () => {
|
|
368
|
+
const line = skippedLinesSummary({
|
|
369
|
+
skippedLines: 0, skippedUsageLines: 0,
|
|
370
|
+
skippedUsageInputTokens: 0, skippedUsageOutputTokens: 0,
|
|
371
|
+
skippedUsageCacheReadTokens: 0, skippedUsageCacheWriteTokens: 0,
|
|
372
|
+
droppedSubagentTypeKeys: 0,
|
|
373
|
+
});
|
|
374
|
+
expect(line).toContain('0 lines skipped');
|
|
375
|
+
expect(line).toContain('0 of them usage-bearing');
|
|
376
|
+
expect(line).toContain('worth 0 input / 0 output / 0 cache-read / 0 cache-write tokens');
|
|
377
|
+
expect(line).toContain('0 subagent-type keys dropped');
|
|
378
|
+
});
|
|
379
|
+
it('prints the measured numbers when they are not zero', () => {
|
|
380
|
+
const line = skippedLinesSummary({
|
|
381
|
+
skippedLines: 1, skippedUsageLines: 1,
|
|
382
|
+
skippedUsageInputTokens: 1000, skippedUsageOutputTokens: 12,
|
|
383
|
+
skippedUsageCacheReadTokens: 4_000_000, skippedUsageCacheWriteTokens: 250,
|
|
384
|
+
droppedSubagentTypeKeys: 3,
|
|
385
|
+
});
|
|
386
|
+
expect(line).toContain('1 lines skipped');
|
|
387
|
+
expect(line).toContain('1 of them usage-bearing');
|
|
388
|
+
expect(line).toContain('worth 1,000 input / 12 output / 4,000,000 cache-read / 250 cache-write tokens');
|
|
389
|
+
expect(line).toContain('3 subagent-type keys dropped');
|
|
390
|
+
});
|
|
391
|
+
it('labels the producer-side count as dropped before send', () => {
|
|
392
|
+
// Two filters drop subagent-type keys and their counts do not overlap: this
|
|
393
|
+
// command drops three names before building the request, and the server
|
|
394
|
+
// refuses more at ingest and reports its own number. The labels are what
|
|
395
|
+
// keeps them apart, so the producer-side wording is pinned here. Without
|
|
396
|
+
// 'before send' the two numbers read as one and an operator double-counts.
|
|
397
|
+
const line = skippedLinesSummary({
|
|
398
|
+
skippedLines: 1, skippedUsageLines: 1,
|
|
399
|
+
skippedUsageInputTokens: 0, skippedUsageOutputTokens: 0,
|
|
400
|
+
skippedUsageCacheReadTokens: 0, skippedUsageCacheWriteTokens: 0,
|
|
401
|
+
droppedSubagentTypeKeys: 3,
|
|
402
|
+
});
|
|
403
|
+
expect(line).toContain('3 subagent-type keys dropped before send');
|
|
404
|
+
// The server-side count is printed by runSync from the sync response, not by
|
|
405
|
+
// this function, so no ingest wording belongs in this line.
|
|
406
|
+
expect(line).not.toContain('ingest');
|
|
407
|
+
expect(line).not.toContain('server refused');
|
|
408
|
+
});
|
|
409
|
+
it('states the size of the gap, not only that one exists', () => {
|
|
410
|
+
// A line count cannot separate 4 tokens from 4,000,000. Both print one
|
|
411
|
+
// skipped usage line; only the token figure tells them apart.
|
|
412
|
+
const zero = {
|
|
413
|
+
skippedUsageOutputTokens: 0, skippedUsageCacheReadTokens: 0, skippedUsageCacheWriteTokens: 0,
|
|
414
|
+
droppedSubagentTypeKeys: 0,
|
|
415
|
+
};
|
|
416
|
+
const small = skippedLinesSummary({
|
|
417
|
+
skippedLines: 1, skippedUsageLines: 1, skippedUsageInputTokens: 4, ...zero,
|
|
418
|
+
});
|
|
419
|
+
const large = skippedLinesSummary({
|
|
420
|
+
skippedLines: 1, skippedUsageLines: 1, skippedUsageInputTokens: 4_000_000, ...zero,
|
|
421
|
+
});
|
|
422
|
+
// The same argument one field over: input identical, cache read 4,000,000.
|
|
423
|
+
const hiddenInCacheRead = skippedLinesSummary({
|
|
424
|
+
skippedLines: 1, skippedUsageLines: 1, skippedUsageInputTokens: 4,
|
|
425
|
+
skippedUsageOutputTokens: 0, skippedUsageCacheReadTokens: 4_000_000,
|
|
426
|
+
skippedUsageCacheWriteTokens: 0, droppedSubagentTypeKeys: 0,
|
|
427
|
+
});
|
|
428
|
+
expect(small).toContain('worth 4 input');
|
|
429
|
+
expect(large).toContain('worth 4,000,000 input');
|
|
430
|
+
expect(small).not.toEqual(large);
|
|
431
|
+
expect(hiddenInCacheRead).toContain('4,000,000 cache-read');
|
|
432
|
+
expect(hiddenInCacheRead).not.toEqual(small);
|
|
433
|
+
});
|
|
434
|
+
});
|
|
435
|
+
describe('the server-side drop count and its reason breakdown', () => {
|
|
436
|
+
// Two sides to cover. A server that reports the breakdown must have its cause
|
|
437
|
+
// named from the response; a server that does not must produce a bare count
|
|
438
|
+
// and no invented cause.
|
|
439
|
+
it('names each reported class when the response carries the breakdown', () => {
|
|
440
|
+
const reasons = serverDropReasons({
|
|
441
|
+
synced: 1,
|
|
442
|
+
droppedSubagentTypeKeys: 6,
|
|
443
|
+
droppedSubagentTypeKeysByReason: { shape: 1, prototype_name: 1, over_cap: 4 },
|
|
444
|
+
});
|
|
445
|
+
expect(reasons).toEqual([
|
|
446
|
+
'1 prototype name',
|
|
447
|
+
'1 unsafe key shape',
|
|
448
|
+
'4 over the per-session key cap',
|
|
449
|
+
]);
|
|
450
|
+
});
|
|
451
|
+
it('does not name a cause when the breakdown is absent (older server)', () => {
|
|
452
|
+
const body = { synced: 1, skipped: 0, droppedSubagentTypeKeys: 4 };
|
|
453
|
+
expect(serverDroppedKeys(body)).toBe(4);
|
|
454
|
+
// Empty means the caller prints the count with no parenthetical. Naming a
|
|
455
|
+
// cause here would misreport an over_cap drop as an unsafe key.
|
|
456
|
+
expect(serverDropReasons(body)).toEqual([]);
|
|
457
|
+
});
|
|
458
|
+
it('omits classes that are zero', () => {
|
|
459
|
+
expect(serverDropReasons({
|
|
460
|
+
droppedSubagentTypeKeysByReason: { shape: 0, prototype_name: 2, over_cap: 0 },
|
|
461
|
+
})).toEqual(['2 prototype name']);
|
|
462
|
+
});
|
|
463
|
+
it('keeps a good class when another is hostile', () => {
|
|
464
|
+
// A count that is a string, NaN, Infinity or negative is discarded on its
|
|
465
|
+
// own, and must not suppress the class beside it.
|
|
466
|
+
expect(serverDropReasons({
|
|
467
|
+
droppedSubagentTypeKeysByReason: {
|
|
468
|
+
shape: 'lots',
|
|
469
|
+
prototype_name: 3,
|
|
470
|
+
over_cap: Number.NaN,
|
|
471
|
+
},
|
|
472
|
+
})).toEqual(['3 prototype name']);
|
|
473
|
+
});
|
|
474
|
+
it('survives a hostile or absent response body without throwing', () => {
|
|
475
|
+
for (const body of [null, undefined, 'nope', 42, [], {}]) {
|
|
476
|
+
expect(serverDroppedKeys(body)).toBe(0);
|
|
477
|
+
expect(serverDropReasons(body)).toEqual([]);
|
|
478
|
+
}
|
|
479
|
+
expect(serverDropReasons({ droppedSubagentTypeKeysByReason: 'nope' })).toEqual([]);
|
|
480
|
+
expect(serverDropReasons({ droppedSubagentTypeKeysByReason: null })).toEqual([]);
|
|
481
|
+
});
|
|
482
|
+
it('ignores a negative or non-finite headline count', () => {
|
|
483
|
+
expect(serverDroppedKeys({ droppedSubagentTypeKeys: -1 })).toBe(0);
|
|
484
|
+
expect(serverDroppedKeys({ droppedSubagentTypeKeys: Number.NaN })).toBe(0);
|
|
485
|
+
expect(serverDroppedKeys({ droppedSubagentTypeKeys: Number.POSITIVE_INFINITY })).toBe(0);
|
|
486
|
+
expect(serverDroppedKeys({ droppedSubagentTypeKeys: '3' })).toBe(0);
|
|
487
|
+
});
|
|
488
|
+
it('formats a large count with thousands separators', () => {
|
|
489
|
+
expect(serverDropReasons({
|
|
490
|
+
droppedSubagentTypeKeysByReason: { over_cap: 12345 },
|
|
491
|
+
})).toEqual(['12,345 over the per-session key cap']);
|
|
492
|
+
});
|
|
493
|
+
});
|
|
494
|
+
//# sourceMappingURL=session-record-disclosure.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-record-disclosure.test.js","sourceRoot":"","sources":["../../src/__tests__/session-record-disclosure.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,36 @@ class ExitError extends Error {
|
|
|
24
24
|
this.code = code;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
+
/**
|
|
28
|
+
* The two variables that decide `resolveProjectSlug` when a test supplies no
|
|
29
|
+
* `projectSlug` dep (`commands/session.ts:107-117`), saved so they can be put
|
|
30
|
+
* back.
|
|
31
|
+
*
|
|
32
|
+
* #314. These fixtures name memories with no project prefix, which is what the
|
|
33
|
+
* command produces when it finds no project config. Every agent worktree sets
|
|
34
|
+
* `CLAUDE_WORKTREE_PATH`, and the path it names holds a real
|
|
35
|
+
* `mx-agent.config.json` declaring `projectSlug: "mx-agent"`, so four fixtures
|
|
36
|
+
* asserted an unprefixed name against a run that correctly found a prefixed
|
|
37
|
+
* one. Measured 2026-09-02: this file gives 4 failed / 27 passed in an agent
|
|
38
|
+
* worktree and 31 passed under `env -u CLAUDE_WORKTREE_PATH -u
|
|
39
|
+
* CLAUDE_PROJECT_DIR`. CI passes because a checkout is not a worktree session.
|
|
40
|
+
*
|
|
41
|
+
* The defect is the test assuming an environment it never arranged, so the fix
|
|
42
|
+
* is here and `session.ts` is unchanged: reading the worktree environment is
|
|
43
|
+
* its correct production behaviour.
|
|
44
|
+
*
|
|
45
|
+
* RESTORED in `afterEach`, not left deleted. Vitest runs several files in one
|
|
46
|
+
* worker process, and a file that deletes a variable and walks away changes
|
|
47
|
+
* what its neighbours see.
|
|
48
|
+
*/
|
|
49
|
+
const ENV_KEYS_THAT_LEAK = ['CLAUDE_WORKTREE_PATH', 'CLAUDE_PROJECT_DIR'];
|
|
50
|
+
let savedEnv = {};
|
|
27
51
|
beforeEach(() => {
|
|
52
|
+
savedEnv = {};
|
|
53
|
+
for (const key of ENV_KEYS_THAT_LEAK) {
|
|
54
|
+
savedEnv[key] = process.env[key];
|
|
55
|
+
delete process.env[key];
|
|
56
|
+
}
|
|
28
57
|
home = mkdtempSync(join(tmpdir(), 'mx-session-'));
|
|
29
58
|
vi.spyOn(process, 'exit').mockImplementation(((code) => {
|
|
30
59
|
throw new ExitError(code ?? 0);
|
|
@@ -33,6 +62,12 @@ beforeEach(() => {
|
|
|
33
62
|
vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
34
63
|
});
|
|
35
64
|
afterEach(() => {
|
|
65
|
+
for (const key of ENV_KEYS_THAT_LEAK) {
|
|
66
|
+
if (savedEnv[key] === undefined)
|
|
67
|
+
delete process.env[key];
|
|
68
|
+
else
|
|
69
|
+
process.env[key] = savedEnv[key];
|
|
70
|
+
}
|
|
36
71
|
rmSync(home, { recursive: true, force: true });
|
|
37
72
|
vi.restoreAllMocks();
|
|
38
73
|
});
|