Skip to content

Bound usage.jsonl growth with a size cap and single-archive rotation - #5305

Closed
luvs01 wants to merge 1 commit into
lidge-jun:devfrom
luvs01:fix/usage-log-bounds
Closed

luvs01 wants to merge 1 commit into
lidge-jun:devfrom
luvs01:fix/usage-log-bounds

Conversation

@luvs01

@luvs01 luvs01 commented Sep 20, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • usage.jsonl grew without bound. appendUsageEntry now refuses single rows over 64 KiB and rotates the active ledger to a lone usage.jsonl.1 archive once the next append would exceed 64 MiB, bounding the on-disk footprint to roughly twice the cap.
  • A pre-existing log already over the cap is discarded instead of being preserved as the archive.
  • usage.jsonl.1 is registered in INITIAL_OWNED_PATHS and ensureUsageLogDir so config ownership and uninstall track the archive.

Verification

  • bun test tests/usage/usage-log.test.ts tests/config/config-ownership-uninstall.test.ts — 56 pass, 1 pre-existing platform skip.
  • bun x tsc --noEmit — clean.

Checklist

  • Scope stays focused and avoids unrelated cleanup.
  • Docs or release notes were updated when needed.
  • Security-sensitive changes were reviewed for secrets, auth, and unsafe defaults.

Summary by CodeRabbit

  • Bug Fixes
    • Usage logs are now capped at 64 MiB and automatically rotated to prevent unbounded disk growth.
    • Oversized usage entries are rejected, and oversized legacy logs are removed instead of archived.
    • Rotated logs are securely stored and included in uninstall cleanup.

Review readiness checklist

This PR stays in draft until every box below is ticked. Tick all four boxes once the requirements are met:

  • All CI tests are green on my local testing.

  • I pushed my PR to the latest dev commit.

  • I resolved all correct Codex and CodeRabbit findings.

  • My PR is ready for review.

@coderabbitai

coderabbitai Bot commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

Review Change StackReview Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: lidge-jun/opencodex/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: f310b557-22df-48be-a084-44172b038a02

📥 Commits

Reviewing files that changed from the base of the PR and between 53725b0 and fa7f53f.

📒 Files selected for processing (3)
  • src/lib/config-ownership.ts
  • src/usage/log.ts
  • tests/usage/usage-log.test.ts

Included review availability: Your plan provides up to 10 included reviews per hour; 4 remain after this review.


📝 Walkthrough

Walkthrough

The usage log now enforces entry and file-size limits. Full logs rotate to a single .1 archive, oversized legacy logs are deleted, and the archive is included in ownership cleanup. Tests cover rotation and oversized entries.

Changes

Usage log storage

Layer / File(s) Summary
Bounded log rotation and ownership
src/usage/log.ts, src/lib/config-ownership.ts
The log rejects entries larger than 64 KiB, rotates logs before they exceed 64 MiB, removes existing archives, deletes oversized legacy logs, applies 0600 permissions, and registers usage.jsonl.1 for cleanup.
Rotation and size-limit validation
tests/usage/usage-log.test.ts
Tests verify that a full log rotates to path.1 and that an oversized row is not persisted.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 5 functions across 3 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: limiting usage.jsonl growth with a size cap and single-archive rotation.
  • Fix all pre-merge checks with AI
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown
Contributor

Deterministic PR hygiene checks passed.

@lidge-jun

Copy link
Copy Markdown
Owner

리뷰 · 우선순위 64 / 80

이 PR은 usage.jsonl이 디스크에서 끝없이 커지는 문제를 막는다. 베이스는 dev, 헤드 SHA는 fa7f53fee, 브랜치는 fix/usage-log-bounds다. 바뀌는 파일은 src/usage/log.ts, src/lib/config-ownership.ts, tests/usage/usage-log.test.ts 세 개뿐이다. types/config 분할과 겹치지 않고, 중복·무효화로 닫을 다른 tip도 아니다.

지금 동작은 이렇게 바뀐다. appendUsageEntry가 한 줄(JSON+개행)을 쓸 때, 그 줄이 64 KiB를 넘으면 그냥 쓰지 않고 돌아간다. 파일이 이미 있고, 지금 크기 + 이번 줄 크기가 64 MiB를 넘으면 먼저 기존 usage.jsonl.1을 지운 뒤, 현재 파일이 64 MiB 이하면 usage.jsonl.1로 옮기고, 이미 64 MiB를 넘은 옛 파일이면 아카이브로 남기지 않고 통째로 지운다. 그다음 새 usage.jsonl에 이번 줄을 append한다. 권한 캐시(ensuredUsageLogFile)는 회전/삭제 뒤 null로 비워서, 옛 inode를 믿고 chmod를 건너뛰지 않게 한다. usage.jsonl.1INITIAL_OWNED_PATHSensureUsageLogDirrecordOwnedConfigPath에 들어가서 설정 소유·언인스톨 정리 대상이 된다.

숫자는 이미 있던 management/recent 읽기 한도와 같다. MANAGEMENT_USAGE_MAX_READ_BYTESRECENT_USAGE_MAX_READ_BYTES도 64 MiB다. 예전에 #1497이 “usage 집계가 움직이는 64 MiB 꼬리만 본다”고 지적했던 그 창과 같은 크기라, 디스크 상한을 그 창에 맞춘 선택으로 읽힌다. 테스트는 (1) 정확히 64 MiB짜리 sparse 파일을 만든 뒤 append하면 .1로 돌아가고 활성 파일에는 새 행만 남는 경우, (2) model 필드를 크게 부풀린 행이 디스크에 안 남는 경우를 본다. PR 본문 기준으로 관련 bun 테스트 56 pass·tsc clean이고, 이 배달 시점 CI hygiene/label/resolve-pr는 아직 pending이다.

라인 src/usage/log.ts appendUsageEntry 회전 직후 - 읽기 함수들(readUsageEntries, readRecentUsageEntries, readUsageSnapshotForManagement)은 여전히 활성 usage.jsonl만 본다. .1은 만들지 읽지 않는다. 그래서 회전이 일어나는 순간 대시보드/usage API에 보이던 직전 창(최대 약 64 MiB)이 한 번에 사라지고, 새 파일의 새 줄만 남는다. 주석의 “recent history 보존”은 디스크에 파일이 남는다는 뜻이지, 제품 UI가 이어서 보여 준다는 뜻은 아니다.
라인 src/usage/log.ts Buffer.byteLength(line) > MAX_USAGE_ENTRY_BYTES) return - 비정상적으로 큰 행을 조용히 버린다. 로그·메트릭·호출자 피드백이 없다. 텔레메트리만 빠지고 요청 자체는 성공한 것처럼 보일 수 있다.
경로 tests/usage/usage-log.test.ts - 정확히 64 MiB 회전과 oversized 거절은 있다. 이미 64 MiB를 넘긴 legacy 파일을 아카이브 없이 rmSync하는 분기는 테스트가 없다. 보안 이유로 일부러 안 남기는 경로라서, 한 줄짜리 회귀라도 있으면 나중에 실수로 archive로 바뀌는 걸 막기 쉽다.
경로 ensureUsageLogDir early-return - 디렉터리 권한 캐시가 아직 유효하면 recordOwnedConfigPath(..., usage.jsonl.1)를 건너뛴다. INITIAL_OWNED_PATHS에 이름이 있어서 언인스톨 기본 목록에는 들어가지만, 오래 살아 있는 프로세스의 “동적 소유 기록”은 재검사 주기까지 늦어질 수 있다. 심각하진 않다.

메인테이너의 판단이 필요한 지점

  • 회전 직후 usage UI/API에서 직전 창이 비는 “히스토리 절벽”을 디스크 상한의 대가로 받아들일지, 아니면 .1을 management/recent 읽기에 이어서 합칠 follow-up을 열지.
  • oversized 행을 지금처럼 완전 무음으로 둘지, debug 한 줄이라도 남길지.
  • legacy oversized 삭제 분기에 테스트를 이 PR에 붙일지, 머지 후 작은 후속으로 둘지.

너의 추천
히스토리 절벽을 의도된 트레이드오프로 문서/리뷰에만 못 박아 두면, exact-head CI가 초록일 때 dev에 머지해도 된다. 범위가 좁고 ownership까지 같이 갔으며 types/config 분할에 걸려 닫을 형태도 아니다. 가능하면 legacy >64 MiB 삭제 테스트 하나만 더 넣고, oversized silent drop은 follow-up으로 남겨도 충분하다.

