Skip to content

trunk-merge/pr-3491/69b8faac-1968-4840-8dc3-5e774280a33a#3517

Closed
trunk-io[bot] wants to merge 20 commits into
mainfrom
trunk-merge/pr-3491/69b8faac-1968-4840-8dc3-5e774280a33a
Closed

trunk-merge/pr-3491/69b8faac-1968-4840-8dc3-5e774280a33a#3517
trunk-io[bot] wants to merge 20 commits into
mainfrom
trunk-merge/pr-3491/69b8faac-1968-4840-8dc3-5e774280a33a

Conversation

@trunk-io

@trunk-io trunk-io Bot commented Jul 16, 2026

Copy link
Copy Markdown
Trunk Merge Pull Request Banner

This pull request was created and is being managed by Trunk Merge.

This pull request is based on the main branch at SHA 6f243a016c2ef69deb6b924697711c4ee49f3abc.

See more details about each PR in the batch here:

When CI completes, this pull request will be closed automatically.

Pull Requests Being Tested

This pull request is testing a batch with the changes from pull requests 3491 and 3509 - batching documentation.

Dependencies

This pull request depends on the changes from pull requests 3506 and 3481.

k11kirky and others added 20 commits July 15, 2026 16:28
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Restore the production-safe mention presentation and the local Quill development skill from the source work. Context generation remains provided by the implementation already merged on main.

Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Drive the thread auto-scroll effect from the memoized timeline and agent phase so React Doctor sees complete dependencies without maintaining partial message fields.

Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
The Claude adapter routes eligible commands through rtk deterministically via a PreToolUse hook, but the Codex app-server protocol has no command-rewrite channel, so cloud Codex runs never used the rtk binary installed in the sandbox. Append rtk usage guidance to the Codex developer instructions instead, mirroring the Claude hook's eligibility sets and gated on resolveRtkPrefix so the per-run POSTHOG_RTK=0 kill switch also disables it.

Generated-By: PostHog Code
Task-Id: b005dede-2677-4364-94a2-c2a7e90e376a
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
…spend limit

A subscribed org's ai_credits.limit_usd arrives from the gateway as one
merged number: the $20 included monthly allowance plus the configured
spend limit. The plans-page meter and title-bar card rendered it raw, so
an org on the default limit saw a total matching nothing it configured,
and the billing announcement modal misquoted the merged number as the
org's spend limit.

Derive the breakdown in codeUsageMeter (via codeOrgSpendLimitUsd), spell
it out under both meters ("$20 included + $50 org spend limit"), notch
the plans-page bar where the included allowance ends, and quote the
recovered spend limit in the announcement modal.

Generated-By: PostHog Code
Task-Id: b24f71e2-3751-4a6b-b5d8-a24147c4c067
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
…tions

The 1px notch marking where the included allowance ends was barely
visible in either theme. Replace it with a physically segmented bar:
the $20 included allowance and the org spend limit render as separate
gap-divided segments, usage fills the included segment green before
pouring into the accent spend-limit segment, and a dot legend names
each amount. Exceeded turns both segments and dots red; a $0 spend
limit collapses to the included segment alone; the free tier keeps the
plain single-track bar.

Generated-By: PostHog Code
Task-Id: b24f71e2-3751-4a6b-b5d8-a24147c4c067
10 updated
Run: 31ffb0f9-8ac6-42a7-9d0d-21c01935161b

Co-authored-by: adboio <23323033+adboio@users.noreply.github.com>
Generated-By: PostHog Code
Task-Id: 87a79e23-20c4-440b-818b-28154924ffbc
@github-actions

Copy link
Copy Markdown

React Doctor found 1 issue in 1 file · 1 warning.

1 warning

src/features/billing/UsageMeter.tsx

Reviewed by React Doctor for commit 2a3bdfe.

@trunk-io trunk-io Bot closed this Jul 16, 2026
@trunk-io
trunk-io Bot deleted the trunk-merge/pr-3491/69b8faac-1968-4840-8dc3-5e774280a33a branch July 16, 2026 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants