Skip to content

feat(webapp): server-side agent message quota - #4552

Open
kathiekiwi wants to merge 23 commits into
test/chat-agent-durability-tri-11166from
feat/agent-message-quota-tri-12863
Open

feat(webapp): server-side agent message quota#4552
kathiekiwi wants to merge 23 commits into
test/chat-agent-durability-tri-11166from
feat/agent-message-quota-tri-12863

Conversation

@kathiekiwi

Copy link
Copy Markdown
Collaborator

What & why

The Free-plan agent-message allowance was only a client-side hint (useIsFreePlan() was hardcoded to undefined, so nothing was enforced) and the running count was a live COUNT(*) over chat_messages — which meant deleting a chat silently freed quota. This PR makes the allowance a real server-side limit with a durable counter, so the cap holds regardless of the client and a deleted chat can't reclaim messages within the period.

The cloud side that fills the actual per-plan number is a separate PR (TRI-12863 P0). Until it deploys the agentMessages limit key is absent, which resolves to the repo's unlimited sentinel — the correct fail-open default, and why this ships independently.

What's inside

  • New counter table trigger_dashboard_agent.agent_message_usage, keyed (organization_id, period) where period is a UTC calendar month "YYYY-MM". FK-free (pgSchema convention), plus a drizzle migration. Deliberately not joined to chats — that closes the delete-a-chat hole. Distinct from TRI-13068's AiUsageEvent; neither is derived from the other.
  • New service dashboardAgentQuota.server.ts: a pure checkAgentMessageQuota({ used, limit }) (so the MCP send path can reuse the rule later) plus an org-scoped resolver that reads the period counter and the cached plan limit, and a recordAgentMessageSent increment.
  • Counting on send: the create path (head start) and the .in append path each increment one user message. The append path counts only after the existing trigger === "action" 403, so wakes never count.
  • Enforcement: at/over the limit both send routes return 403 { error: "message_quota_reached", limit }, which the client renders as AgentUpgradeBlock rather than a generic failure. Never a silent drop.
  • Client: ?quota=1 now reads the period counter; useIsFreePlan() is a real read gated on billing presence (no subscription → self-hosted → no cap, no upgrade UI), not on the plan value.

Key decisions

  • Fails open. The cap is a nudge, not a security boundary. An absent limit (self-hosted, or pre-P0) resolves to the unlimited sentinel 100_000_000 (never Infinity — that serializes to null in the Redis limit cache), and a counter read that throws returns "no cap". Self-hosted needs zero extra branching — it falls out of the fallback, with a test to prove it.
  • Billing-presence gate. The upgrade UI keys off whether a subscription exists, so a self-hosted install with no billing shows no cap and no upsell label.
  • The (org, period) table closes the delete hole. A standalone counter, not a count over chat rows, so deleting a chat can't free quota inside the period.

Testing

apps/webapp/test/dashboardAgentQuota.test.ts (testcontainers, no mocks):

  • pure checkAgentMessageQuota under/at/over/unlimited (control-breaks the >=);
  • agentTurnCountsAgainstQuota counts a message but not a wake (control-breaks the wake exclusion);
  • the counter accumulates and a deleted chat can't free quota within the period; other periods/orgs start fresh;
  • the resolver reports reached over the limit and never reached when unlimited;
  • fails open when the limit is absent (self-hosted) and when the counter read throws.

TRI-12863

Enforce the Free plan's agent-message allowance on the server, not just as a
client hint. A per-(organizationId, period) counter lives in its own table,
not joined to chats, so deleting a chat can no longer free quota inside the
period. The create path and the .in append path each count one user message
and refuse over the cap with a typed 403 the client renders as the upgrade
block; wakes (action turns) never count. Fails open: an absent limit
(self-hosted, or before the cloud side ships) or a counter read that throws
means no cap. TRI-12863.
@changeset-bot

changeset-bot Bot commented Aug 10, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 3556dff

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@coderabbitai

coderabbitai Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 6dc5213d-0a22-43b8-a71a-afd673c36cec

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Walkthrough

Adds monthly, organization-level agent message quotas with UTC billing periods. Stores usage in a new database table with atomic increment queries. Applies quota checks during chat creation and message forwarding, and records counted messages. Updates dashboard agent chat to process quota refusals, refresh usage, and display an upgrade block with the applicable limit. Adds PostgreSQL-backed tests for threshold, period, persistence, resolver, and error-handling behavior.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely identifies the main change: server-side agent message quota enforcement.
Description check ✅ Passed The description clearly explains the change, design decisions, enforcement behavior, and testing, although some template sections are omitted.
Docstring Coverage ✅ Passed Docstring coverage is 80.00% which is sufficient. The required threshold is 80.00%.
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.
✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/agent-message-quota-tri-12863

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.

…1166' into feat/agent-message-quota-tri-12863
@pkg-pr-new

pkg-pr-new Bot commented Aug 10, 2026

Copy link
Copy Markdown

Open in StackBlitz

@trigger.dev/build

npm i https://pkg.pr.new/@trigger.dev/build@d9cfca9

trigger.dev

npm i https://pkg.pr.new/trigger.dev@d9cfca9

@trigger.dev/core

npm i https://pkg.pr.new/@trigger.dev/core@d9cfca9

@trigger.dev/python

npm i https://pkg.pr.new/@trigger.dev/python@d9cfca9

@trigger.dev/react-hooks

npm i https://pkg.pr.new/@trigger.dev/react-hooks@d9cfca9

@trigger.dev/redis-worker

npm i https://pkg.pr.new/@trigger.dev/redis-worker@d9cfca9

@trigger.dev/rsc

npm i https://pkg.pr.new/@trigger.dev/rsc@d9cfca9

@trigger.dev/schema-to-json

npm i https://pkg.pr.new/@trigger.dev/schema-to-json@d9cfca9

@trigger.dev/sdk

npm i https://pkg.pr.new/@trigger.dev/sdk@d9cfca9

commit: d9cfca9

coderabbitai[bot]

This comment was marked as resolved.

devin-ai-integration[bot]

This comment was marked as resolved.

devin-ai-integration[bot]

This comment was marked as resolved.

devin-ai-integration[bot]

This comment was marked as resolved.

devin-ai-integration[bot]

This comment was marked as resolved.

A failed upstream send (5xx/502) or a non-2xx response burned a quota
message that never reached the agent. Record only after upstream.ok.
Draft submit and chat retry now bail when the message cap is reached, so
a suggested prompt or retry over the cap no longer fires a silent 403.
The capped draft keeps any open watch card. The quota re-reads when a
turn settles instead of on optimistic append, so the count and cap no
longer lag by one message.
devin-ai-integration[bot]

This comment was marked as resolved.

devin-ai-integration[bot]

This comment was marked as resolved.

devin-ai-integration[bot]

This comment was marked as resolved.

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.

2 participants