이 댓글은 grok-bot이 작성했습니다

@github-actions

github-actions Bot commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

✅ READY

  • all PR quality gates passed; the review readiness checklist is complete.

Review readiness checklist

  • ✅ All CI tests are green on my local testing.
  • ✅ I pushed my PR to the latest dev commit.
  • ✅ I resolved all correct Codex and CodeRabbit findings.
  • ✅ My PR is ready for review.

4/4 boxes ticked.

Automatic ready-for-review conversion failed; please mark the pull request ready manually if it is still a draft.
The review-ready label marks this PR as ready; review automation runs independently.
Maintainers notified: @lidge-jun @Ingwannu

@lidge-jun

Copy link
Copy Markdown
Owner

Closing without a carry; the decision is recorded in #5608. The unconditional 64 MiB rotation and legacy-ledger deletion conflict with the opt-in usageLedgerMaxBytes retention contract, and usage readers only read usage.jsonl, so rotated rows would disappear from totals and history. Disk growth stays with the opt-in retention setting. Thank you @luvs01.

@lidge-jun lidge-jun closed this Sep 22, 2026
lidge-jun added a commit that referenced this pull request Sep 23, 2026
…y work (#5608)

* docs(devlog): plan the L5 luvs01 Responses and usage bundle

Record the disposition, provenance and ordered carry recipe for #5474, #5305, #5434, #5560, #5542, #5553, #5562 and #5556.

* fix(usage): verify OAuth rotation before withheld attribution

(cherry picked from commit 1ac1ba0)

* test(oauth): cover the eligible-target positive case and gate assertion

(cherry picked from commit f6778bf)

* fix(oauth): require a live two-account roster before withheld attribution

The eligibility probe added for #5434 could report an alternate when the failed account had been removed and one stored account remained, because it skipped the roster-size guard that rotation applies. Read the roster once, apply the same guard, and describe the probe as applying no cooldown rather than as non-mutating.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(adapters): close Grok continuation and normalized tool catalog gaps

Keep the existing request shape, scope external Cursor continuations to the
current user request, repair ctc_ ids for xAI, and rebuild a full replay when
a checkpoint no longer fits the envelope. Invalid or unreadable inputs fail
closed to the previous safe default with debug diagnostics.

This is the net change of two source commits. Their empty-catalog selector
edit to src/adapters/xai-web-search.ts is omitted because dev already carries
that rule (b20acc7, #5376), and the temporary test additions to capped files
are replaced by the final extracted test files.

(cherry picked from commit 71a9fe5)
(cherry picked from commit ffd50f4)
Refs #5350, #5560

* fix(cursor): preserve continuation scope and avoid false repetition recovery

(cherry picked from commit 5a99d4d)
(cherry picked from commit 31f21f0)

* fix(responses): lower undeclared historical custom tools when the destination denies them

Routed lowering collected only current custom declarations, so a compacted or replayed custom_tool_call leaked to xAI-like gateways as the native item type and came back as a misleading 422 missing id. Convert protocol-history items from the top-level input without expanding the live catalog, request full replay for orphan results, and fail closed before serializing leftovers.

Co-authored-by: Cursor <cursoragent@cursor.com>
(cherry picked from commit 5da2883)
(cherry picked from commit a326b67)

* test(responses): split historical custom-tool replay coverage off the passthrough ratchet cap

openai-responses-passthrough.test.ts is already at its 4809-line ceiling. Keep the new wire fixtures in a responses-prefixed file so the layout seed resolves it without raising a cap.

Co-authored-by: Cursor <cursoragent@cursor.com>
(cherry picked from commit 6f43794)
(cherry picked from commit 7e8fb09)

* fix(responses): reject malformed historical custom calls

(cherry picked from commit 52f7448)
(cherry picked from commit 57407be)

* fix(responses): bind historical outputs to custom calls

(cherry picked from commit 5654b41)
(cherry picked from commit c7781bf)

* fix(responses): reject duplicate historical call ids

(cherry picked from commit dc948dc)
(cherry picked from commit fbecefa)

* fix(xai): preserve stateful tool output continuations

(cherry picked from commit 4edc411)
(cherry picked from commit 82a5f6d)

* fix(xai): keep replay-miss reasoning cleanup independent of output repair

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit 67ccd8d)
(cherry picked from commit aac783f)

* test(responses): verify combined continuation boundaries

Exercise stateful output-only deltas, independent replay-miss reasoning cleanup,
capability-driven historical lowering, placeholder ordering, native item-ID
repair and preservation of the existing empty-catalog denial. Record the
combined history contract and register the carried and new regression files.

The layout-marker cleanup from e8e179f was
completed while resolving its preceding source commit onto the current map.
The existing dev selector normalization and role-fixture corrections remain
authoritative and are not replaced by weaker or duplicate source changes.

Co-authored-by: Yeonwoo Choi <32544727+twoimo@users.noreply.github.com>
Co-authored-by: maosisheng <maosisheng@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Epinephrine <luvs01@hanmail.net>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit 2ec0cd1)

