Skip to content

fix(usage): consolidate spend admission and observation boundaries - #5556

Closed
luvs01 wants to merge 12 commits into
devfrom
stack/usage-observation-boundaries
Closed

luvs01 wants to merge 12 commits into
devfrom
stack/usage-observation-boundaries

Conversation

@luvs01

@luvs01 luvs01 commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

Summary

This draft carries #5358, #5283, #5275 and #5255 into one accounting/observation boundary review:

  • Native Chat reserves durable spend immediately before each physical send, using message and tool-definition input estimates plus the output ceiling. A refused reservation returns a local 429 before contacting upstream; key reselection updates the privacy-safe account label.
  • Usage reports keep configured providers ending in -main distinct, while retaining the three recognized legacy Codex labels. Long requested selectors use a bounded prefix plus a digest of the complete value, and request-history filters apply the same representation.
  • Access-key usage remains unavailable when attribution is absent or malformed instead of displaying a misleading zero/never-used result.
  • The Models GUI keeps its independently owned app-server status read alive across picker-tab changes. Existing cancellation on API-base/restart/unmount remains intact. This changes lifecycle behavior, with no new layout or visible copy.

The six source commits and author attribution are preserved with cherry-pick provenance:

Source Source commits
#5358 347204ff33e42bba7781e7b057443ea9808e9d06
#5283 89a927228c3e30f330f313ab8b2af37199892afd
#5275, including its review follow-up 3c3f14b5f7c5aa9fb0db19449a89310a67b230f2, e7584c39a769f76e332c0e96a18a8166166bb246
#5255, including the selector-collision review fix 9e6870db8de95894c35456a3267c612918bc297b, e3d0f9b6ea193f0d9be760ad3bd918a49a4cd937

Integration follow-ups include tool-definition reservation coverage, lifecycle/encoding documentation, test relocation within existing file caps, explicit Windows fixture shutdown/reaping, and equivalent batched canonical fixture writing for the 1,500-row pagination test. No row count, page count, assertion, timeout, platform skip, ACL requirement, or production limit was relaxed.

#5305 is excluded and remains OPEN. Its unconditional 64 MiB rotation/legacy deletion conflicts with current dev's opt-in usageLedgerMaxBytes, whole-ledger readers, revision-checked atomic retention, and coordinated reader invalidation. It is a separate policy proposal, not a fully carried source. #5463 is already carried separately by #5538 and is not duplicated here.

Latest dev 41ec40f7e31969d1ca7140e0d510077f74f4cbe3 is merged. Its only changes relative to the preparation base are the release checksum verifier and its test; the usage/GUI source changes remain unchanged.

Verification

The following are distinct runs, not a claim that the entire final suite passed:

  • Initial nine-file focused run: 406 pass / 1 skip / 1 fail. The failure was the existing 1,500-row pagination case exceeding the unchanged 5-second limit. Native spend cases and all seven opt-in retention cases passed.
  • After test relocation and Windows teardown fixes: 22 pass / 1 fail across the two affected files. Native spend and ownership-release assertions passed; EBUSY, teardown timeout, and owner-home conflicts no longer occurred. Pagination remained the only failure.
  • Identical instrumented pagination fixture on both preparation HEAD and dev: 1,500 separate appends took approximately 4.57 s / 4.67 s; both exceeded the unchanged overall limit. This identified fixture-writing I/O, rather than assuming a baseline failure from the test's age.
  • After writing the same normalized canonical rows in one operation: 4 pass / 0 fail, 1,534 assertions. The unchanged 1,500-row/15-page pagination case passed in 412 ms; actual incremental/tail append and long-selector lookup cases also passed. Other tests were name-filtered only for this focused invocation.
  • Models GUI focused tests: 22 pass / 0 fail, 120 assertions. Root typecheck, GUI app/node typecheck and Vite production build passed. Shared dependencies were reused without installation; build/cache output was isolated.
  • Structure SSOT, privacy scan and whitespace checks passed. On the final head, the release-verifier file passed all 33 tests. Ratchet's eight other cases passed; its repository scan first exceeded the unchanged 5-second timeout, then passed when that one failed case was rerun under the same conditions. No file-size cap or timeout was raised.
  • Full final suite, hosted exact-head CI and POSIX-only validation have not been claimed. Independent maintainer security review remains pending before merge.

