codex-lb 0.2.0__tar.gz → 0.3.1__tar.gz

codex_lb-0.3.1/.all-contributorsrc

@@ -0,0 +1,52 @@
+{
+  "projectName": "codex-lb",
+  "projectOwner": "Soju06",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "Soju06",
+      "name": "Soju06",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34199905?v=4",
+      "profile": "https://github.com/Soju06",
+      "contributions": [
+        "code",
+        "test",
+        "maintenance",
+        "infra"
+      ]
+    },
+    {
+      "login": "JKamsker",
+      "name": "Jonas Kamsker",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11245306?v=4",
+      "profile": "http://jonas.kamsker.at/",
+      "contributions": [
+        "code",
+        "bug",
+        "maintenance"
+      ]
+    },
+    {
+      "login": "Quack6765",
+      "name": "Quack",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5446230?v=4",
+      "profile": "https://github.com/Quack6765",
+      "contributions": [
+        "code",
+        "bug",
+        "maintenance",
+        "design"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "linkToUsage": false,
+  "commitType": "docs"
+}

codex_lb-0.3.1/.github/release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.3.1"
+}

{codex_lb-0.2.0 → codex_lb-0.3.1}/.gitignore

@@ -34,4 +34,5 @@ node_modules/
 # Local
 .local/
 
-app/static/components
+app/static/components
+.codex-lb/

codex_lb-0.3.1/CHANGELOG.md

@@ -0,0 +1,110 @@
+# Changelog
+
+## [0.3.1](https://github.com/Soju06/codex-lb/compare/v0.3.0...v0.3.1) (2026-01-22)
+
+
+### Documentation
+
+* add Quack6765 as a contributor for design ([7a5ec08](https://github.com/Soju06/codex-lb/commit/7a5ec084b9a8d32c844127739f826a5f83bf1440))
+* update .all-contributorsrc ([14ea9da](https://github.com/Soju06/codex-lb/commit/14ea9da361a978a56c4d1f7facefe789193c7b91))
+* update README.md ([f283d60](https://github.com/Soju06/codex-lb/commit/f283d60ae359585cd128a965ca6fba2a14249a11))
+
+## [0.3.0](https://github.com/Soju06/codex-lb/compare/v0.2.0...v0.3.0) (2026-01-21)
+
+
+### Features
+
+* add cached input tokens handling and update related metrics in … ([5bf6609](https://github.com/Soju06/codex-lb/commit/5bf66095b8000ffc8fbdf8d989f60171604f69d3))
+* add cached input tokens handling and update related metrics in logs and usage schemas ([c965036](https://github.com/Soju06/codex-lb/commit/c9650367c1a2d14e63e3440788b7cd44b08ebd9a))
+* add formatting for cached input tokens metadata in metrics display ([53feaa6](https://github.com/Soju06/codex-lb/commit/53feaa62f7c5c282508f37c3fd42d9af655c2fa9))
+* add secondary usage tracking and selection logic for accounts in load balancer ([d66cf69](https://github.com/Soju06/codex-lb/commit/d66cf69b2834b42fefbbfa646d82477f9832fdda))
+* add ty type checking and refactors ([41fa811](https://github.com/Soju06/codex-lb/commit/41fa8112ba9b900ffa5dbee3a39d94267e2caa75))
+* **app:** add migrations and reasoning effort support ([9eae590](https://github.com/Soju06/codex-lb/commit/9eae5903a08363291e397f983a531ddf325658d7))
+* implement dashboard settings for sticky threads and reset preferences ([cd04812](https://github.com/Soju06/codex-lb/commit/cd0481247f0ceffdd92173ea84773960e52a7253))
+
+
+### Bug Fixes
+
+* **app:** tune sqlite pragmas and usage UI ([a44a4fd](https://github.com/Soju06/codex-lb/commit/a44a4fd6fe5771282a12ee62a34c9be819254322))
+* **app:** update effort display format in history ([0796740](https://github.com/Soju06/codex-lb/commit/0796740ab570cf476b2285a615559a9a6318082f))
+* **app:** update effort display format to include parentheses ([6fbae96](https://github.com/Soju06/codex-lb/commit/6fbae960f393ff92cae0feb614ca0e811a855851))
+* **dashboard:** fallback primary remaining to summary ([02b3d39](https://github.com/Soju06/codex-lb/commit/02b3d39c2b734271af7c420fc52b7e87350177e1))
+* **db:** avoid leaked async connection in migration ([9aa1d03](https://github.com/Soju06/codex-lb/commit/9aa1d0395481a96a21db2d0add18ee1753f183b2))
+* **db:** use returning for dml checks ([4ec7c7a](https://github.com/Soju06/codex-lb/commit/4ec7c7a6615e6e5852b0865e09184544f09ebedc))
+* **ui:** style and label settings checkboxes ([722cad8](https://github.com/Soju06/codex-lb/commit/722cad851706e2784815dad4069902cc95b3f662))
+
+
+### Documentation
+
+* expand 0.2.0 changelog ([32148dc](https://github.com/Soju06/codex-lb/commit/32148dc2d195cec0dd85f61fc0a13d8cbef24e24))
+
+## [0.2.0](https://github.com/Soju06/codex-lb/compare/v0.1.5...v0.2.0) (2026-01-19)
+
+
+### Features
+
+* add ty type checking and pre-commit hook
+* add health response schema and typed context cleanup
+
+
+### Bug Fixes
+
+* normalize stored plan types (pro/team/business/enterprise/edu) so accounts no longer show as unknown
+* prevent rate-limit status when usage is below 100% by using cooldown/backoff and primary-window quota checks
+* surface per-account quota reset times by applying primary/secondary reset windows with fallbacks
+
+
+### Refactor
+
+* move auth/usage helpers into module boundaries and extract proxy helpers
+* tighten typing across services and tests
+
+## [0.1.5](https://github.com/Soju06/codex-lb/compare/v0.1.4...v0.1.5) (2026-01-14)
+
+
+### Bug Fixes
+
+* align rate-limit backoff and reset handling ([4d59650](https://github.com/Soju06/codex-lb/commit/4d596508e5ad13e68aa6e64f9cb32324bd38f07b))
+
+## [0.1.4](https://github.com/Soju06/codex-lb/compare/v0.1.3...v0.1.4) (2026-01-13)
+
+
+### Bug Fixes
+
+* **db:** harden session cleanup on cancellation ([dee3916](https://github.com/Soju06/codex-lb/commit/dee3916efa83dedec1d5ad43e1e14950b8c6e4a7))
+
+## [0.1.3](https://github.com/Soju06/codex-lb/compare/v0.1.2...v0.1.3) (2026-01-12)
+
+
+### Documentation
+
+* use absolute image URLs for PyPI ([5fa65a5](https://github.com/Soju06/codex-lb/commit/5fa65a572980f356738f49be3adf2c62fdc38466))
+
+## [0.1.2](https://github.com/Soju06/codex-lb/compare/v0.1.1...v0.1.2) (2026-01-12)
+
+
+### Bug Fixes
+
+* sync package __version__ ([3dd97e6](https://github.com/Soju06/codex-lb/commit/3dd97e6397a8ea9d3528c166d1e729936f98f737))
+
+## [0.1.1](https://github.com/Soju06/codex-lb/compare/v0.1.0...v0.1.1) (2026-01-12)
+
+
+### Bug Fixes
+
+* address lint warnings ([7c3cc06](https://github.com/Soju06/codex-lb/commit/7c3cc06c9a6a9a9a8895c1dd5fcc57b3c0eebdb3))
+* reactivate accounts when secondary quota clears ([58a4263](https://github.com/Soju06/codex-lb/commit/58a42630d644559f96f045a96c25d0126810542e))
+* skip project install in docker build ([64e9156](https://github.com/Soju06/codex-lb/commit/64e9156075c256ef48c0587ea1abb7cc092b97a5))
+
+
+### Documentation
+
+* add dashboard hero and accounts view ([3522654](https://github.com/Soju06/codex-lb/commit/3522654fe5d09adbe32895d4b24e8b00faac9dfe))
+
+## [0.1.0](https://github.com/Soju06/codex-lb/releases/tag/v0.1.0) (2026-01-07)
+
+
+### Bug Fixes
+
+* address lint warnings ([7c3cc06](https://github.com/Soju06/codex-lb/commit/7c3cc06c9a6a9a8895c1dd5fcc57b3c0eebdb3))
+* skip project install in docker build ([64e9156](https://github.com/Soju06/codex-lb/commit/64e9156075c256ef48c0587ea1abb7cc092b97a5))

{codex_lb-0.2.0 → codex_lb-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-lb
-Version: 0.2.0
+Version: 0.3.1
 Summary: Codex load balancer and proxy for ChatGPT accounts with usage dashboard
 Author-email: Soju06 <qlskssk@gmail.com>
 Maintainer-email: Soju06 <qlskssk@gmail.com>
@@ -39,7 +39,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: System :: Networking
 Requires-Python: >=3.13
 Requires-Dist: aiohttp-retry>=2.9.1
-Requires-Dist: aiohttp>=3.13.2
+Requires-Dist: aiohttp>=3.13.3
 Requires-Dist: aiosqlite>=0.22.1
 Requires-Dist: cryptography>=46.0.3
 Requires-Dist: fastapi[standard]>=0.128.0
@@ -55,9 +55,13 @@ Description-Content-Type: text/markdown
 
 Load balancer for ChatGPT accounts. Pool multiple accounts, track usage, view everything in a dashboard.
 
-<p align="center">
-  <img src="https://raw.githubusercontent.com/Soju06/codex-lb/main/docs/screenshots/dashboard.jpeg" alt="Codex Load Balancer dashboard" width="100%">
-</p>
+### Main Dashboard View
+
+![main dashboard view](docs/screenshots/dashboard.jpg)
+
+### Accounts View
+
+![Accounts list and details](docs/screenshots/accounts.jpg)
 
 ## Quick Start
 
@@ -78,9 +82,7 @@ uvx codex-lb
 
 Open [localhost:2455](http://localhost:2455) → Add account → Done.
 
-## Accounts view
 
-![Accounts list and details](https://raw.githubusercontent.com/Soju06/codex-lb/main/docs/screenshots/accounts.jpeg)
 
 ## Codex CLI & Extension Setup
 
@@ -102,7 +104,31 @@ requires_openai_auth = true  # Required: enables model selection in Codex IDE ex
 ## Data
 
 All data stored in `~/.codex-lb/`:
+
 - `store.db` – accounts, usage logs
 - `encryption.key` – encrypts tokens (auto-generated)
 
 Backup this directory to preserve your accounts.
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Soju06"><img src="https://avatars.githubusercontent.com/u/34199905?v=4?s=100" width="100px;" alt="Soju06"/><br /><sub><b>Soju06</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=Soju06" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/commits?author=Soju06" title="Tests">⚠️</a> <a href="#maintenance-Soju06" title="Maintenance">🚧</a> <a href="#infra-Soju06" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://jonas.kamsker.at/"><img src="https://avatars.githubusercontent.com/u/11245306?v=4?s=100" width="100px;" alt="Jonas Kamsker"/><br /><sub><b>Jonas Kamsker</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=JKamsker" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/issues?q=author%3AJKamsker" title="Bug reports">🐛</a> <a href="#maintenance-JKamsker" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Quack6765"><img src="https://avatars.githubusercontent.com/u/5446230?v=4?s=100" width="100px;" alt="Quack"/><br /><sub><b>Quack</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=Quack6765" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/issues?q=author%3AQuack6765" title="Bug reports">🐛</a> <a href="#maintenance-Quack6765" title="Maintenance">🚧</a> <a href="#design-Quack6765" title="Design">🎨</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

codex_lb-0.3.1/README.md

@@ -0,0 +1,81 @@
+# codex-lb
+
+Load balancer for ChatGPT accounts. Pool multiple accounts, track usage, view everything in a dashboard.
+
+### Main Dashboard View
+
+![main dashboard view](docs/screenshots/dashboard.jpg)
+
+### Accounts View
+
+![Accounts list and details](docs/screenshots/accounts.jpg)
+
+## Quick Start
+
+### Docker
+
+```bash
+docker run -d --name codex-lb \
+  -p 2455:2455 -p 1455:1455 \
+  -v ~/.codex-lb:/var/lib/codex-lb \
+  ghcr.io/soju06/codex-lb:latest
+```
+
+### uvx
+
+```bash
+uvx codex-lb
+```
+
+Open [localhost:2455](http://localhost:2455) → Add account → Done.
+
+
+
+## Codex CLI & Extension Setup
+
+Add to `~/.codex/config.toml`:
+
+```toml
+model = "gpt-5.2-codex"
+model_reasoning_effort = "xhigh"
+model_provider = "codex-lb"
+
+[model_providers.codex-lb]
+name = "OpenAI"  # MUST be "OpenAI" - enables /compact endpoint
+base_url = "http://127.0.0.1:2455/backend-api/codex"
+wire_api = "responses"
+chatgpt_base_url = "http://127.0.0.1:2455"
+requires_openai_auth = true  # Required: enables model selection in Codex IDE extension
+```
+
+## Data
+
+All data stored in `~/.codex-lb/`:
+
+- `store.db` – accounts, usage logs
+- `encryption.key` – encrypts tokens (auto-generated)
+
+Backup this directory to preserve your accounts.
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Soju06"><img src="https://avatars.githubusercontent.com/u/34199905?v=4?s=100" width="100px;" alt="Soju06"/><br /><sub><b>Soju06</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=Soju06" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/commits?author=Soju06" title="Tests">⚠️</a> <a href="#maintenance-Soju06" title="Maintenance">🚧</a> <a href="#infra-Soju06" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://jonas.kamsker.at/"><img src="https://avatars.githubusercontent.com/u/11245306?v=4?s=100" width="100px;" alt="Jonas Kamsker"/><br /><sub><b>Jonas Kamsker</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=JKamsker" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/issues?q=author%3AJKamsker" title="Bug reports">🐛</a> <a href="#maintenance-JKamsker" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Quack6765"><img src="https://avatars.githubusercontent.com/u/5446230?v=4?s=100" width="100px;" alt="Quack"/><br /><sub><b>Quack</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=Quack6765" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/issues?q=author%3AQuack6765" title="Bug reports">🐛</a> <a href="#maintenance-Quack6765" title="Maintenance">🚧</a> <a href="#design-Quack6765" title="Design">🎨</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/auth/__init__.py

@@ -90,7 +90,17 @@ def claims_from_auth(auth: AuthFile) -> AccountClaims:
     )
 
 
+def generate_unique_account_id(account_id: str | None, email: str | None) -> str:
+    if account_id and email and email != DEFAULT_EMAIL:
+        email_hash = hashlib.sha256(email.encode()).hexdigest()[:8]
+        return f"{account_id}_{email_hash}"
+    if account_id:
+        return account_id
+    return fallback_account_id(email)
+
+
 def fallback_account_id(email: str | None) -> str:
+    """Generate a fallback account ID when no OpenAI account ID is available."""
     if email and email != DEFAULT_EMAIL:
         digest = hashlib.sha256(email.encode()).hexdigest()[:12]
         return f"email_{digest}"

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/balancer/logic.py

@@ -16,6 +16,9 @@ PERMANENT_FAILURE_CODES = {
     "account_deleted": "Account has been deleted",
 }
 
+SECONDS_PER_DAY = 60 * 60 * 24
+UNKNOWN_RESET_BUCKET_DAYS = 10_000
+
 
 @dataclass
 class AccountState:
@@ -24,6 +27,8 @@ class AccountState:
     used_percent: float | None = None
     reset_at: float | None = None
     cooldown_until: float | None = None
+    secondary_used_percent: float | None = None
+    secondary_reset_at: int | None = None
     last_error_at: float | None = None
     last_selected_at: float | None = None
     error_count: int = 0
@@ -36,7 +41,12 @@ class SelectionResult:
     error_message: str | None
 
 
-def select_account(states: Iterable[AccountState], now: float | None = None) -> SelectionResult:
+def select_account(
+    states: Iterable[AccountState],
+    now: float | None = None,
+    *,
+    prefer_earlier_reset: bool = False,
+) -> SelectionResult:
     current = now or time.time()
     available: list[AccountState] = []
     all_states = list(states)
@@ -95,18 +105,35 @@ def select_account(states: Iterable[AccountState], now: float | None = None) ->
             return SelectionResult(None, f"Rate limit exceeded. Try again in {wait_seconds:.0f}s")
         return SelectionResult(None, "No available accounts")
 
-    def _sort_key(state: AccountState) -> tuple[float, float, str]:
-        used = state.used_percent if state.used_percent is not None else 0.0
+    def _usage_sort_key(state: AccountState) -> tuple[float, float, float, str]:
+        primary_used = state.used_percent if state.used_percent is not None else 0.0
+        secondary_used = state.secondary_used_percent if state.secondary_used_percent is not None else primary_used
         last_selected = state.last_selected_at or 0.0
-        return used, last_selected, state.account_id
-
-    selected = min(available, key=_sort_key)
+        return secondary_used, primary_used, last_selected, state.account_id
+
+    def _reset_first_sort_key(state: AccountState) -> tuple[int, float, float, float, str]:
+        reset_bucket_days = UNKNOWN_RESET_BUCKET_DAYS
+        if state.secondary_reset_at is not None:
+            reset_bucket_days = max(
+                0,
+                int((state.secondary_reset_at - current) // SECONDS_PER_DAY),
+            )
+        secondary_used, primary_used, last_selected, account_id = _usage_sort_key(state)
+        return reset_bucket_days, secondary_used, primary_used, last_selected, account_id
+
+    selected = min(available, key=_reset_first_sort_key if prefer_earlier_reset else _usage_sort_key)
     return SelectionResult(selected, None)
 
 
 def handle_rate_limit(state: AccountState, error: UpstreamError) -> None:
+    state.status = AccountStatus.RATE_LIMITED
     state.error_count += 1
     state.last_error_at = time.time()
+
+    reset_at = _extract_reset_at(error)
+    if reset_at is not None:
+        state.reset_at = reset_at
+
     message = error.get("message")
     delay = parse_retry_after(message) if message else None
     if delay is None:

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/config/settings.py

@@ -40,6 +40,8 @@ class Settings(BaseSettings):
     usage_refresh_interval_seconds: int = 60
     encryption_key_file: Path = DEFAULT_ENCRYPTION_KEY_FILE
     database_migrations_fail_fast: bool = True
+    log_proxy_request_shape: bool = False
+    log_proxy_request_shape_raw_cache_key: bool = False
 
     @field_validator("database_url")
     @classmethod

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/usage/__init__.py

@@ -17,12 +17,14 @@ from app.db.models import Account
 PLAN_CAPACITY_CREDITS_PRIMARY = {
     "plus": 225.0,
     "business": 225.0,
+    "team": 225.0,
     "pro": 1500.0,
 }
 
 PLAN_CAPACITY_CREDITS_SECONDARY = {
     "plus": 7560.0,
     "business": 7560.0,
+    "team": 7560.0,
     "pro": 50400.0,
 }
 

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/usage/logs.py

@@ -13,6 +13,17 @@ class RequestLogLike(Protocol):
     reasoning_tokens: int | None
 
 
+def cached_input_tokens_from_log(log: RequestLogLike) -> int | None:
+    cached_tokens = log.cached_input_tokens
+    if cached_tokens is None:
+        return None
+    cached_tokens = max(0, int(cached_tokens))
+    input_tokens = log.input_tokens
+    if input_tokens is not None:
+        cached_tokens = min(cached_tokens, int(input_tokens))
+    return cached_tokens
+
+
 def usage_tokens_from_log(log: RequestLogLike) -> UsageTokens | None:
     input_tokens = log.input_tokens
     if input_tokens is None:
@@ -20,8 +31,7 @@ def usage_tokens_from_log(log: RequestLogLike) -> UsageTokens | None:
     output_tokens = log.output_tokens if log.output_tokens is not None else log.reasoning_tokens
     if output_tokens is None:
         return None
-    cached_tokens = log.cached_input_tokens or 0
-    cached_tokens = max(0, min(cached_tokens, input_tokens))
+    cached_tokens = cached_input_tokens_from_log(log) or 0
     return UsageTokens(
         input_tokens=float(input_tokens),
         output_tokens=float(output_tokens),

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/usage/quota.py

@@ -30,8 +30,11 @@ def apply_usage_quota(
                 reset_at = secondary_reset
             return status, used_percent, reset_at
         if status == AccountStatus.QUOTA_EXCEEDED:
-            status = AccountStatus.ACTIVE
-            reset_at = None
+            if runtime_reset and runtime_reset > time.time():
+                reset_at = runtime_reset
+            else:
+                status = AccountStatus.ACTIVE
+                reset_at = None
     elif status == AccountStatus.QUOTA_EXCEEDED and secondary_reset is not None:
         reset_at = secondary_reset
 
@@ -45,8 +48,11 @@ def apply_usage_quota(
                 reset_at = _fallback_primary_reset(primary_window_minutes) or reset_at
             return status, used_percent, reset_at
         if status == AccountStatus.RATE_LIMITED:
-            status = AccountStatus.ACTIVE
-            reset_at = None
+            if runtime_reset and runtime_reset > time.time():
+                reset_at = runtime_reset
+            else:
+                status = AccountStatus.ACTIVE
+                reset_at = None
 
     return status, used_percent, reset_at
 

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/core/usage/types.py

@@ -67,8 +67,9 @@ class UsageCostSummary:
 class UsageMetricsSummary:
     requests_7d: int | None
     tokens_secondary_window: int | None
-    error_rate_7d: float | None
-    top_error: str | None
+    cached_tokens_secondary_window: int | None = None
+    error_rate_7d: float | None = None
+    top_error: str | None = None
 
 
 @dataclass(frozen=True)

{codex_lb-0.2.0 → codex_lb-0.3.1}/app/db/migrations/__init__.py

@@ -8,7 +8,13 @@ from typing import Awaitable, Callable, Final
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.db.migrations.versions import normalize_account_plan_types
+from app.db.migrations.versions import (
+    add_accounts_chatgpt_account_id,
+    add_accounts_reset_at,
+    add_dashboard_settings,
+    add_request_logs_reasoning_effort,
+    normalize_account_plan_types,
+)
 
 _CREATE_MIGRATIONS_TABLE = """
 CREATE TABLE IF NOT EXISTS schema_migrations (
@@ -21,6 +27,7 @@ _INSERT_MIGRATION = """
 INSERT INTO schema_migrations (name, applied_at)
 VALUES (:name, :applied_at)
 ON CONFLICT(name) DO NOTHING
+RETURNING name
 """
 
 
@@ -32,6 +39,10 @@ class Migration:
 
 MIGRATIONS: Final[tuple[Migration, ...]] = (
     Migration("001_normalize_account_plan_types", normalize_account_plan_types.run),
+    Migration("002_add_request_logs_reasoning_effort", add_request_logs_reasoning_effort.run),
+    Migration("003_add_accounts_reset_at", add_accounts_reset_at.run),
+    Migration("004_add_accounts_chatgpt_account_id", add_accounts_chatgpt_account_id.run),
+    Migration("005_add_dashboard_settings", add_dashboard_settings.run),
 )
 
 
@@ -54,8 +65,8 @@ async def _apply_migration(session: AsyncSession, migration: Migration) -> bool:
                 "applied_at": _utcnow_iso(),
             },
         )
-        rowcount = getattr(result, "rowcount", 0) or 0
-        if not rowcount:
+        inserted = result.scalar_one_or_none()
+        if inserted is None:
             return False
         await migration.run(session)
     return True

codex_lb-0.3.1/app/db/migrations/versions/add_accounts_chatgpt_account_id.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from sqlalchemy import text
+from sqlalchemy.ext.asyncio import AsyncSession
+
+
+async def run(session: AsyncSession) -> None:
+    bind = session.get_bind()
+    dialect = getattr(getattr(bind, "dialect", None), "name", None)
+    if dialect == "sqlite":
+        await _sqlite_add_column_if_missing(session, "accounts", "chatgpt_account_id", "VARCHAR")
+    elif dialect == "postgresql":
+        await session.execute(
+            text("ALTER TABLE accounts ADD COLUMN IF NOT EXISTS chatgpt_account_id VARCHAR"),
+        )
+
+
+async def _sqlite_add_column_if_missing(
+    session: AsyncSession,
+    table: str,
+    column: str,
+    column_type: str,
+) -> None:
+    result = await session.execute(text(f"PRAGMA table_info({table})"))
+    rows = result.fetchall()
+    existing = {row[1] for row in rows if len(row) > 1}
+    if column in existing:
+        return
+    await session.execute(text(f"ALTER TABLE {table} ADD COLUMN {column} {column_type}"))

codex_lb-0.3.1/app/db/migrations/versions/add_accounts_reset_at.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from sqlalchemy import text
+from sqlalchemy.ext.asyncio import AsyncSession
+
+
+async def run(session: AsyncSession) -> None:
+    bind = session.get_bind()
+    dialect = getattr(getattr(bind, "dialect", None), "name", None)
+    if dialect == "sqlite":
+        await _sqlite_add_column_if_missing(session, "accounts", "reset_at", "INTEGER")
+    elif dialect == "postgresql":
+        await session.execute(
+            text("ALTER TABLE accounts ADD COLUMN IF NOT EXISTS reset_at INTEGER"),
+        )
+
+
+async def _sqlite_add_column_if_missing(
+    session: AsyncSession,
+    table: str,
+    column: str,
+    column_type: str,
+) -> None:
+    result = await session.execute(text(f"PRAGMA table_info({table})"))
+    rows = result.fetchall()
+    existing = {row[1] for row in rows if len(row) > 1}
+    if column in existing:
+        return
+    await session.execute(text(f"ALTER TABLE {table} ADD COLUMN {column} {column_type}"))

codex_lb-0.3.1/app/db/migrations/versions/add_dashboard_settings.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from sqlalchemy import inspect
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import Session
+
+from app.db.models import DashboardSettings
+
+
+def _settings_table_exists(session: Session) -> bool:
+    inspector = inspect(session.connection())
+    return inspector.has_table("dashboard_settings")
+
+
+async def run(session: AsyncSession) -> None:
+    exists = await session.run_sync(_settings_table_exists)
+    if not exists:
+        return
+
+    row = await session.get(DashboardSettings, 1)
+    if row is not None:
+        return
+
+    session.add(
+        DashboardSettings(
+            id=1,
+            sticky_threads_enabled=False,
+            prefer_earlier_reset_accounts=False,
+        )
+    )
+    await session.flush()