* fix(responses): normalize wrapped MCP tool names

(cherry picked from commit b4c839b)
(cherry picked from commit f68b32646069d3e385748fc6c36848765c68e02e)
(cherry picked from commit e555e73)

* fix(responses): unwrap default apply patch aliases

(cherry picked from commit 453df76)
(cherry picked from commit d63ff542415895fa25f5599aad9dc632c80de92d)
(cherry picked from commit 7cbbf44)

* docs(structure): record default.-prefixed alias recovery in the freeform contract

The responses owners still claimed only bare exec/apply_patch calls accept alternate-field or outer-fence recovery; compileCodeModeHelperInput now also unwraps provider-invented default. aliases. Update runtime.md, transports/responses.md, providers/{chat-compat,kiro,xai-grok}.md.

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit 165ddd0)
(cherry picked from commit d0776e703681729e2ea447775e77397faab16f29)
(cherry picked from commit 19a2005)

* fix(responses): compile structured shell payloads sent to code-mode exec

(cherry picked from commit 9430bbd)
(cherry picked from commit 59bc70bc30f954eea5a63f8a6fcf4de4dcbfd865)
(cherry picked from commit 9662528)

* test(responses): verify combined tool normalization boundaries

Verify that default.apply_patch names and patch/content wrappers emit the same executable input through JSON and fragmented SSE. Move the carried decision record to unused ADR-0099 because current dev already owns ADR-0097; preserve both the structured code-mode shell and existing schema-bound flat-shell contracts.

Co-authored-by: kosta <kosta963@gmail.com>
Co-authored-by: Flowershangfromthebranches <152056395+Flowershangfromthebranches@users.noreply.github.com>
(cherry picked from commit 3da6366a60ac5964e8a8de43486125d72729f8c8)
(cherry picked from commit b57d7c5)

* fix(responses): refuse ambiguous OpenCode Go resets

(cherry picked from commit 62ac159)
(cherry picked from commit b8f9a45)

* test(responses): prove OpenCode Go pre-answer reset refusal by execution

Per review on #5446: replace the replaySafe source-string count with an execution test that drops the connection before the answer on an opencode.ai/zen/go destination and asserts the 429 upstream_reset_replay_refused with exactly one send.

(cherry picked from commit 92b74ec)
(cherry picked from commit 808dd85)

* fix(routing): isolate policy retry body snapshot

(cherry picked from commit 8e2a0fe)
(cherry picked from commit db854bf)

* test(routing): pin the retry snapshot against nested input mutation

(cherry picked from commit a240fc9)
(cherry picked from commit b037810)

* fix(responses): isolate policy compaction state

(cherry picked from commit 714119e)
(cherry picked from commit e6f9339)

* fix(tests): bound the cold-spawn warm-up child on a live event loop

The warm-up child was waited on through Bun.spawnSync, which made the spawn's
own timeout the only bound it could honour — and no bound at all when the
child or the primitive wedged: while a synchronous spawn blocks, the event
loop is dead, so the hook budget and the per-test timeout freeze inside the
same wait and nothing reports anything. Run 35511743422's macos 2/2 leg held
that shape for eighteen silent minutes inside client-connect.test.ts before
the job ceiling cut it and reported cancelled, which the ci gate reads as
failure.

The bound now lives on the parent's live loop: an asynchronous spawn, SIGKILL
at the existing derived deadline, a short reap grace, and the call settles
with or without the child's exit or EOF — so a descendant holding the pipes
or a child that outlives its kill cannot turn a warm-up into an unbounded
wait. A timed-out child now fails the warm-up by name instead of hanging the
job.

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit aa9b889)
(cherry picked from commit f86a534)

* fix(responses): fail closed on synthetic or stale compaction source selectors

compactionRoutingKeepsProviderIdentity evaluated override.sourceModel as the
raw client selector, so a synthetic --fast/--effort form of a policy or combo
selector (ocx/primary--fast) missed resolvePolicyProfileId/resolveComboId and
fell through routeConcreteModel to the default provider. The same fallthrough
swallowed policy aliases renamed or deleted mid-conversation, since
config.routingProfiles is mutated in place. Both cases could wrongly report
identity match and let provider-private compaction state or caller credentials
cross a backend boundary.

Strip synthetic-row suffixes via parseSyntheticRowId before the identity
checks, and treat a source that only routes through the default provider as
unproven: it can never match a concrete identity.

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit 7e59315)
(cherry picked from commit 76b40f9)

* fix(codex): bind scoped quota suppression to alternate

(cherry picked from commit 23a3694)
(cherry picked from commit 385f338)

* fix(ci): restore core.ts to file-size ratchet cap

The scoped-quota re-export grew src/server/responses/core.ts past its committed 210-line cap (213). Collapse the two-name re-export back to one line; the file's export list already carries longer single-line statements.

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit 559db16)
(cherry picked from commit feb0c16)

* fix(codex): record wrapped quota on suppressed moves and bind caller main

- record the normalized 429/402 outcome before returning no-alternate on a
  suppressed same-workspace move, so a 5xx-wrapped quota refusal still cools
  the refused account instead of reading as transient
- bind a request-owned `main` alternate by the caller credential's own
  workspace id (chatgpt-account-id header, else the bearer token's account
  claim) via callerCodexWorkspaceAccountId
- apply the same scoped-quota workspace gate to the single bounded alternate
  send in the native /responses/compact path
- cover all three in tests and update the transport doc

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit 5267593)
(cherry picked from commit 466c75c)

* test(server): move scoped-quota auth cases into a sibling file under the size cap

server-auth.test.ts grew to 4684 against a 4589 baseline cap, so the
file-size ratchet failed shard 3/4. The three scoped-quota suppression
cases move byte-for-byte into server-auth-scoped-quota.test.ts, and the
pool-retry harness they share is extracted to
tests/helpers/pool-retry-harness.ts (per-run OPENCODEX_HOME dir, so each
importing file keeps its own module state under bun test --isolate).

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit b391c99)
(cherry picked from commit 9050722)

* fix(codex): re-check abort after the scoped-quota body read

The workspace classification in shouldRetryCodexScopedQuotaOnAlternate
reads the first response body asynchronously, so a client disconnect can
land after the earlier abort check but before the branch records the
first account, cancels its body, and sends the alternate. Re-check the
abort signal immediately after the await in both paths: compact returns
the 499 client_cancelled response after releasing the alternate lease,
and the regular path releases its permit and lease and returns
no-alternate while still recording the first account's real outcome.

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit c52b64b)
(cherry picked from commit b2eda92)

* fix(codex): release the discarded compact rejection body on abort

The 499 exits around the scoped-quota classification return a fresh
response while the first rejection's body is still open; cancel it so
the abandoned upstream connection and tee resources are released.

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit 813efcc)
(cherry picked from commit 1069b54)

* fix(codex): keep compact abort cleanup off the return path

upstream.body.cancel() can wait on a custom or stalled source; awaiting
it at the abort checkpoints would park the 499 reply on cleanup. Fire
it with the request's abort reason and swallow rejection, the same
best-effort shape bufferCompactResponse already uses.

Co-Authored-By: Epinephrine <luvs01@hanmail.net>
(cherry picked from commit 2d1ee69)
(cherry picked from commit 37a006e)

* test(responses): preserve terminal refusal across recovery boundaries