The screenshot uses the actual Models component, language provider and stylesheet with synthetic API data. Headless DOM checks confirmed that switching to Combos did not abort the held status request and that its stale response rendered the existing banner. This is a retained-state capture, not a visual redesign.

Models tab preserves the existing app-server status banner

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.

Review readiness remains draft:

  • 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.

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)
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)
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)
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)
@coderabbitai

coderabbitai Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true

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

리뷰 · 우선순위 62 / 80

이 PR은 쓰임새와 한도 지키는 일을 한곳에 모읍니다. 예전에는 Native Chat이 위쪽으로 바로 나가서, 뿌리·계정·풀 한도를 피했습니다. 이제는 실제로 보내기 직전에 메시지·도구 설명·출력 상한을 셈해서 자리를 잡고, 자리가 없으면 위쪽에 손도 대지 않고 로컬 429를 돌려줍니다. 키가 바뀌면 안전한 계정 이름도 다시 찍습니다.

보고 쪽도 고칩니다. 이름이 -main으로 끝나는 설정 공급자는 서로 다른 줄로 남기고, 예전에 쓰이던 Codex 라벨 세 개만 합칩니다. 아주 긴 모델 이름은 앞부분과 전체의 짧은 지문으로 줄여 저장하고, 요청 기록 검색도 같은 방식으로 맞춥니다. 접근 키 쓰임새는 시작 시각이 없거나 깨져 있으면 0이나 "한 번도 안 씀" 대신 "unavailable"을 보여 줍니다. Models 화면은 Combos 탭으로 옮겨도 앱 서버 상태 읽기를 끊지 않습니다. 베이스는 dev이고, #5305·#5463은 일부러 안 넣었습니다.

tests/server/server-key-failover-e2e.test.ts / tests/server/server-xai-oauth-401-replay.test.ts - 호스트 CI가 같은 이유로 빨갛습니다. Native Chat이 보내기 전에 입력 토큰을 미리 셈한 뒤, 위쪽이 알려 준 실제 쓰임새 대신 그 추정치가 시도/기록 줄에 남습니다. 실패 예는 실제 inputTokens: 3 대신 estimated: trueinputTokens: 8~9, totalTokens는 5가 아니라 11입니다. 한도를 막는 일은 맞는데, 기록의 "실제 사용량"이 틀어집니다.

src/server/chat-completions.ts / src/server/chat-native.ts - 추정치를 usageLogInputTokens에 넣고 noteProviderAttemptSend에 넘깁니다. 위쪽이 prompt_tokens/completion_tokens를 준 뒤에는 그 값이 최종 줄과 시도 줄을 덮어야 하는데, 지금 CI는 덮지 못한 상태를 보여 줍니다. 새로 넣은 spend 테스트만으로는 이 기록 회귀가 안 잡힙니다.

tests/usage/request-history-index.test.ts - 1,500줄 페이지 테스트가 한 번에 정규화한 파일을 씁니다. 시간은 살아났지만, 그 큰 경우는 실제 appendUsageEntry 경로를 더 이상 밟지 않습니다. 작은 증분 테스트는 남아 있습니다.

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

초안이고 작성자도 전체 스위트·보안 리뷰를 아직 안 끝냈다고 적었습니다. CI의 사용량 기록 깨짐이 "테스트만 고치면 된다"인지, "추정이 실제 보고를 가로막는 버그"인지 먼저 정해야 합니다. #5305를 빼 둔 판단은 문서와 맞고, 같은 묶음으로 넣으면 안 됩니다.

너의 추천

머지하지 말고, 먼저 Native Chat에서 위쪽 사용량이 오면 추정 줄을 실제 줄로 바꾸는 경로를 고치거나 증명하세요. server-key-failover-e2eserver-xai-oauth-401-replay의 Native Chat 케이스가 초록이 되면 그다음입니다. 한도 거절·-main 분리·긴 셀렉터·unavailable 표시·Models 탭 유지 방향은 유지해도 됩니다.

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

@lidge-jun

Copy link
Copy Markdown
Owner

Carried in #5608: ten commits are cherry-picked with authorship kept, plus follow-ups that accept only an ISO-8601 UTC attributionSince and document the aliasing limit of the idempotent selector encoding. The screenshot-asset commit is not carried; #5608 links the capture. Closing as superseded. 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

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants