@openrig/cli 0.6.9 → 0.6.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/daemon/assets/onboarding/02-self-and-competent-action.md +4 -3
- package/daemon/assets/plugins/openrig-core/.claude-plugin/plugin.json +1 -1
- package/daemon/assets/plugins/openrig-core/.codex-plugin/plugin.json +1 -1
- package/daemon/assets/plugins/openrig-core/hooks/scripts/activity-relay.cjs +42 -2
- package/daemon/assets/plugins/openrig-core/skills/openrig-skills/SKILL.md +1 -1
- package/daemon/assets/plugins/openrig-core/skills/openrig-user/SKILL.md +7 -1
- package/daemon/assets/plugins/openrig-core/skills/refocusing/scripts/trace-to-root.py +6 -1
- package/daemon/assets/skills/rigs/SKILL.md +7 -5
- package/daemon/context-packs/help/manifest.yaml +1 -1
- package/daemon/context-packs/onboarding-width/manifest.yaml +1 -1
- package/daemon/context-packs/onboarding-width/public-what-you-can-do.md +64 -14
- package/daemon/context-packs/reference/getting-started.md +10 -6
- package/daemon/context-packs/reference/manifest.yaml +1 -1
- package/daemon/context-packs/reference/rig-spec.md +2 -2
- package/daemon/context-packs/reference/whats-new.md +151 -74
- package/daemon/context-packs/skills/agent-operated-software/manifest.yaml +1 -1
- package/daemon/context-packs/skills/agent-operated-workflows/manifest.yaml +1 -1
- package/daemon/context-packs/skills/applying-a-permission-policy/manifest.yaml +1 -1
- package/daemon/context-packs/skills/claude-compaction-restore/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/agent-starters/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/agent-startup-and-context-ingestion/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/cross-host-rig-commands/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/human-in-the-loop/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/messaging-the-human/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/openrig-architect/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/openrig-cmux/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/openrig-herdr/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/openrig-skills/SKILL.md +1 -1
- package/daemon/context-packs/skills/core/openrig-skills/manifest.yaml +3 -3
- package/daemon/context-packs/skills/core/openrig-software-factory/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/openrig-upgrade/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/rig-bundles-and-shareable-artifacts/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/rig-lifecycle/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/session-source-fork/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/specification-system/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/topology-mutation-and-seat-management/SKILL.md +2 -2
- package/daemon/context-packs/skills/core/topology-mutation-and-seat-management/manifest.yaml +1 -1
- package/daemon/context-packs/skills/core/watchdog/manifest.yaml +1 -1
- package/daemon/context-packs/skills/delegating-work/manifest.yaml +1 -1
- package/daemon/context-packs/skills/forming-an-openrig-mental-model/manifest.yaml +1 -1
- package/daemon/context-packs/skills/loading-addressable-markdown/manifest.yaml +1 -1
- package/daemon/context-packs/skills/mission-slice-sop/manifest.yaml +1 -1
- package/daemon/context-packs/skills/openrig-operating-model/manifest.yaml +1 -1
- package/daemon/context-packs/skills/openrig-user/SKILL.md +7 -1
- package/daemon/context-packs/skills/openrig-user/manifest.yaml +1 -1
- package/daemon/context-packs/skills/orienting-to-an-inherited-seat/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/backlog-capture/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/context-builder/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/exec-summary/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/office-hours/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/plan-review/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/requirements-writer/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pm/ui-mockup/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pods/development-team/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pods/orchestration-team/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pods/oversight-team/manifest.yaml +1 -1
- package/daemon/context-packs/skills/pods/review-team/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/agent-browser/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/context-engineering/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/dogfood/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/frontend-design/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/systematic-debugging/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/test-driven-development/manifest.yaml +1 -1
- package/daemon/context-packs/skills/process/verification-before-completion/manifest.yaml +1 -1
- package/daemon/context-packs/skills/queue-handoff/manifest.yaml +1 -1
- package/daemon/context-packs/skills/refocusing/manifest.yaml +1 -1
- package/daemon/context-packs/skills/refocusing/scripts/trace-to-root.py +6 -1
- package/daemon/context-packs/skills/retiring-and-inheriting-a-seat/manifest.yaml +1 -1
- package/daemon/context-packs/skills/seat-continuity-and-handover/manifest.yaml +1 -1
- package/daemon/context-packs/skills/session-compaction-and-restore/manifest.yaml +1 -1
- package/daemon/context-packs/skills/software-for-agents/manifest.yaml +1 -1
- package/daemon/context-packs/world-example/manifest.yaml +1 -1
- package/daemon/context-packs/world-public/manifest.yaml +1 -1
- package/daemon/dist/adapters/claude-code-adapter.d.ts +0 -14
- package/daemon/dist/adapters/claude-code-adapter.d.ts.map +1 -1
- package/daemon/dist/adapters/claude-code-adapter.js +43 -80
- package/daemon/dist/adapters/claude-code-adapter.js.map +1 -1
- package/daemon/dist/adapters/claude-resume-launch.d.ts +4 -0
- package/daemon/dist/adapters/claude-resume-launch.d.ts.map +1 -0
- package/daemon/dist/adapters/claude-resume-launch.js +13 -0
- package/daemon/dist/adapters/claude-resume-launch.js.map +1 -0
- package/daemon/dist/adapters/claude-resume.d.ts +2 -1
- package/daemon/dist/adapters/claude-resume.d.ts.map +1 -1
- package/daemon/dist/adapters/claude-resume.js +9 -4
- package/daemon/dist/adapters/claude-resume.js.map +1 -1
- package/daemon/dist/adapters/codex-runtime-adapter.d.ts +35 -0
- package/daemon/dist/adapters/codex-runtime-adapter.d.ts.map +1 -1
- package/daemon/dist/adapters/codex-runtime-adapter.js +94 -44
- package/daemon/dist/adapters/codex-runtime-adapter.js.map +1 -1
- package/daemon/dist/adapters/pi-runner.d.ts.map +1 -1
- package/daemon/dist/adapters/pi-runner.js +6 -3
- package/daemon/dist/adapters/pi-runner.js.map +1 -1
- package/daemon/dist/adapters/pi-runtime-adapter.js +1 -1
- package/daemon/dist/adapters/pi-runtime-adapter.js.map +1 -1
- package/daemon/dist/adapters/tmux-server.d.ts +15 -0
- package/daemon/dist/adapters/tmux-server.d.ts.map +1 -0
- package/daemon/dist/adapters/tmux-server.js +58 -0
- package/daemon/dist/adapters/tmux-server.js.map +1 -0
- package/daemon/dist/adapters/tmux.d.ts +26 -1
- package/daemon/dist/adapters/tmux.d.ts.map +1 -1
- package/daemon/dist/adapters/tmux.js +130 -7
- package/daemon/dist/adapters/tmux.js.map +1 -1
- package/daemon/dist/build-info.js +3 -3
- package/daemon/dist/db/all-migrations.d.ts.map +1 -1
- package/daemon/dist/db/all-migrations.js +6 -0
- package/daemon/dist/db/all-migrations.js.map +1 -1
- package/daemon/dist/db/migrations/099_queue_items_recovery_tags.d.ts +3 -0
- package/daemon/dist/db/migrations/099_queue_items_recovery_tags.d.ts.map +1 -0
- package/daemon/dist/db/migrations/099_queue_items_recovery_tags.js +19 -0
- package/daemon/dist/db/migrations/099_queue_items_recovery_tags.js.map +1 -0
- package/daemon/dist/db/migrations/101_claude_resume_rotation.d.ts +3 -0
- package/daemon/dist/db/migrations/101_claude_resume_rotation.d.ts.map +1 -0
- package/daemon/dist/db/migrations/101_claude_resume_rotation.js +19 -0
- package/daemon/dist/db/migrations/101_claude_resume_rotation.js.map +1 -0
- package/daemon/dist/db/migrations/103_session_stop_intent.d.ts +4 -0
- package/daemon/dist/db/migrations/103_session_stop_intent.d.ts.map +1 -0
- package/daemon/dist/db/migrations/103_session_stop_intent.js +9 -0
- package/daemon/dist/db/migrations/103_session_stop_intent.js.map +1 -0
- package/daemon/dist/domain/active-occupant.d.ts +14 -0
- package/daemon/dist/domain/active-occupant.d.ts.map +1 -1
- package/daemon/dist/domain/active-occupant.js +17 -0
- package/daemon/dist/domain/active-occupant.js.map +1 -1
- package/daemon/dist/domain/agent-activity-store.js +3 -0
- package/daemon/dist/domain/agent-activity-store.js.map +1 -1
- package/daemon/dist/domain/bootstrap-repository.js +1 -1
- package/daemon/dist/domain/bootstrap-repository.js.map +1 -1
- package/daemon/dist/domain/chat-repository.d.ts +3 -0
- package/daemon/dist/domain/chat-repository.d.ts.map +1 -1
- package/daemon/dist/domain/chat-repository.js +15 -4
- package/daemon/dist/domain/chat-repository.js.map +1 -1
- package/daemon/dist/domain/claude-managed-launch.d.ts +1 -1
- package/daemon/dist/domain/claude-managed-launch.d.ts.map +1 -1
- package/daemon/dist/domain/claude-managed-launch.js +3 -2
- package/daemon/dist/domain/claude-managed-launch.js.map +1 -1
- package/daemon/dist/domain/cmux-layout-service.d.ts.map +1 -1
- package/daemon/dist/domain/cmux-layout-service.js +2 -1
- package/daemon/dist/domain/cmux-layout-service.js.map +1 -1
- package/daemon/dist/domain/codex-git-add-dirs.js +1 -1
- package/daemon/dist/domain/codex-git-add-dirs.js.map +1 -1
- package/daemon/dist/domain/codex-network-default.d.ts +3 -0
- package/daemon/dist/domain/codex-network-default.d.ts.map +1 -1
- package/daemon/dist/domain/codex-network-default.js +1 -1
- package/daemon/dist/domain/codex-network-default.js.map +1 -1
- package/daemon/dist/domain/codex-pane-patterns.d.ts +2 -0
- package/daemon/dist/domain/codex-pane-patterns.d.ts.map +1 -0
- package/daemon/dist/domain/codex-pane-patterns.js +5 -0
- package/daemon/dist/domain/codex-pane-patterns.js.map +1 -0
- package/daemon/dist/domain/context-monitor.d.ts.map +1 -1
- package/daemon/dist/domain/context-monitor.js +46 -22
- package/daemon/dist/domain/context-monitor.js.map +1 -1
- package/daemon/dist/domain/context-usage-store.d.ts.map +1 -1
- package/daemon/dist/domain/context-usage-store.js +6 -1
- package/daemon/dist/domain/context-usage-store.js.map +1 -1
- package/daemon/dist/domain/crash-cart-conductor.d.ts.map +1 -1
- package/daemon/dist/domain/crash-cart-conductor.js +3 -1
- package/daemon/dist/domain/crash-cart-conductor.js.map +1 -1
- package/daemon/dist/domain/cwd-resolution.d.ts +8 -0
- package/daemon/dist/domain/cwd-resolution.d.ts.map +1 -1
- package/daemon/dist/domain/cwd-resolution.js +24 -3
- package/daemon/dist/domain/cwd-resolution.js.map +1 -1
- package/daemon/dist/domain/files/file-read.d.ts.map +1 -1
- package/daemon/dist/domain/files/file-read.js +11 -3
- package/daemon/dist/domain/files/file-read.js.map +1 -1
- package/daemon/dist/domain/gateway/connections-projection.d.ts +1 -1
- package/daemon/dist/domain/gateway/slack/channel-recovery.d.ts.map +1 -1
- package/daemon/dist/domain/gateway/slack/channel-recovery.js +4 -3
- package/daemon/dist/domain/gateway/slack/channel-recovery.js.map +1 -1
- package/daemon/dist/domain/gateway/slack/inbound.d.ts +21 -2
- package/daemon/dist/domain/gateway/slack/inbound.d.ts.map +1 -1
- package/daemon/dist/domain/gateway/slack/inbound.js +70 -11
- package/daemon/dist/domain/gateway/slack/inbound.js.map +1 -1
- package/daemon/dist/domain/gateway/slack/slack-delivery.d.ts +4 -0
- package/daemon/dist/domain/gateway/slack/slack-delivery.d.ts.map +1 -1
- package/daemon/dist/domain/gateway/slack/slack-delivery.js +1 -1
- package/daemon/dist/domain/gateway/slack/slack-delivery.js.map +1 -1
- package/daemon/dist/domain/gateway/slack/slack-subsystem.d.ts.map +1 -1
- package/daemon/dist/domain/gateway/slack/slack-subsystem.js +7 -4
- package/daemon/dist/domain/gateway/slack/slack-subsystem.js.map +1 -1
- package/daemon/dist/domain/history-query.d.ts.map +1 -1
- package/daemon/dist/domain/history-query.js +8 -6
- package/daemon/dist/domain/history-query.js.map +1 -1
- package/daemon/dist/domain/human-questions.d.ts +4 -1
- package/daemon/dist/domain/human-questions.d.ts.map +1 -1
- package/daemon/dist/domain/human-questions.js.map +1 -1
- package/daemon/dist/domain/install-engine.js +2 -2
- package/daemon/dist/domain/install-engine.js.map +1 -1
- package/daemon/dist/domain/native-process-lineage.d.ts +57 -4
- package/daemon/dist/domain/native-process-lineage.d.ts.map +1 -1
- package/daemon/dist/domain/native-process-lineage.js +277 -42
- package/daemon/dist/domain/native-process-lineage.js.map +1 -1
- package/daemon/dist/domain/node-cmux-service.d.ts.map +1 -1
- package/daemon/dist/domain/node-cmux-service.js +2 -1
- package/daemon/dist/domain/node-cmux-service.js.map +1 -1
- package/daemon/dist/domain/node-inventory.d.ts.map +1 -1
- package/daemon/dist/domain/node-inventory.js +71 -18
- package/daemon/dist/domain/node-inventory.js.map +1 -1
- package/daemon/dist/domain/node-launcher.d.ts.map +1 -1
- package/daemon/dist/domain/node-launcher.js +2 -1
- package/daemon/dist/domain/node-launcher.js.map +1 -1
- package/daemon/dist/domain/pane-cutover.d.ts +27 -0
- package/daemon/dist/domain/pane-cutover.d.ts.map +1 -0
- package/daemon/dist/domain/pane-cutover.js +37 -0
- package/daemon/dist/domain/pane-cutover.js.map +1 -0
- package/daemon/dist/domain/parent-session-env.d.ts +8 -0
- package/daemon/dist/domain/parent-session-env.d.ts.map +1 -0
- package/daemon/dist/domain/parent-session-env.js +37 -0
- package/daemon/dist/domain/parent-session-env.js.map +1 -0
- package/daemon/dist/domain/policies/parked-owner-consumer.d.ts +11 -0
- package/daemon/dist/domain/policies/parked-owner-consumer.d.ts.map +1 -1
- package/daemon/dist/domain/policies/parked-owner-consumer.js +81 -11
- package/daemon/dist/domain/policies/parked-owner-consumer.js.map +1 -1
- package/daemon/dist/domain/profile-resolver.d.ts.map +1 -1
- package/daemon/dist/domain/profile-resolver.js +2 -3
- package/daemon/dist/domain/profile-resolver.js.map +1 -1
- package/daemon/dist/domain/progress/progress-indexer.d.ts.map +1 -1
- package/daemon/dist/domain/progress/progress-indexer.js +19 -0
- package/daemon/dist/domain/progress/progress-indexer.js.map +1 -1
- package/daemon/dist/domain/proof/judgments.d.ts +10 -5
- package/daemon/dist/domain/proof/judgments.d.ts.map +1 -1
- package/daemon/dist/domain/proof/judgments.js +27 -19
- package/daemon/dist/domain/proof/judgments.js.map +1 -1
- package/daemon/dist/domain/provider/codex-limit-banner.d.ts +40 -0
- package/daemon/dist/domain/provider/codex-limit-banner.d.ts.map +1 -0
- package/daemon/dist/domain/provider/codex-limit-banner.js +168 -0
- package/daemon/dist/domain/provider/codex-limit-banner.js.map +1 -0
- package/daemon/dist/domain/provider/codex-usage-reader.d.ts +31 -0
- package/daemon/dist/domain/provider/codex-usage-reader.d.ts.map +1 -0
- package/daemon/dist/domain/provider/codex-usage-reader.js +115 -0
- package/daemon/dist/domain/provider/codex-usage-reader.js.map +1 -0
- package/daemon/dist/domain/provider/codex-usage-windows.d.ts +78 -0
- package/daemon/dist/domain/provider/codex-usage-windows.d.ts.map +1 -0
- package/daemon/dist/domain/provider/codex-usage-windows.js +259 -0
- package/daemon/dist/domain/provider/codex-usage-windows.js.map +1 -0
- package/daemon/dist/domain/provider/provider-service-impl.d.ts +10 -0
- package/daemon/dist/domain/provider/provider-service-impl.d.ts.map +1 -1
- package/daemon/dist/domain/provider/provider-service-impl.js +27 -1
- package/daemon/dist/domain/provider/provider-service-impl.js.map +1 -1
- package/daemon/dist/domain/provider/provider-service.d.ts +5 -0
- package/daemon/dist/domain/provider/provider-service.d.ts.map +1 -1
- package/daemon/dist/domain/provider/provider-types.d.ts +65 -0
- package/daemon/dist/domain/provider/provider-types.d.ts.map +1 -1
- package/daemon/dist/domain/ps-projection.d.ts +5 -2
- package/daemon/dist/domain/ps-projection.d.ts.map +1 -1
- package/daemon/dist/domain/ps-projection.js +29 -26
- package/daemon/dist/domain/ps-projection.js.map +1 -1
- package/daemon/dist/domain/queue-recovery.d.ts.map +1 -1
- package/daemon/dist/domain/queue-recovery.js +10 -3
- package/daemon/dist/domain/queue-recovery.js.map +1 -1
- package/daemon/dist/domain/queue-repository.d.ts +68 -13
- package/daemon/dist/domain/queue-repository.d.ts.map +1 -1
- package/daemon/dist/domain/queue-repository.js +72 -43
- package/daemon/dist/domain/queue-repository.js.map +1 -1
- package/daemon/dist/domain/queue-stuck-sweep.d.ts.map +1 -1
- package/daemon/dist/domain/queue-stuck-sweep.js +26 -9
- package/daemon/dist/domain/queue-stuck-sweep.js.map +1 -1
- package/daemon/dist/domain/queue-wake-ladder.d.ts +17 -0
- package/daemon/dist/domain/queue-wake-ladder.d.ts.map +1 -1
- package/daemon/dist/domain/queue-wake-ladder.js +49 -3
- package/daemon/dist/domain/queue-wake-ladder.js.map +1 -1
- package/daemon/dist/domain/restore-check-service.d.ts +8 -0
- package/daemon/dist/domain/restore-check-service.d.ts.map +1 -1
- package/daemon/dist/domain/restore-check-service.js +12 -3
- package/daemon/dist/domain/restore-check-service.js.map +1 -1
- package/daemon/dist/domain/restore-guidance.d.ts +39 -0
- package/daemon/dist/domain/restore-guidance.d.ts.map +1 -0
- package/daemon/dist/domain/restore-guidance.js +163 -0
- package/daemon/dist/domain/restore-guidance.js.map +1 -0
- package/daemon/dist/domain/restore-orchestrator.d.ts +10 -1
- package/daemon/dist/domain/restore-orchestrator.d.ts.map +1 -1
- package/daemon/dist/domain/restore-orchestrator.js +192 -9
- package/daemon/dist/domain/restore-orchestrator.js.map +1 -1
- package/daemon/dist/domain/restore-plan-preview.d.ts +4 -0
- package/daemon/dist/domain/restore-plan-preview.d.ts.map +1 -1
- package/daemon/dist/domain/restore-plan-preview.js +14 -3
- package/daemon/dist/domain/restore-plan-preview.js.map +1 -1
- package/daemon/dist/domain/rigspec-preflight.d.ts.map +1 -1
- package/daemon/dist/domain/rigspec-preflight.js +7 -6
- package/daemon/dist/domain/rigspec-preflight.js.map +1 -1
- package/daemon/dist/domain/runtime-adapter.d.ts +3 -0
- package/daemon/dist/domain/runtime-adapter.d.ts.map +1 -1
- package/daemon/dist/domain/runtime-adapter.js.map +1 -1
- package/daemon/dist/domain/scope/scope-view-projection.d.ts +4 -2
- package/daemon/dist/domain/scope/scope-view-projection.d.ts.map +1 -1
- package/daemon/dist/domain/scope/scope-view-projection.js +11 -11
- package/daemon/dist/domain/scope/scope-view-projection.js.map +1 -1
- package/daemon/dist/domain/seat-attention-reconciler.d.ts +5 -2
- package/daemon/dist/domain/seat-attention-reconciler.d.ts.map +1 -1
- package/daemon/dist/domain/seat-attention-reconciler.js +18 -4
- package/daemon/dist/domain/seat-attention-reconciler.js.map +1 -1
- package/daemon/dist/domain/seat-identity-reconciler.d.ts.map +1 -1
- package/daemon/dist/domain/seat-identity-reconciler.js +7 -2
- package/daemon/dist/domain/seat-identity-reconciler.js.map +1 -1
- package/daemon/dist/domain/seat-lifecycle-service.d.ts +117 -2
- package/daemon/dist/domain/seat-lifecycle-service.d.ts.map +1 -1
- package/daemon/dist/domain/seat-lifecycle-service.js +335 -74
- package/daemon/dist/domain/seat-lifecycle-service.js.map +1 -1
- package/daemon/dist/domain/seat-restart-in-place.d.ts +292 -0
- package/daemon/dist/domain/seat-restart-in-place.d.ts.map +1 -0
- package/daemon/dist/domain/seat-restart-in-place.js +895 -0
- package/daemon/dist/domain/seat-restart-in-place.js.map +1 -0
- package/daemon/dist/domain/seat-status-service.d.ts +2 -1
- package/daemon/dist/domain/seat-status-service.d.ts.map +1 -1
- package/daemon/dist/domain/seat-status-service.js +1 -0
- package/daemon/dist/domain/seat-status-service.js.map +1 -1
- package/daemon/dist/domain/seat-structural-activity-service.d.ts +9 -1
- package/daemon/dist/domain/seat-structural-activity-service.d.ts.map +1 -1
- package/daemon/dist/domain/seat-structural-activity-service.js +27 -4
- package/daemon/dist/domain/seat-structural-activity-service.js.map +1 -1
- package/daemon/dist/domain/seat-switch-client-service.d.ts.map +1 -1
- package/daemon/dist/domain/seat-switch-client-service.js +2 -1
- package/daemon/dist/domain/seat-switch-client-service.js.map +1 -1
- package/daemon/dist/domain/session-fingerprinter.d.ts.map +1 -1
- package/daemon/dist/domain/session-fingerprinter.js +9 -5
- package/daemon/dist/domain/session-fingerprinter.js.map +1 -1
- package/daemon/dist/domain/session-registry.d.ts +49 -0
- package/daemon/dist/domain/session-registry.d.ts.map +1 -1
- package/daemon/dist/domain/session-registry.js +92 -5
- package/daemon/dist/domain/session-registry.js.map +1 -1
- package/daemon/dist/domain/session-transport.d.ts +46 -4
- package/daemon/dist/domain/session-transport.d.ts.map +1 -1
- package/daemon/dist/domain/session-transport.js +492 -26
- package/daemon/dist/domain/session-transport.js.map +1 -1
- package/daemon/dist/domain/startup-orchestrator.d.ts +10 -0
- package/daemon/dist/domain/startup-orchestrator.d.ts.map +1 -1
- package/daemon/dist/domain/startup-orchestrator.js +41 -4
- package/daemon/dist/domain/startup-orchestrator.js.map +1 -1
- package/daemon/dist/domain/successor-session-launcher.d.ts +3 -7
- package/daemon/dist/domain/successor-session-launcher.d.ts.map +1 -1
- package/daemon/dist/domain/successor-session-launcher.js +6 -32
- package/daemon/dist/domain/successor-session-launcher.js.map +1 -1
- package/daemon/dist/domain/terminal/terminal-service.d.ts +5 -1
- package/daemon/dist/domain/terminal/terminal-service.d.ts.map +1 -1
- package/daemon/dist/domain/terminal/terminal-service.js +30 -4
- package/daemon/dist/domain/terminal/terminal-service.js.map +1 -1
- package/daemon/dist/domain/terminal/view-composer.d.ts +6 -0
- package/daemon/dist/domain/terminal/view-composer.d.ts.map +1 -1
- package/daemon/dist/domain/terminal/view-composer.js +2 -1
- package/daemon/dist/domain/terminal/view-composer.js.map +1 -1
- package/daemon/dist/domain/transcript-store.js +1 -1
- package/daemon/dist/domain/transcript-store.js.map +1 -1
- package/daemon/dist/domain/types.d.ts +38 -0
- package/daemon/dist/domain/types.d.ts.map +1 -1
- package/daemon/dist/domain/types.js +5 -0
- package/daemon/dist/domain/types.js.map +1 -1
- package/daemon/dist/domain/usage-series.d.ts.map +1 -1
- package/daemon/dist/domain/usage-series.js +9 -4
- package/daemon/dist/domain/usage-series.js.map +1 -1
- package/daemon/dist/domain/user-settings/settings-store.d.ts +1 -1
- package/daemon/dist/domain/user-settings/settings-store.d.ts.map +1 -1
- package/daemon/dist/domain/user-settings/settings-store.js +44 -0
- package/daemon/dist/domain/user-settings/settings-store.js.map +1 -1
- package/daemon/dist/domain/view-projector.d.ts +4 -0
- package/daemon/dist/domain/view-projector.d.ts.map +1 -1
- package/daemon/dist/domain/view-projector.js +19 -4
- package/daemon/dist/domain/view-projector.js.map +1 -1
- package/daemon/dist/domain/wake-resolver.js +2 -2
- package/daemon/dist/domain/wake-resolver.js.map +1 -1
- package/daemon/dist/domain/watchdog-jobs-repository.d.ts.map +1 -1
- package/daemon/dist/domain/watchdog-jobs-repository.js +19 -3
- package/daemon/dist/domain/watchdog-jobs-repository.js.map +1 -1
- package/daemon/dist/domain/whoami-service.d.ts +4 -1
- package/daemon/dist/domain/whoami-service.d.ts.map +1 -1
- package/daemon/dist/domain/whoami-service.js +25 -19
- package/daemon/dist/domain/whoami-service.js.map +1 -1
- package/daemon/dist/domain/workflow-runtime.d.ts +1 -1
- package/daemon/dist/domain/workspace/project-read.d.ts +2 -0
- package/daemon/dist/domain/workspace/project-read.d.ts.map +1 -1
- package/daemon/dist/domain/workspace/project-read.js +19 -8
- package/daemon/dist/domain/workspace/project-read.js.map +1 -1
- package/daemon/dist/index.d.ts.map +1 -1
- package/daemon/dist/index.js +6 -0
- package/daemon/dist/index.js.map +1 -1
- package/daemon/dist/routes/activity.d.ts.map +1 -1
- package/daemon/dist/routes/activity.js +33 -1
- package/daemon/dist/routes/activity.js.map +1 -1
- package/daemon/dist/routes/chat.d.ts.map +1 -1
- package/daemon/dist/routes/chat.js +29 -4
- package/daemon/dist/routes/chat.js.map +1 -1
- package/daemon/dist/routes/projects.d.ts.map +1 -1
- package/daemon/dist/routes/projects.js +5 -1
- package/daemon/dist/routes/projects.js.map +1 -1
- package/daemon/dist/routes/proof.d.ts.map +1 -1
- package/daemon/dist/routes/proof.js +99 -10
- package/daemon/dist/routes/proof.js.map +1 -1
- package/daemon/dist/routes/provider.d.ts.map +1 -1
- package/daemon/dist/routes/provider.js +31 -0
- package/daemon/dist/routes/provider.js.map +1 -1
- package/daemon/dist/routes/query-limit.d.ts +19 -0
- package/daemon/dist/routes/query-limit.d.ts.map +1 -0
- package/daemon/dist/routes/query-limit.js +24 -0
- package/daemon/dist/routes/query-limit.js.map +1 -0
- package/daemon/dist/routes/queue.d.ts.map +1 -1
- package/daemon/dist/routes/queue.js +35 -12
- package/daemon/dist/routes/queue.js.map +1 -1
- package/daemon/dist/routes/rig-cmux.js +8 -10
- package/daemon/dist/routes/rig-cmux.js.map +1 -1
- package/daemon/dist/routes/rigs.d.ts.map +1 -1
- package/daemon/dist/routes/rigs.js +11 -7
- package/daemon/dist/routes/rigs.js.map +1 -1
- package/daemon/dist/routes/scopes.d.ts.map +1 -1
- package/daemon/dist/routes/scopes.js +5 -3
- package/daemon/dist/routes/scopes.js.map +1 -1
- package/daemon/dist/routes/seat.d.ts.map +1 -1
- package/daemon/dist/routes/seat.js +32 -0
- package/daemon/dist/routes/seat.js.map +1 -1
- package/daemon/dist/routes/stream.d.ts.map +1 -1
- package/daemon/dist/routes/stream.js +5 -1
- package/daemon/dist/routes/stream.js.map +1 -1
- package/daemon/dist/routes/up.d.ts.map +1 -1
- package/daemon/dist/routes/up.js +2 -1
- package/daemon/dist/routes/up.js.map +1 -1
- package/daemon/dist/routes/views.d.ts.map +1 -1
- package/daemon/dist/routes/views.js +7 -1
- package/daemon/dist/routes/views.js.map +1 -1
- package/daemon/dist/startup.d.ts.map +1 -1
- package/daemon/dist/startup.js +30 -1
- package/daemon/dist/startup.js.map +1 -1
- package/daemon/docs/reference/agent-startup-guide.md +19 -0
- package/daemon/docs/reference/getting-started.md +10 -6
- package/daemon/docs/reference/keeping-a-watch.md +156 -0
- package/daemon/docs/reference/rig-spec.md +2 -2
- package/daemon/docs/reference/sdlc-conventions.md +11 -1
- package/daemon/docs/reference/slack-app-setup.md +12 -4
- package/daemon/docs/reference/whats-new.md +151 -74
- package/daemon/specs/agents/development/qa/guidance/role.md +9 -0
- package/daemon/specs/agents/shared/skills/core/openrig-skills/SKILL.md +1 -1
- package/daemon/specs/agents/shared/skills/core/topology-mutation-and-seat-management/SKILL.md +2 -2
- package/daemon/specs/rigs/launch/factory/CULTURE.md +13 -0
- package/daemon/specs/rigs/launch/factory/guidance/lead-first-move.md +18 -5
- package/daemon/specs/rigs/launch/kernel/agents/operator/agent/guidance/role.md +20 -1
- package/daemon/specs/rigs/launch/starter/CULTURE.md +13 -0
- package/daemon/specs/rigs/launch/starter/guidance/lead-first-move.md +18 -5
- package/dist/build-info.js +3 -3
- package/dist/cli-error.d.ts.map +1 -1
- package/dist/cli-error.js +2 -0
- package/dist/cli-error.js.map +1 -1
- package/dist/commands/add.d.ts.map +1 -1
- package/dist/commands/add.js +55 -4
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/capture.d.ts +9 -0
- package/dist/commands/capture.d.ts.map +1 -1
- package/dist/commands/capture.js +93 -41
- package/dist/commands/capture.js.map +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +6 -1
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/daemon.d.ts.map +1 -1
- package/dist/commands/daemon.js +44 -3
- package/dist/commands/daemon.js.map +1 -1
- package/dist/commands/down.d.ts.map +1 -1
- package/dist/commands/down.js +1 -50
- package/dist/commands/down.js.map +1 -1
- package/dist/commands/env.d.ts.map +1 -1
- package/dist/commands/env.js +6 -0
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/heartbeat.js +2 -2
- package/dist/commands/heartbeat.js.map +1 -1
- package/dist/commands/proof.d.ts.map +1 -1
- package/dist/commands/proof.js +11 -5
- package/dist/commands/proof.js.map +1 -1
- package/dist/commands/provider.d.ts.map +1 -1
- package/dist/commands/provider.js +72 -0
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/ps.d.ts +7 -0
- package/dist/commands/ps.d.ts.map +1 -1
- package/dist/commands/ps.js +20 -6
- package/dist/commands/ps.js.map +1 -1
- package/dist/commands/queue.d.ts +48 -5
- package/dist/commands/queue.d.ts.map +1 -1
- package/dist/commands/queue.js +215 -45
- package/dist/commands/queue.js.map +1 -1
- package/dist/commands/scope.d.ts.map +1 -1
- package/dist/commands/scope.js +57 -36
- package/dist/commands/scope.js.map +1 -1
- package/dist/commands/seat.d.ts.map +1 -1
- package/dist/commands/seat.js +167 -10
- package/dist/commands/seat.js.map +1 -1
- package/dist/commands/setup.d.ts +6 -0
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +100 -44
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +9 -4
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/up.d.ts.map +1 -1
- package/dist/commands/up.js +10 -0
- package/dist/commands/up.js.map +1 -1
- package/dist/commands/usage.d.ts.map +1 -1
- package/dist/commands/usage.js +10 -5
- package/dist/commands/usage.js.map +1 -1
- package/dist/commands/workflow.d.ts.map +1 -1
- package/dist/commands/workflow.js +8 -8
- package/dist/commands/workflow.js.map +1 -1
- package/dist/config-store.d.ts +8 -1
- package/dist/config-store.d.ts.map +1 -1
- package/dist/config-store.js +57 -0
- package/dist/config-store.js.map +1 -1
- package/dist/daemon-lifecycle.d.ts +4 -0
- package/dist/daemon-lifecycle.d.ts.map +1 -1
- package/dist/daemon-lifecycle.js +16 -4
- package/dist/daemon-lifecycle.js.map +1 -1
- package/dist/lib/scope/capability-delta.d.ts.map +1 -1
- package/dist/lib/scope/capability-delta.js +8 -0
- package/dist/lib/scope/capability-delta.js.map +1 -1
- package/dist/lib/scope/mission-composition.d.ts +5 -1
- package/dist/lib/scope/mission-composition.d.ts.map +1 -1
- package/dist/lib/scope/mission-composition.js +61 -1
- package/dist/lib/scope/mission-composition.js.map +1 -1
- package/dist/lib/scope/progress-edit.js +1 -1
- package/dist/lib/scope/progress-edit.js.map +1 -1
- package/dist/lib/scope/scope-fs.d.ts +2 -1
- package/dist/lib/scope/scope-fs.d.ts.map +1 -1
- package/dist/lib/scope/scope-fs.js +7 -7
- package/dist/lib/scope/scope-fs.js.map +1 -1
- package/dist/lib/scope/slice-claims.d.ts +8 -0
- package/dist/lib/scope/slice-claims.d.ts.map +1 -0
- package/dist/lib/scope/slice-claims.js +88 -0
- package/dist/lib/scope/slice-claims.js.map +1 -0
- package/dist/queue-receipt.d.ts +41 -0
- package/dist/queue-receipt.d.ts.map +1 -0
- package/dist/queue-receipt.js +272 -0
- package/dist/queue-receipt.js.map +1 -0
- package/dist/rig-handle.d.ts +45 -0
- package/dist/rig-handle.d.ts.map +1 -0
- package/dist/rig-handle.js +51 -0
- package/dist/rig-handle.js.map +1 -0
- package/dist/system-preflight.d.ts +5 -0
- package/dist/system-preflight.d.ts.map +1 -1
- package/dist/system-preflight.js +8 -0
- package/dist/system-preflight.js.map +1 -1
- package/dist/terminal-window.d.ts.map +1 -1
- package/dist/terminal-window.js +3 -1
- package/dist/terminal-window.js.map +1 -1
- package/package.json +1 -1
- package/tui/dist/config/config-model.d.ts.map +1 -1
- package/tui/dist/config/config-model.js +3 -0
- package/tui/dist/config/config-model.js.map +1 -1
- package/tui/dist/daemon-client.d.ts +3 -0
- package/tui/dist/daemon-client.d.ts.map +1 -1
- package/tui/dist/daemon-client.js +4 -1
- package/tui/dist/daemon-client.js.map +1 -1
- package/tui/dist/detail.d.ts.map +1 -1
- package/tui/dist/detail.js +6 -1
- package/tui/dist/detail.js.map +1 -1
- package/tui/dist/hydrate.d.ts.map +1 -1
- package/tui/dist/hydrate.js +30 -21
- package/tui/dist/hydrate.js.map +1 -1
- package/tui/dist/input.d.ts.map +1 -1
- package/tui/dist/input.js +15 -4
- package/tui/dist/input.js.map +1 -1
- package/tui/dist/local-reading.js +2 -2
- package/tui/dist/local-reading.js.map +1 -1
- package/tui/dist/pulse/pulse-model.d.ts +1 -0
- package/tui/dist/pulse/pulse-model.d.ts.map +1 -1
- package/tui/dist/pulse/pulse-model.js +7 -3
- package/tui/dist/pulse/pulse-model.js.map +1 -1
- package/tui/dist/pulse/render-pulse.d.ts.map +1 -1
- package/tui/dist/pulse/render-pulse.js +3 -1
- package/tui/dist/pulse/render-pulse.js.map +1 -1
- package/tui/dist/reading.d.ts.map +1 -1
- package/tui/dist/reading.js +14 -3
- package/tui/dist/reading.js.map +1 -1
- package/tui/dist/render.d.ts.map +1 -1
- package/tui/dist/render.js +26 -11
- package/tui/dist/render.js.map +1 -1
- package/tui/dist/types.d.ts +3 -0
- package/tui/dist/types.d.ts.map +1 -1
- package/ui/dist/assets/{index-D5n8EwkG.js → index-DhmxKuZf.js} +159 -159
- package/ui/dist/index.html +1 -1
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
// Slice 01 (OPR.0.7.0.1) — one bounded read of the Codex login's native usage windows. A one-shot
|
|
2
|
+
// `codex app-server` started with the PATH, HOME and CODEX_HOME a seat session gets answers
|
|
3
|
+
// `account/read` (refreshToken:false) and `account/rateLimits/read`, then exits on stdin EOF; the
|
|
4
|
+
// reader's process group is stopped the same way as the #275 network reader. It runs only on an
|
|
5
|
+
// explicit refresh: ordinary provider reads never call it.
|
|
6
|
+
//
|
|
7
|
+
// Identity comes only from the two RPC answers. The reader never opens auth.json or any token.
|
|
8
|
+
// Side effects: Codex startup may write its own state files in the shared CODEX_HOME (its databases,
|
|
9
|
+
// installation id, bundled skills), and a backend read may refresh the login's token in auth.json, as
|
|
10
|
+
// any Codex start can. Plugins and apps are off for this read, so no plugin sync runs.
|
|
11
|
+
import { spawn } from "node:child_process";
|
|
12
|
+
import { stopGroup } from "../codex-network-default.js";
|
|
13
|
+
/** The app-server, with plugins and apps switched off for this read only (as `codex-network-default.ts`). */
|
|
14
|
+
export const CODEX_USAGE_READER_ARGS = ["-c", "features.plugins=false", "-c", "features.apps=false", "app-server"];
|
|
15
|
+
/** Native reads take 25–35 s (Ops' readers); the refresh is bounded by the upper end. */
|
|
16
|
+
export const CODEX_USAGE_READ_DEADLINE_MS = 35_000;
|
|
17
|
+
const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
18
|
+
const firstLine = (error) => String(error instanceof Error ? error.message : error).split("\n")[0];
|
|
19
|
+
export function codexUsageReader(options = {}) {
|
|
20
|
+
const deadlineMs = options.deadlineMs ?? CODEX_USAGE_READ_DEADLINE_MS;
|
|
21
|
+
const graceMs = options.graceMs ?? 2_000;
|
|
22
|
+
const maxOutputBytes = options.maxOutputBytes ?? 1024 * 1024;
|
|
23
|
+
const now = options.now ?? (() => new Date().toISOString());
|
|
24
|
+
return async () => {
|
|
25
|
+
const env = {
|
|
26
|
+
...process.env,
|
|
27
|
+
...(options.launchPath ? { PATH: options.launchPath } : {}),
|
|
28
|
+
...(options.home ? { HOME: options.home } : {}),
|
|
29
|
+
...(options.codexHome ? { CODEX_HOME: options.codexHome } : {}),
|
|
30
|
+
};
|
|
31
|
+
let child;
|
|
32
|
+
try {
|
|
33
|
+
// Its own process group, so cleanup reaches the reader's descendants and nothing else.
|
|
34
|
+
// Plugins and apps off, as the #275 network reader starts it: no plugin sync during a usage read.
|
|
35
|
+
child = spawn("codex", CODEX_USAGE_READER_ARGS, { cwd: options.home, env, stdio: ["pipe", "pipe", "ignore"], detached: true });
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
return { ok: false, at: now(), reason: "spawn_failed", detail: `codex app-server could not start: ${firstLine(error)}` };
|
|
39
|
+
}
|
|
40
|
+
const outcome = await converse(child, deadlineMs, maxOutputBytes, now);
|
|
41
|
+
await stopGroup(child, graceMs);
|
|
42
|
+
return outcome;
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
function converse(child, deadlineMs, maxOutputBytes, now) {
|
|
46
|
+
return new Promise((resolve) => {
|
|
47
|
+
let account;
|
|
48
|
+
let buffered = "";
|
|
49
|
+
let received = 0;
|
|
50
|
+
let settled = false;
|
|
51
|
+
const finish = (outcome) => {
|
|
52
|
+
if (settled)
|
|
53
|
+
return;
|
|
54
|
+
settled = true;
|
|
55
|
+
clearTimeout(deadline);
|
|
56
|
+
resolve(outcome);
|
|
57
|
+
};
|
|
58
|
+
const fail = (reason, detail) => finish({ ok: false, at: now(), reason, detail });
|
|
59
|
+
const deadline = setTimeout(() => fail("timeout", `codex app-server did not answer within ${deadlineMs} ms`), deadlineMs);
|
|
60
|
+
const send = (message) => {
|
|
61
|
+
if (child.stdin?.writable)
|
|
62
|
+
child.stdin.write(`${JSON.stringify(message)}\n`);
|
|
63
|
+
};
|
|
64
|
+
child.on("error", (error) => {
|
|
65
|
+
if (error.code === "ENOENT")
|
|
66
|
+
fail("binary_not_found", "no codex executable on the daemon's PATH");
|
|
67
|
+
else
|
|
68
|
+
fail("spawn_failed", `codex app-server could not start: ${firstLine(error)}`);
|
|
69
|
+
});
|
|
70
|
+
child.on("exit", (code, signal) => fail("child_exited", `codex app-server exited before answering (${signal ?? `code ${code}`})`));
|
|
71
|
+
child.stdin?.on("error", () => fail("child_exited", "codex app-server closed its input before answering"));
|
|
72
|
+
child.stdout?.setEncoding("utf8");
|
|
73
|
+
child.stdout?.on("data", (chunk) => {
|
|
74
|
+
received += Buffer.byteLength(chunk);
|
|
75
|
+
if (received > maxOutputBytes)
|
|
76
|
+
return fail("output_too_large", `codex app-server answered with more than ${maxOutputBytes} bytes`);
|
|
77
|
+
buffered += chunk;
|
|
78
|
+
let newline;
|
|
79
|
+
while ((newline = buffered.indexOf("\n")) >= 0) {
|
|
80
|
+
const line = buffered.slice(0, newline).trim();
|
|
81
|
+
buffered = buffered.slice(newline + 1);
|
|
82
|
+
if (!line)
|
|
83
|
+
continue;
|
|
84
|
+
let message;
|
|
85
|
+
try {
|
|
86
|
+
message = JSON.parse(line);
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
// Only responses to our own requests: notifications and server requests carry a method.
|
|
92
|
+
if (!isRecord(message) || typeof message.id !== "number" || "method" in message)
|
|
93
|
+
continue;
|
|
94
|
+
if (message.error !== undefined) {
|
|
95
|
+
const method = message.id === 1 ? "initialize" : message.id === 2 ? "account/read" : "account/rateLimits/read";
|
|
96
|
+
const text = isRecord(message.error) && typeof message.error.message === "string" ? `: ${message.error.message.split("\n")[0]}` : "";
|
|
97
|
+
return fail("rpc_error", `codex app-server returned an error for ${method}${text}`);
|
|
98
|
+
}
|
|
99
|
+
if (message.id === 1) {
|
|
100
|
+
send({ method: "initialized", params: {} });
|
|
101
|
+
send({ id: 2, method: "account/read", params: { refreshToken: false } });
|
|
102
|
+
}
|
|
103
|
+
else if (message.id === 2) {
|
|
104
|
+
account = message.result;
|
|
105
|
+
send({ id: 3, method: "account/rateLimits/read" });
|
|
106
|
+
}
|
|
107
|
+
else if (message.id === 3) {
|
|
108
|
+
return finish({ ok: true, observedAt: now(), account, rateLimits: message.result });
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
send({ id: 1, method: "initialize", params: { clientInfo: { name: "openrig_usage_windows", version: "1.0.0" }, capabilities: null } });
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=codex-usage-reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-usage-reader.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-reader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import type { CodexUsageReader } from "./codex-usage-reader.js";
|
|
2
|
+
import type { ProviderUsageAllowance, UsageAllowanceIdentity, UsageRefreshOutcome, UsageWindowRow } from "./provider-types.js";
|
|
3
|
+
/** A reading is too old to claim current capacity after this (Ops' openrig.subscription-usage.v1 rule). */
|
|
4
|
+
export declare const USAGE_FRESH_FOR_MS: number;
|
|
5
|
+
/** An observation up to this far in the future is clock skew within tolerance (same rule). */
|
|
6
|
+
export declare const USAGE_CLOCK_TOLERANCE_MS = 60000;
|
|
7
|
+
interface ReadWindow {
|
|
8
|
+
window: "primary" | "secondary";
|
|
9
|
+
durationMins: number | null;
|
|
10
|
+
usedPercent: number | null;
|
|
11
|
+
resetsAt: string | null;
|
|
12
|
+
}
|
|
13
|
+
interface Reading {
|
|
14
|
+
identity: UsageAllowanceIdentity;
|
|
15
|
+
windows: ReadWindow[];
|
|
16
|
+
limitEvidence: string | null;
|
|
17
|
+
observedAt: string;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* The workspace `account/read` reports, when it reports one: `workspaceRouting.chatgptAccountId` at the top
|
|
21
|
+
* level of the result (a sibling of `account`). Path and types from Codex 0.162.1's generated schema
|
|
22
|
+
* (GetAccountResponse.json), relayed by Build's reviewer: `workspaceRouting` is optional and nullable, and
|
|
23
|
+
* when present `chatgptAccountId` is a non-null string. Its siblings (backendOrigin, accountRoutingOverride)
|
|
24
|
+
* are not identity. Codex 0.153.4's answer has no `workspaceRouting`, so it yields null there.
|
|
25
|
+
*/
|
|
26
|
+
export declare function accountReadWorkspaceId(account: unknown): string | null;
|
|
27
|
+
/**
|
|
28
|
+
* Normalize the two app-server answers (shapes from Codex 0.153.4's protocol: `GetAccountResponse`,
|
|
29
|
+
* `GetAccountRateLimitsResponse`). One reading per metered bucket (`rateLimitsByLimitId`, else the
|
|
30
|
+
* single-bucket `rateLimits`). Identity is the usage answer's `accountId`, else the workspace
|
|
31
|
+
* `account/read` reports, else unresolved; email and plan are labels and never part of identity.
|
|
32
|
+
*/
|
|
33
|
+
export declare function normalizeCodexUsage(account: unknown, rateLimits: unknown, observedAt: string): {
|
|
34
|
+
ok: true;
|
|
35
|
+
readings: Reading[];
|
|
36
|
+
} | {
|
|
37
|
+
ok: false;
|
|
38
|
+
detail: string;
|
|
39
|
+
};
|
|
40
|
+
/** Freshness is aged from the window's own observation, never from the time of the request. */
|
|
41
|
+
export declare function usageFreshness(observedAt: string, now: string, failedAfter: {
|
|
42
|
+
at: string;
|
|
43
|
+
} | null): Pick<UsageWindowRow, "freshness" | "freshnessReason">;
|
|
44
|
+
/** Level of one window as of its observation. Absent data is never nearing or exhausted. */
|
|
45
|
+
export declare function usageLevel(window: ReadWindow, limitEvidence: string | null, now: string): Pick<UsageWindowRow, "level" | "levelReason">;
|
|
46
|
+
/** Unresolved observations can't be matched to earlier ones, so each read adds its own rows. Keep those
|
|
47
|
+
* from the most recent few reads: enough to compare the latest with the two before it, and bounded
|
|
48
|
+
* because nothing else ever removes them. */
|
|
49
|
+
export declare const UNRESOLVED_READS_KEPT = 3;
|
|
50
|
+
export interface CodexUsageWindowsDeps {
|
|
51
|
+
read: CodexUsageReader;
|
|
52
|
+
now?: () => string;
|
|
53
|
+
}
|
|
54
|
+
export interface UsageRefreshResult {
|
|
55
|
+
refresh: UsageRefreshOutcome & {
|
|
56
|
+
coalesced: boolean;
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
export declare class CodexUsageWindows {
|
|
60
|
+
private readonly deps;
|
|
61
|
+
private readonly now;
|
|
62
|
+
private readonly startedAt;
|
|
63
|
+
private readonly readings;
|
|
64
|
+
/** Unresolved observations, grouped by read, newest last; at most UNRESOLVED_READS_KEPT reads. */
|
|
65
|
+
private unresolved;
|
|
66
|
+
private unresolvedDropped;
|
|
67
|
+
private lastRefresh;
|
|
68
|
+
private inflight;
|
|
69
|
+
constructor(deps: CodexUsageWindowsDeps);
|
|
70
|
+
/** One bounded read. A refresh asked for while one runs joins it; one asked for after it ends reads again. */
|
|
71
|
+
refresh(): Promise<UsageRefreshResult>;
|
|
72
|
+
private runRead;
|
|
73
|
+
private recordFailure;
|
|
74
|
+
/** The served rows. Reads memory only: it never starts a native read. */
|
|
75
|
+
project(now: string): ProviderUsageAllowance[];
|
|
76
|
+
}
|
|
77
|
+
export {};
|
|
78
|
+
//# sourceMappingURL=codex-usage-windows.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-usage-windows.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-windows.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA2B,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B,2GAA2G;AAC3G,eAAO,MAAM,kBAAkB,QAAc,CAAC;AAC9C,8FAA8F;AAC9F,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAE/C,UAAU,UAAU;IAClB,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,UAAU,OAAO;IACf,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGtE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAC3F;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAwClE;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAChG,IAAI,CAAC,cAAc,EAAE,WAAW,GAAG,iBAAiB,CAAC,CActD;AAED,4FAA4F;AAC5F,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GACtF,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC,CAW9C;AAQD;;8CAE8C;AAC9C,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,mBAAmB,GAAG;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC;CACvD;AAED,qBAAa,iBAAiB;IAUhB,OAAO,CAAC,QAAQ,CAAC,IAAI;IATjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAC7E,kGAAkG;IAClG,OAAO,CAAC,UAAU,CAAmD;IACrE,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,QAAQ,CAA6C;gBAEhC,IAAI,EAAE,qBAAqB;IAKxD,8GAA8G;IACxG,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC;YAW9B,OAAO;IA4BrB,OAAO,CAAC,aAAa;IAKrB,yEAAyE;IACzE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,EAAE;CA2D/C"}
|
|
@@ -0,0 +1,259 @@
|
|
|
1
|
+
// Slice 01 (OPR.0.7.0.1) — Codex usage windows for the provider view. Holds the last reading of
|
|
2
|
+
// this daemon's Codex login in memory, refreshes it only on request (one bounded read; matching
|
|
3
|
+
// overlapping requests share it), and projects rows keyed by allowance identity with freshness
|
|
4
|
+
// kept separate from level. A failed refresh never replaces a reading: the reading stays, with its
|
|
5
|
+
// own time, marked old beside the failure. A daemon restart starts empty.
|
|
6
|
+
import { NEARING_THRESHOLD_PERCENT } from "./host-usage-rollup.js";
|
|
7
|
+
/** A reading is too old to claim current capacity after this (Ops' openrig.subscription-usage.v1 rule). */
|
|
8
|
+
export const USAGE_FRESH_FOR_MS = 15 * 60_000;
|
|
9
|
+
/** An observation up to this far in the future is clock skew within tolerance (same rule). */
|
|
10
|
+
export const USAGE_CLOCK_TOLERANCE_MS = 60_000;
|
|
11
|
+
const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
12
|
+
const stringOrNull = (value) => (typeof value === "string" && value.length > 0 ? value : null);
|
|
13
|
+
function readWindow(window, raw) {
|
|
14
|
+
if (raw === null || raw === undefined)
|
|
15
|
+
return null;
|
|
16
|
+
if (!isRecord(raw) || typeof raw.usedPercent !== "number" || !Number.isFinite(raw.usedPercent))
|
|
17
|
+
return "bad";
|
|
18
|
+
const resetsAt = typeof raw.resetsAt === "number" && Number.isFinite(raw.resetsAt)
|
|
19
|
+
? new Date(raw.resetsAt * 1000).toISOString()
|
|
20
|
+
: null;
|
|
21
|
+
const durationMins = typeof raw.windowDurationMins === "number" && Number.isFinite(raw.windowDurationMins)
|
|
22
|
+
? raw.windowDurationMins
|
|
23
|
+
: null;
|
|
24
|
+
return { window, durationMins, usedPercent: raw.usedPercent, resetsAt };
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* The workspace `account/read` reports, when it reports one: `workspaceRouting.chatgptAccountId` at the top
|
|
28
|
+
* level of the result (a sibling of `account`). Path and types from Codex 0.162.1's generated schema
|
|
29
|
+
* (GetAccountResponse.json), relayed by Build's reviewer: `workspaceRouting` is optional and nullable, and
|
|
30
|
+
* when present `chatgptAccountId` is a non-null string. Its siblings (backendOrigin, accountRoutingOverride)
|
|
31
|
+
* are not identity. Codex 0.153.4's answer has no `workspaceRouting`, so it yields null there.
|
|
32
|
+
*/
|
|
33
|
+
export function accountReadWorkspaceId(account) {
|
|
34
|
+
if (!isRecord(account) || !isRecord(account.workspaceRouting))
|
|
35
|
+
return null;
|
|
36
|
+
return stringOrNull(account.workspaceRouting.chatgptAccountId);
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Normalize the two app-server answers (shapes from Codex 0.153.4's protocol: `GetAccountResponse`,
|
|
40
|
+
* `GetAccountRateLimitsResponse`). One reading per metered bucket (`rateLimitsByLimitId`, else the
|
|
41
|
+
* single-bucket `rateLimits`). Identity is the usage answer's `accountId`, else the workspace
|
|
42
|
+
* `account/read` reports, else unresolved; email and plan are labels and never part of identity.
|
|
43
|
+
*/
|
|
44
|
+
export function normalizeCodexUsage(account, rateLimits, observedAt) {
|
|
45
|
+
if (!isRecord(rateLimits))
|
|
46
|
+
return { ok: false, detail: "account/rateLimits/read returned an unrecognized shape" };
|
|
47
|
+
const accountInfo = isRecord(account) && isRecord(account.account) ? account.account : null;
|
|
48
|
+
const email = accountInfo ? stringOrNull(accountInfo.email) : null;
|
|
49
|
+
const accountPlan = accountInfo ? stringOrNull(accountInfo.planType) : null;
|
|
50
|
+
const accountId = stringOrNull(rateLimits.accountId);
|
|
51
|
+
const workspaceId = accountId === null ? accountReadWorkspaceId(account) : null;
|
|
52
|
+
const source = accountId !== null
|
|
53
|
+
? "account/rateLimits/read accountId"
|
|
54
|
+
: workspaceId !== null ? "account/read workspace routing" : "unresolved";
|
|
55
|
+
const buckets = isRecord(rateLimits.rateLimitsByLimitId)
|
|
56
|
+
? Object.entries(rateLimits.rateLimitsByLimitId)
|
|
57
|
+
: isRecord(rateLimits.rateLimits)
|
|
58
|
+
? [[stringOrNull(rateLimits.rateLimits.limitId) ?? "codex", rateLimits.rateLimits]]
|
|
59
|
+
: [];
|
|
60
|
+
if (buckets.length === 0)
|
|
61
|
+
return { ok: false, detail: "account/rateLimits/read returned no rate-limit buckets" };
|
|
62
|
+
const readings = [];
|
|
63
|
+
for (const [limitId, snapshot] of buckets) {
|
|
64
|
+
if (!isRecord(snapshot))
|
|
65
|
+
return { ok: false, detail: `bucket ${limitId} has an unrecognized shape` };
|
|
66
|
+
const windows = [];
|
|
67
|
+
for (const key of ["primary", "secondary"]) {
|
|
68
|
+
const w = readWindow(key, snapshot[key]);
|
|
69
|
+
if (w === "bad")
|
|
70
|
+
return { ok: false, detail: `bucket ${limitId} ${key} window has an unrecognized shape` };
|
|
71
|
+
if (w)
|
|
72
|
+
windows.push(w);
|
|
73
|
+
}
|
|
74
|
+
readings.push({
|
|
75
|
+
identity: {
|
|
76
|
+
accountId,
|
|
77
|
+
workspaceId,
|
|
78
|
+
limitId,
|
|
79
|
+
email,
|
|
80
|
+
planType: stringOrNull(snapshot.planType) ?? accountPlan,
|
|
81
|
+
source,
|
|
82
|
+
},
|
|
83
|
+
windows,
|
|
84
|
+
limitEvidence: stringOrNull(snapshot.rateLimitReachedType),
|
|
85
|
+
observedAt,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
return { ok: true, readings };
|
|
89
|
+
}
|
|
90
|
+
/** Freshness is aged from the window's own observation, never from the time of the request. */
|
|
91
|
+
export function usageFreshness(observedAt, now, failedAfter) {
|
|
92
|
+
const observedMs = Date.parse(observedAt);
|
|
93
|
+
const nowMs = Date.parse(now);
|
|
94
|
+
if (!Number.isFinite(observedMs) || !Number.isFinite(nowMs)) {
|
|
95
|
+
return { freshness: "unavailable", freshnessReason: "observation time unreadable" };
|
|
96
|
+
}
|
|
97
|
+
if (observedMs - nowMs > USAGE_CLOCK_TOLERANCE_MS) {
|
|
98
|
+
return { freshness: "unavailable", freshnessReason: "observed in the future beyond the 60 s clock tolerance" };
|
|
99
|
+
}
|
|
100
|
+
if (failedAfter)
|
|
101
|
+
return { freshness: "stale", freshnessReason: `refresh failed at ${failedAfter.at}; this reading is older` };
|
|
102
|
+
if (nowMs - observedMs > USAGE_FRESH_FOR_MS) {
|
|
103
|
+
return { freshness: "stale", freshnessReason: `observed ${Math.round((nowMs - observedMs) / 60_000)} min ago (fresh for 15 min)` };
|
|
104
|
+
}
|
|
105
|
+
return { freshness: "fresh" };
|
|
106
|
+
}
|
|
107
|
+
/** Level of one window as of its observation. Absent data is never nearing or exhausted. */
|
|
108
|
+
export function usageLevel(window, limitEvidence, now) {
|
|
109
|
+
if (window.usedPercent === null)
|
|
110
|
+
return { level: "unknown", levelReason: "no usage reported for this window" };
|
|
111
|
+
const resetMs = window.resetsAt === null ? NaN : Date.parse(window.resetsAt);
|
|
112
|
+
const nowMs = Date.parse(now);
|
|
113
|
+
if (Number.isFinite(resetMs) && Number.isFinite(nowMs) && nowMs >= resetMs) {
|
|
114
|
+
return { level: "unknown", levelReason: `reset passed at ${window.resetsAt}; a new reading is needed` };
|
|
115
|
+
}
|
|
116
|
+
if (window.usedPercent >= 100)
|
|
117
|
+
return { level: "exhausted", levelReason: "at the limit" };
|
|
118
|
+
if (limitEvidence !== null)
|
|
119
|
+
return { level: "exhausted", levelReason: `provider limit evidence: ${limitEvidence}` };
|
|
120
|
+
if (window.usedPercent >= NEARING_THRESHOLD_PERCENT)
|
|
121
|
+
return { level: "nearing", levelReason: `${NEARING_THRESHOLD_PERCENT}% or more used` };
|
|
122
|
+
return { level: "ok" };
|
|
123
|
+
}
|
|
124
|
+
/** The replacement key of a resolved identity. Email is never part of it; an unresolved identity has none. */
|
|
125
|
+
const identityKey = (i) => i.accountId !== null ? `codex:account:${i.accountId}:${i.limitId}`
|
|
126
|
+
: i.workspaceId !== null ? `codex:workspace:${i.workspaceId}:${i.limitId}`
|
|
127
|
+
: null;
|
|
128
|
+
/** Unresolved observations can't be matched to earlier ones, so each read adds its own rows. Keep those
|
|
129
|
+
* from the most recent few reads: enough to compare the latest with the two before it, and bounded
|
|
130
|
+
* because nothing else ever removes them. */
|
|
131
|
+
export const UNRESOLVED_READS_KEPT = 3;
|
|
132
|
+
export class CodexUsageWindows {
|
|
133
|
+
deps;
|
|
134
|
+
now;
|
|
135
|
+
startedAt;
|
|
136
|
+
readings = new Map();
|
|
137
|
+
/** Unresolved observations, grouped by read, newest last; at most UNRESOLVED_READS_KEPT reads. */
|
|
138
|
+
unresolved = [];
|
|
139
|
+
unresolvedDropped = 0;
|
|
140
|
+
lastRefresh = null;
|
|
141
|
+
inflight = null;
|
|
142
|
+
constructor(deps) {
|
|
143
|
+
this.deps = deps;
|
|
144
|
+
this.now = deps.now ?? (() => new Date().toISOString());
|
|
145
|
+
this.startedAt = this.now();
|
|
146
|
+
}
|
|
147
|
+
/** One bounded read. A refresh asked for while one runs joins it; one asked for after it ends reads again. */
|
|
148
|
+
async refresh() {
|
|
149
|
+
if (this.inflight)
|
|
150
|
+
return { refresh: { ...(await this.inflight), coalesced: true } };
|
|
151
|
+
const run = this.runRead();
|
|
152
|
+
this.inflight = run;
|
|
153
|
+
try {
|
|
154
|
+
return { refresh: { ...(await run), coalesced: false } };
|
|
155
|
+
}
|
|
156
|
+
finally {
|
|
157
|
+
if (this.inflight === run)
|
|
158
|
+
this.inflight = null;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
async runRead() {
|
|
162
|
+
let outcome;
|
|
163
|
+
try {
|
|
164
|
+
outcome = await this.deps.read();
|
|
165
|
+
}
|
|
166
|
+
catch (error) {
|
|
167
|
+
outcome = { ok: false, at: this.now(), reason: "spawn_failed", detail: `the reader failed: ${error instanceof Error ? error.message : String(error)}` };
|
|
168
|
+
}
|
|
169
|
+
if (!outcome.ok)
|
|
170
|
+
return this.recordFailure(outcome.at, outcome.reason, outcome.detail);
|
|
171
|
+
const normalized = normalizeCodexUsage(outcome.account, outcome.rateLimits, outcome.observedAt);
|
|
172
|
+
if (!normalized.ok)
|
|
173
|
+
return this.recordFailure(outcome.observedAt, "unrecognized_shape", normalized.detail);
|
|
174
|
+
for (const reading of [...this.readings.values(), ...this.unresolved.flat()])
|
|
175
|
+
reading.latest = false;
|
|
176
|
+
const unresolvedNow = [];
|
|
177
|
+
for (const reading of normalized.readings) {
|
|
178
|
+
const key = identityKey(reading.identity);
|
|
179
|
+
if (key === null)
|
|
180
|
+
unresolvedNow.push({ ...reading, latest: true });
|
|
181
|
+
else
|
|
182
|
+
this.readings.set(key, { ...reading, latest: true });
|
|
183
|
+
}
|
|
184
|
+
if (unresolvedNow.length > 0) {
|
|
185
|
+
this.unresolved.push(unresolvedNow);
|
|
186
|
+
while (this.unresolved.length > UNRESOLVED_READS_KEPT) {
|
|
187
|
+
this.unresolved.shift();
|
|
188
|
+
this.unresolvedDropped += 1;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
this.lastRefresh = { at: outcome.observedAt, outcome: "ok" };
|
|
192
|
+
return this.lastRefresh;
|
|
193
|
+
}
|
|
194
|
+
recordFailure(at, reason, detail) {
|
|
195
|
+
this.lastRefresh = { at, outcome: "failed", reason, detail };
|
|
196
|
+
return this.lastRefresh;
|
|
197
|
+
}
|
|
198
|
+
/** The served rows. Reads memory only: it never starts a native read. */
|
|
199
|
+
project(now) {
|
|
200
|
+
const source = { kind: "codex_app_server", host: "local" };
|
|
201
|
+
const failure = this.lastRefresh?.outcome === "failed" ? this.lastRefresh : null;
|
|
202
|
+
if (this.readings.size === 0 && this.unresolved.length === 0) {
|
|
203
|
+
return [{
|
|
204
|
+
provider: "codex",
|
|
205
|
+
identity: null,
|
|
206
|
+
source,
|
|
207
|
+
observedAt: null,
|
|
208
|
+
seats: "unknown",
|
|
209
|
+
windows: [],
|
|
210
|
+
limitEvidence: null,
|
|
211
|
+
latestFromSource: false,
|
|
212
|
+
lastRefresh: this.lastRefresh,
|
|
213
|
+
currentAvailability: "unknown",
|
|
214
|
+
unavailableReason: failure
|
|
215
|
+
? `refresh failed at ${failure.at}: ${failure.reason}; no earlier reading since the daemon started at ${this.startedAt}`
|
|
216
|
+
: `no reading since the daemon started at ${this.startedAt}; refresh with rig provider status --refresh`,
|
|
217
|
+
}];
|
|
218
|
+
}
|
|
219
|
+
const rows = [];
|
|
220
|
+
const resolved = [...this.readings.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([, reading]) => reading);
|
|
221
|
+
const unresolvedRows = this.unresolved.flat();
|
|
222
|
+
for (const reading of [...resolved, ...unresolvedRows]) {
|
|
223
|
+
const failedAfter = failure && Date.parse(failure.at) >= Date.parse(reading.observedAt) ? failure : null;
|
|
224
|
+
const windows = reading.windows.map((w) => ({
|
|
225
|
+
window: w.window,
|
|
226
|
+
durationMins: w.durationMins,
|
|
227
|
+
usedPercent: w.usedPercent,
|
|
228
|
+
remainingPercent: w.usedPercent === null ? null : Math.max(0, 100 - w.usedPercent),
|
|
229
|
+
resetsAt: w.resetsAt,
|
|
230
|
+
observedAt: reading.observedAt,
|
|
231
|
+
...usageLevel(w, reading.limitEvidence, now),
|
|
232
|
+
...usageFreshness(reading.observedAt, now, failedAfter),
|
|
233
|
+
}));
|
|
234
|
+
const known = reading.latest && failedAfter === null && windows.length > 0
|
|
235
|
+
&& windows.every((w) => w.freshness === "fresh" && w.level !== "unknown");
|
|
236
|
+
rows.push({
|
|
237
|
+
provider: "codex",
|
|
238
|
+
identity: reading.identity,
|
|
239
|
+
source,
|
|
240
|
+
observedAt: reading.observedAt,
|
|
241
|
+
seats: "unknown",
|
|
242
|
+
windows,
|
|
243
|
+
limitEvidence: reading.limitEvidence,
|
|
244
|
+
latestFromSource: reading.latest,
|
|
245
|
+
lastRefresh: this.lastRefresh,
|
|
246
|
+
currentAvailability: known ? "known" : "unknown",
|
|
247
|
+
...(reading.identity.source === "unresolved" ? {
|
|
248
|
+
unresolved: {
|
|
249
|
+
note: "identity unresolved: not matched to, merged with or replacing any other row",
|
|
250
|
+
keptReads: UNRESOLVED_READS_KEPT,
|
|
251
|
+
droppedReads: this.unresolvedDropped,
|
|
252
|
+
},
|
|
253
|
+
} : {}),
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
return rows;
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
//# sourceMappingURL=codex-usage-windows.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-usage-windows.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-windows.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAChG,gGAAgG;AAChG,+FAA+F;AAC/F,mGAAmG;AACnG,0EAA0E;AAE1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AASnE,2GAA2G;AAC3G,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,GAAG,MAAM,CAAC;AAC9C,8FAA8F;AAC9F,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAgB/C,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoC,EAAE,CACpE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,MAAM,YAAY,GAAG,CAAC,KAAc,EAAiB,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEvH,SAAS,UAAU,CAAC,MAA+B,EAAE,GAAY;IAC/D,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7G,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;QAChF,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;QAC7C,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,YAAY,GAAG,OAAO,GAAG,CAAC,kBAAkB,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACxG,CAAC,CAAC,GAAG,CAAC,kBAAkB;QACxB,CAAC,CAAC,IAAI,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;AAC1E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAgB;IACrD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3E,OAAO,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAgB,EAAE,UAAmB,EAAE,UAAkB;IAE3F,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,wDAAwD,EAAE,CAAC;IAClH,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5E,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChF,MAAM,MAAM,GAAqC,SAAS,KAAK,IAAI;QACjE,CAAC,CAAC,mCAAmC;QACrC,CAAC,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,YAAY,CAAC;IAC3E,MAAM,OAAO,GAA6B,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAChF,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAChD,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;YAC/B,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;YACnF,CAAC,CAAC,EAAE,CAAC;IACT,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,wDAAwD,EAAE,CAAC;IACjH,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,OAAO,4BAA4B,EAAE,CAAC;QACrG,MAAM,OAAO,GAAiB,EAAE,CAAC;QACjC,KAAK,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,CAAU,EAAE,CAAC;YACpD,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,KAAK;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,OAAO,IAAI,GAAG,mCAAmC,EAAE,CAAC;YAC3G,IAAI,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE;gBACR,SAAS;gBACT,WAAW;gBACX,OAAO;gBACP,KAAK;gBACL,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,WAAW;gBACxD,MAAM;aACP;YACD,OAAO;YACP,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YAC1D,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,cAAc,CAAC,UAAkB,EAAE,GAAW,EAAE,WAAkC;IAEhG,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,6BAA6B,EAAE,CAAC;IACtF,CAAC;IACD,IAAI,UAAU,GAAG,KAAK,GAAG,wBAAwB,EAAE,CAAC;QAClD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,wDAAwD,EAAE,CAAC;IACjH,CAAC;IACD,IAAI,WAAW;QAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,qBAAqB,WAAW,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC9H,IAAI,KAAK,GAAG,UAAU,GAAG,kBAAkB,EAAE,CAAC;QAC5C,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,MAAM,CAAC,6BAA6B,EAAE,CAAC;IACrI,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAChC,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,UAAU,CAAC,MAAkB,EAAE,aAA4B,EAAE,GAAW;IAEtF,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,mCAAmC,EAAE,CAAC;IAC/G,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;QAC3E,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,mBAAmB,MAAM,CAAC,QAAQ,2BAA2B,EAAE,CAAC;IAC1G,CAAC;IACD,IAAI,MAAM,CAAC,WAAW,IAAI,GAAG;QAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;IAC1F,IAAI,aAAa,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,4BAA4B,aAAa,EAAE,EAAE,CAAC;IACpH,IAAI,MAAM,CAAC,WAAW,IAAI,yBAAyB;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,yBAAyB,gBAAgB,EAAE,CAAC;IAC5I,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,8GAA8G;AAC9G,MAAM,WAAW,GAAG,CAAC,CAAyB,EAAiB,EAAE,CAC/D,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,EAAE;IAChE,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,OAAO,EAAE;QACxE,CAAC,CAAC,IAAI,CAAC;AAEb;;8CAE8C;AAC9C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAWvC,MAAM,OAAO,iBAAiB;IAUC;IATZ,GAAG,CAAe;IAClB,SAAS,CAAS;IAClB,QAAQ,GAAG,IAAI,GAAG,EAAyC,CAAC;IAC7E,kGAAkG;IAC1F,UAAU,GAAgD,EAAE,CAAC;IAC7D,iBAAiB,GAAG,CAAC,CAAC;IACtB,WAAW,GAA+B,IAAI,CAAC;IAC/C,QAAQ,GAAwC,IAAI,CAAC;IAE7D,YAA6B,IAA2B;QAA3B,SAAI,GAAJ,IAAI,CAAuB;QACtD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED,8GAA8G;IAC9G,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;QACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3D,CAAC;gBAAS,CAAC;YACT,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG;gBAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAClD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,OAA8C,CAAC;QACnD,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,sBAAsB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAC1J,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAChG,IAAI,CAAC,UAAU,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,oBAAoB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAC3G,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAAE,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;QACrG,MAAM,aAAa,GAAyC,EAAE,CAAC;QAC/D,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,GAAG,KAAK,IAAI;gBAAE,aAAa,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;;gBAC9D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,qBAAqB,EAAE,CAAC;gBACtD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACxB,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEO,aAAa,CAAC,EAAU,EAAE,MAA+B,EAAE,MAAc;QAC/E,IAAI,CAAC,WAAW,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,yEAAyE;IACzE,OAAO,CAAC,GAAW;QACjB,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,EAAW,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACjF,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7D,OAAO,CAAC;oBACN,QAAQ,EAAE,OAAO;oBACjB,QAAQ,EAAE,IAAI;oBACd,MAAM;oBACN,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,SAAS;oBAChB,OAAO,EAAE,EAAE;oBACX,aAAa,EAAE,IAAI;oBACnB,gBAAgB,EAAE,KAAK;oBACvB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,mBAAmB,EAAE,SAAS;oBAC9B,iBAAiB,EAAE,OAAO;wBACxB,CAAC,CAAC,qBAAqB,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,MAAM,oDAAoD,IAAI,CAAC,SAAS,EAAE;wBACxH,CAAC,CAAC,0CAA0C,IAAI,CAAC,SAAS,8CAA8C;iBAC3G,CAAC,CAAC;QACL,CAAC;QACD,MAAM,IAAI,GAA6B,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;QACnH,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC9C,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,QAAQ,EAAE,GAAG,cAAc,CAAC,EAAE,CAAC;YACvD,MAAM,WAAW,GAAG,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YACzG,MAAM,OAAO,GAAqB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5D,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,YAAY,EAAE,CAAC,CAAC,YAAY;gBAC5B,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,gBAAgB,EAAE,CAAC,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC;gBAClF,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,GAAG,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;gBAC5C,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC;aACxD,CAAC,CAAC,CAAC;YACJ,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;mBACrE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,IAAI,CAAC;gBACR,QAAQ,EAAE,OAAO;gBACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM;gBACN,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,KAAK,EAAE,SAAS;gBAChB,OAAO;gBACP,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,gBAAgB,EAAE,OAAO,CAAC,MAAM;gBAChC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gBAChD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC;oBAC7C,UAAU,EAAE;wBACV,IAAI,EAAE,6EAA6E;wBACnF,SAAS,EAAE,qBAAqB;wBAChC,YAAY,EAAE,IAAI,CAAC,iBAAiB;qBACrC;iBACF,CAAC,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type Database from "better-sqlite3";
|
|
2
2
|
import { type AgentActivityStore } from "../agent-activity-store.js";
|
|
3
|
+
import type { CodexUsageWindows, UsageRefreshResult } from "./codex-usage-windows.js";
|
|
3
4
|
import type { ProviderService, ProviderPrecheckInput, ProviderSwitchInput, ProviderSwitchResult } from "./provider-service.js";
|
|
4
5
|
import type { FourBlockReadModel, PrecheckResult, ProviderSignal } from "./provider-types.js";
|
|
5
6
|
export interface ProviderServiceImplDeps {
|
|
@@ -16,11 +17,20 @@ export interface ProviderServiceImplDeps {
|
|
|
16
17
|
warn?: (message: string) => void;
|
|
17
18
|
env?: NodeJS.ProcessEnv;
|
|
18
19
|
now?: () => string;
|
|
20
|
+
/** Slice 01: Codex usage windows, served only while `enabled()` (provider.usage_windows) is true. */
|
|
21
|
+
usageWindows?: {
|
|
22
|
+
enabled: () => boolean;
|
|
23
|
+
windows: CodexUsageWindows;
|
|
24
|
+
};
|
|
19
25
|
}
|
|
20
26
|
export declare class ProviderServiceImpl implements ProviderService {
|
|
21
27
|
private readonly deps;
|
|
22
28
|
constructor(deps: ProviderServiceImplDeps);
|
|
23
29
|
getReadModel(): Promise<FourBlockReadModel>;
|
|
30
|
+
refreshUsage(_provider: "codex"): Promise<UsageRefreshResult | {
|
|
31
|
+
disabled: true;
|
|
32
|
+
}>;
|
|
33
|
+
private usageWindowsEnabled;
|
|
24
34
|
private listSeats;
|
|
25
35
|
precheck(input: ProviderPrecheckInput): Promise<PrecheckResult>;
|
|
26
36
|
switchAccount(input: ProviderSwitchInput): Promise<ProviderSwitchResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-service-impl.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/provider-service-impl.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE9F,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,2FAA2F;IAC3F,QAAQ,EAAE,MAAM,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtC,gGAAgG;IAChG,oBAAoB,CAAC,EAAE,MAAM,cAAc,EAAE,CAAC;IAC9C,sGAAsG;IACtG,kBAAkB,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IAClE,qGAAqG;IACrG,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-service-impl.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/provider-service-impl.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE9F,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,2FAA2F;IAC3F,QAAQ,EAAE,MAAM,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtC,gGAAgG;IAChG,oBAAoB,CAAC,EAAE,MAAM,cAAc,EAAE,CAAC;IAC9C,sGAAsG;IACtG,kBAAkB,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IAClE,qGAAqG;IACrG,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,qGAAqG;IACrG,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,OAAO,CAAC;QAAC,OAAO,EAAE,iBAAiB,CAAA;KAAE,CAAC;CACvE;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,uBAAuB;IAEpD,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IA2C3C,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,GAAG;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,CAAC;IAKxF,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,SAAS;IAgBX,QAAQ,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC;IAc/D,aAAa,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAW/E"}
|
|
@@ -37,7 +37,7 @@ export class ProviderServiceImpl {
|
|
|
37
37
|
}
|
|
38
38
|
return result.signals;
|
|
39
39
|
};
|
|
40
|
-
|
|
40
|
+
const model = collectFourBlockReadModel({
|
|
41
41
|
readCodexAuth: readAuth,
|
|
42
42
|
listSeats,
|
|
43
43
|
collectSignals: () => [
|
|
@@ -46,6 +46,32 @@ export class ProviderServiceImpl {
|
|
|
46
46
|
],
|
|
47
47
|
now: () => asOf,
|
|
48
48
|
});
|
|
49
|
+
// Slice 01: memory only. A read never starts a native probe (the wake ladder reads this every tick).
|
|
50
|
+
const usage = this.usageWindowsEnabled() ? this.deps.usageWindows.windows.project(asOf) : null;
|
|
51
|
+
if (!usage)
|
|
52
|
+
return model;
|
|
53
|
+
// The read covers only the login active in the daemon's CODEX_HOME: say so whenever saved rig auth
|
|
54
|
+
// profiles exist, so a profile without a row never reads as fine.
|
|
55
|
+
const profiles = model.accounts.filter((a) => a.provider === "codex").map((a) => a.accountId);
|
|
56
|
+
const savedProfiles = profiles.length > 0
|
|
57
|
+
? { names: profiles, note: "saved rig auth profiles: not read (usage unknown); this reading is only the login active in the daemon's CODEX_HOME" }
|
|
58
|
+
: null;
|
|
59
|
+
return { ...model, usage: savedProfiles ? usage.map((row) => ({ ...row, savedProfiles })) : usage };
|
|
60
|
+
}
|
|
61
|
+
async refreshUsage(_provider) {
|
|
62
|
+
if (!this.usageWindowsEnabled())
|
|
63
|
+
return { disabled: true };
|
|
64
|
+
return this.deps.usageWindows.windows.refresh();
|
|
65
|
+
}
|
|
66
|
+
usageWindowsEnabled() {
|
|
67
|
+
if (!this.deps.usageWindows)
|
|
68
|
+
return false;
|
|
69
|
+
try {
|
|
70
|
+
return this.deps.usageWindows.enabled();
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
49
75
|
}
|
|
50
76
|
listSeats() {
|
|
51
77
|
const seats = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-service-impl.js","sourceRoot":"","sources":["../../../src/domain/provider/provider-service-impl.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,gGAAgG;AAChG,iGAAiG;AACjG,kGAAkG;AAClG,oGAAoG;AAGpG,OAAO,EACL,2BAA2B,GAE5B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAA0B,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,yBAAyB,EAAqB,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-service-impl.js","sourceRoot":"","sources":["../../../src/domain/provider/provider-service-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { FourBlockReadModel, PrecheckResult } from "./provider-types.js";
|
|
2
|
+
import type { UsageRefreshResult } from "./codex-usage-windows.js";
|
|
2
3
|
export interface ProviderPrecheckInput {
|
|
3
4
|
seat: string;
|
|
4
5
|
toAccount: string;
|
|
@@ -29,5 +30,9 @@ export interface ProviderService {
|
|
|
29
30
|
precheck(input: ProviderPrecheckInput): Promise<PrecheckResult>;
|
|
30
31
|
/** Precheck-gated switch; returns an explicit business outcome (never a transport error). */
|
|
31
32
|
switchAccount(input: ProviderSwitchInput): Promise<ProviderSwitchResult>;
|
|
33
|
+
/** Slice 01: one bounded native read of the usage windows (coalesced); `disabled` while the switch is off. */
|
|
34
|
+
refreshUsage?(provider: "codex"): Promise<UsageRefreshResult | {
|
|
35
|
+
disabled: true;
|
|
36
|
+
}>;
|
|
32
37
|
}
|
|
33
38
|
//# sourceMappingURL=provider-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-service.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/provider-service.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-service.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/provider-service.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAC5B;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,oBAAoB,CAAA;CAAE,GACjC;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,wFAAwF;IACxF,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC5C,kGAAkG;IAClG,QAAQ,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,6FAA6F;IAC7F,aAAa,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACzE,8GAA8G;IAC9G,YAAY,CAAC,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,GAAG;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;CACpF"}
|