Exercise both operator-granted and default-denied reset paths through policy fallback and the alternate-account eligibility gate. Clarify that retries serialize the original body snapshot while identity metadata is established per attempt, and document synthetic compaction identity and transient replacement refusal.

(cherry picked from commit be1fee9)

* test(cursor): pin exact host-wrapper classification in continuation scope

The wire carries no provenance for compaction summaries or ambient browser state, and the Codex client detects stored summaries by the same exact prefix. Pin that a user message that is itself an exact wrapper stays in history while the preceding real request remains the labeled one, and document the rule next to the continuation contract.

Co-authored-by: Yeonwoo Choi <32544727+twoimo@users.noreply.github.com>

* test(server): prove a suppressed same-workspace alternate is never sent

Both credentials in the 5xx-wrapped scoped-quota case carry the same workspace header, so a negative check on the other account id could not fail. Assert the exact one-send sequence, and narrow the transport contract: suppression covers the in-request move, while later requests still select by per-account health.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* docs(devlog): record the L5 responses sequence outcome

* docs(devlog): amend the L5 search and usage plan after review

* fix(responses): isolate Cursor combo shadow calls

(cherry picked from commit 3e5a4dd)
(cherry picked from commit 7f45883)

* fix(responses): repair terminal-less bridged search legs

(cherry picked from commit 1fb6005)
(cherry picked from commit c4fa8c8)

* fix(responses): repair continuation legs and prove behavior in tests

(cherry picked from commit 3948970)
(cherry picked from commit 8d46989)

* fix(responses): close shadow combo intersection and continuation coverage

Apply the existing source-target non-intersection rule before early combo interception, and add production-path behavioral coverage for terminal-less continuation repair.

(cherry picked from commit 4bfcc0a)
(cherry picked from commit 3f3fdf1)

* test(web-search): preserve complete but open bridge-leg coverage

Carry the end-to-end handleResponses regression and transport contracts for repairing both the first and continuation search legs. The corresponding production changes are already preserved by the earlier terminal-repair carries; keep this broader integration coverage without applying that implementation twice.

Source commit: b1044e7
Co-authored-by: Epinephrine <luvs01@hanmail.net>

(cherry picked from commit 973a4ac)

* test(web-search): keep repaired replay within caller and serving scope

(cherry picked from commit bb49c9f)

* test(server): reap fixture ACL workers before removing failover homes

(cherry picked from commit ae52669)

* fix(responses): keep combo shadow interception on the dispatch pick

The carried early intersection check sampled a combo target with routeModel before dispatch. The combo loop then picked again, so the interception decision could follow a different target than the one sent, and a random or round-robin combo advanced its selection state for a probe. Restore the existing combo rule (a shadow call rewritten to a combo enters the combo) and its regression test, and keep the combo-child isolation marker.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* test(web-search): bind repaired-leg replay to a keyed caller principal

The repaired-leg replay assertion expected a shared keyless loopback principal, which the replay cache refuses by design: keyless loopback callers get no retained replay. Configure an inbound API key, derive the expected principal with the production resolver, pass the full loopback admission, and assert that a keyless caller cannot form a scope.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(usage): restrict legacy -main provider collapse to Codex labels

A -main suffix was stripped from ANY provider name, so a configured provider like openrouter-main silently merged into openrouter in usage summaries and pricing fallback. Restrict the compatibility mapping to the known Codex provider labels (openai/chatgpt/openai-multi-main), matching codexAccountProviders.

(cherry picked from commit 89a9272)
(cherry picked from commit 0f0ef96)

* fix(cli): mark access-key usage unavailable when attribution is absent

Without attributionSince the server is reporting an empty or unreadable usage log, but the table still rendered 0 totals and never-used markers that are indistinguishable from real data. Show an unavailable marker spanning the usage columns instead, matching the ambiguous-union precedent.

(cherry picked from commit 3c3f14b)
(cherry picked from commit 83514c3)

* fix(cli): treat a malformed attributionSince as unavailable

typeof === 'string' accepted any value, so a malformed attributionSince made
usageAvailable true and printed usage cells plus an 'attribution since'
footer. Parse once, derive availability from the validated result, and reuse
it for the footer. Covers the malformed-string regression.

(cherry picked from commit e7584c3)
(cherry picked from commit 1380693)

* fix(gui): keep the app-server status read alive across Models tab switches

(cherry picked from commit 9e6870d)
(cherry picked from commit 5563577)

* fix(usage): bound persisted requestedModel selectors

Selectors are not length-bound at admission, so persist over-long values as a bounded prefix + sha256 digest of the full selector and encode the request-history requested_model filter input identically. Two selectors sharing the bounded prefix stay distinguishable instead of colliding on a truncated prefix.

(cherry picked from commit e3d0f9b)
(cherry picked from commit c8a9d1a)

* fix(spend): enforce ceilings on native chat sends

(cherry picked from commit 347204f)
(cherry picked from commit 823a7d2)

* fix(usage): preserve observation and native reservation boundaries

(cherry picked from commit 22ee516)

* test(usage): isolate native spend regressions within file caps

(cherry picked from commit 1a8d5f7)

* test(usage): drain fixture owners before removing Windows homes

(cherry picked from commit 2241d03)

* test(usage): batch canonical pagination fixture writes

(cherry picked from commit ddfef13)

* fix(cli): accept only an ISO-8601 UTC attributionSince

Date.parse accepts strings such as "0" and rolls impossible dates over, so a malformed attributionSince could still switch the key table to numeric usage and never-used cells. Require the ISO-8601 UTC shape the server emits and an instant that round-trips to the same second.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* docs(usage): state the aliasing limit of the idempotent selector encoding

Encoded requestedModel values must map to themselves because rows are normalized again on read, so a literal selector equal to another selector's persisted form shares its identity. Say so where the encoding is defined, and pin the behavior in the request-history test so the limit is deliberate rather than silent.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* docs(devlog): record the L5 search and usage outcome

* docs(devlog): record the L5 pull request

* docs(structure): keep runtime.md within its 600-line budget

The default.-prefixed freeform wording wrapped one extra line and pushed structure/runtime.md over the structure SSOT budget. Reflow the paragraph; the wording is unchanged.

* refactor(cursor): move current-request selection out of protobuf-request

The carried continuation-scope helpers brought src/adapters/cursor/protobuf-request.ts to 2,000 lines, the file-size threshold for files without a recorded cap. Move the current-request selection and its host-wrapper classification to a sibling module unchanged; the caller passes its text extractor.

Co-authored-by: Yeonwoo Choi <32544727+twoimo@users.noreply.github.com>

* docs(devlog): record the #5553 re-pin in the L5 plan

* docs(devlog): record the L5 original closures

* fix(usage): keep the native Chat spend estimate out of recorded usage

The native Chat spend reservation reused usageLogInputTokens for its input estimate. That field also feeds attempt usage, so native Chat attempts started recording an estimate-inflated input instead of the provider-reported counts (hosted CI: server-xai-oauth-401-replay and server-key-failover-e2e). Reserve the estimate through a spend-only spendInputEstimateTokens field; the reservation still charges it before each physical send.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* test(server): identify the suppressed alternate by its credential

Hosted CI showed the send layer retrying the refused account's transient 502 on the same credential, so an exact one-dispatch count was the wrong oracle. Both accounts share a workspace header; record the credential each physical send presents and assert the suppressed alternate's credential never appears.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix: close L5 retry, continuation, and history review gaps

Classify spend refusals on transient retry legs, keep Cursor retry provenance in checkpoint actions, and rebuild legacy history selectors into the bounded projection. Scope policy snapshots and correct warm-up deadline handling, with focused regressions and documentation.

* fix: retain policy fallback for decorated selectors

Normalize supported Fast and effort policy selectors before snapshot gating, restore a real policy-hop fixture, and align Cursor wire assertions with retry provenance guidance.

---------

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>
Co-authored-by: Yeonwoo Choi <32544727+twoimo@users.noreply.github.com>
Co-authored-by: twoimo <twoimo@twoimoui-MacBookPro.local>
Co-authored-by: maosisheng <maosisheng@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Epinephrine <luvs01@hanmail.net>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: kosta <kosta963@gmail.com>
Co-authored-by: Flowershangfromthebranches <152056395+Flowershangfromthebranches@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants