some improvements related to ai agent token billing#390
Merged
satti-hari-krishna-reddy merged 10 commits intoMay 15, 2026
Conversation
… cloud environments
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves AI Agent token billing/limit enforcement, especially for sub-org (tenant) executions, and surfaces agent token usage in org feature metadata.
Changes:
- Bill AI Agent token usage/limits against the parent org when an execution is started from a sub-org (CreatorOrg/ManagerOrgs fallback).
- Add default cloud token limit activation for parent orgs that don’t yet have an AgentTokens limit configured.
- Populate
SyncFeatures.AgentTokens.Usagefrom org statistics and adjust alert deduping/logging to use the billing org ID.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
shared.go |
Sets default AgentTokens limit/active for cloud parent orgs and exposes monthly agent token usage via HandleGetOrg. |
ai.go |
Resolves billing org (parent when applicable), enforces token limits and alerts based on billing org, throttles some logs, and counts agent tokens toward the billing org. |
Comments suppressed due to low confidence (1)
ai.go:8543
- SetCache expiration is in minutes (see db-connector.go SetCache), but this code passes 60606 which is interpreted as 21,600 minutes (~15 days), not 6 hours. Use 360 minutes (6*60) or otherwise pass the correct unit if you intended seconds.
rateLimitKey := "openai_rate_limit_log"
if _, cacheErr := GetCache(ctx, rateLimitKey); cacheErr != nil {
log.Printf("[ERROR][%s] AI_OPENAI_RATE_LIMIT: org=%s error_message=%s", execution.ExecutionId, execution.Workflow.OrgId, newOutput.Error.Message)
_ = SetCache(ctx, rateLimitKey, []byte("1"), 60*60*6)
}
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.