Repository navigation
fix(code): scope DevPass charts to dev-plan API key - #2269
Merged
Merged
Conversation
Limit the model breakdown chart and usage overview in the DevPass dashboard to the API key(s) created for the dev plan, including any previously rotated keys, so usage from API keys created via the llmgateway dashboard for the same project is excluded. - Return apiKeyIds (active + rotated) from /dev-plans/status - Accept comma-separated apiKeyId in /activity and /logs - Source AgentModelUsageChart from the aggregated /activity endpoint
Contributor
WalkthroughDashboard components refactored to use project-scoped agent model usage data. AgentModelUsageChart now fetches from the activity API filtered by projectId instead of logs filtered by sources, and projectId is threaded through CodingAgents from DashboardClient and UsageOverview. ChangesProject-scoped agent model usage refactor
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
apps/api/src/routes/dev-plans.ts (1)
793-831:⚠️ Potential issue | 🟠 Major | ⚡ Quick winUse the same Dev Plan key predicate for
apiKeycreation/lookup andapiKeyIdscollection.Line 813 calls
getOrCreatePersonalOrgApiKey, but that helper currently accepts any non-deleted project key. In projects with existing dashboard-created keys,/statuscan return a non-DevPassapiKeywhileapiKeyIdsstays empty or mismatched, which breaks this PR’s key-scoped dashboard behavior.Suggested fix
async function getOrCreatePersonalOrgApiKey( orgId: string, projectId: string, userId: string, ): Promise<string> { // Check for existing API key const existingKey = await db.query.apiKey.findFirst({ where: { projectId: { eq: projectId, }, + description: { + eq: "Dev Plan API Key", + }, status: { ne: "deleted", }, }, });🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@apps/api/src/routes/dev-plans.ts` around lines 793 - 831, The code uses getOrCreatePersonalOrgApiKey to set apiKey but collects apiKeyIds only for keys with description "Dev Plan API Key", causing mismatches; update the lookup/creation to use the same "Dev Plan API Key" predicate so both single apiKey and apiKeyIds refer to the same Dev Plan key set: either change getOrCreatePersonalOrgApiKey to accept/force a description parameter (e.g., "Dev Plan API Key") and use that when querying/inserting, or replace the call with an explicit db.query.apiKey.findFirst/insert that filters on projectId and description === "Dev Plan API Key"; ensure the variable apiKey returned matches the keys collected into apiKeyIds.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@apps/code/src/app/dashboard/components/AgentModelUsageChart.tsx`:
- Around line 170-190: AgentModelUsageChart lost agent-level filtering—restore
source-scoped filtering by adding an agent/source param to the query and to the
component props; update AgentModelUsageChart to accept the agent identifier
(e.g., agentId or source) and include it in the api.useQuery params.query
(alongside timeRange and apiKeyId: apiKeyIdParam) so the backend receives
source-scoped requests, or alternatively call the source-scoped API path used on
the agent detail page; ensure the same fix is applied to the other chart usages
noted (lines ~198-231 and ~296-297) so all charts filter by the agent/source
when rendered on the agent detail page.
---
Outside diff comments:
In `@apps/api/src/routes/dev-plans.ts`:
- Around line 793-831: The code uses getOrCreatePersonalOrgApiKey to set apiKey
but collects apiKeyIds only for keys with description "Dev Plan API Key",
causing mismatches; update the lookup/creation to use the same "Dev Plan API
Key" predicate so both single apiKey and apiKeyIds refer to the same Dev Plan
key set: either change getOrCreatePersonalOrgApiKey to accept/force a
description parameter (e.g., "Dev Plan API Key") and use that when
querying/inserting, or replace the call with an explicit
db.query.apiKey.findFirst/insert that filters on projectId and description ===
"Dev Plan API Key"; ensure the variable apiKey returned matches the keys
collected into apiKeyIds.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 451502df-4d64-4691-85fd-4ac695181c0f
⛔ Files ignored due to path filters (2)
apps/code/src/lib/api/v1.d.tsis excluded by!**/v1.d.tsapps/ui/src/lib/api/v1.d.tsis excluded by!**/v1.d.ts
📒 Files selected for processing (7)
apps/api/src/routes/activity.tsapps/api/src/routes/dev-plans.tsapps/api/src/routes/logs.tsapps/code/src/app/dashboard/DashboardClient.tsxapps/code/src/app/dashboard/components/AgentModelUsageChart.tsxapps/code/src/app/dashboard/components/CodingAgents.tsxapps/code/src/app/dashboard/components/UsageOverview.tsx
The personal org+project is dedicated to DevPass (personal orgs are hidden from the regular llmgateway UI per organization.ts), so scoping charts to that project is sufficient and survives API key rotation without needing to track historical key IDs. - Drop the apiKeyIds plumbing from /dev-plans/status and the comma-separated apiKeyId support in /activity and /logs - Scope CodingAgents and AgentModelUsageChart by projectId from /dev-plans/status
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
apps/code/src/app/dashboard/components/AgentModelUsageChart.tsx (1)
79-83:⚠️ Potential issue | 🟠 Major | 🏗️ Heavy liftAgent detail chart lost per-agent scoping and now renders project-wide data.
Line 79 and Line 181 only scope by
projectId, so in the agent-detail context this chart no longer matches the selected agent’s stats/table. Please restore an agent/source filter path for detail mode (or a dedicated detail query) so the chart remains consistent with the selected agent.Also applies to: 170-183
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@apps/code/src/app/dashboard/components/AgentModelUsageChart.tsx` around lines 79 - 83, The chart lost per-agent scoping because AgentModelUsageChart only accepts projectId; restore an agent/source filter by adding an agentId (or sourceId) prop to the AgentModelUsageChart component and ensure the data query / filter includes that identifier (e.g., add agentId to the query's where/filter conditions used to build ChartRow results). Update any call sites that render AgentModelUsageChart in detail mode to pass the selected agent's id, and ensure the data-fetching function or hook that produces ChartRow honors agentId when present (fall back to project-wide when agentId is undefined).
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@apps/code/src/app/dashboard/components/CodingAgents.tsx`:
- Around line 622-623: The query in the CodingAgents component is disabled when
projectId is missing (enabled: !!orgId && !!projectId) but the component still
renders the empty “No agent activity yet” state; update CodingAgents to
explicitly handle the missing projectId case instead of showing the empty-state
copy: add a guard early (if (!projectId) return null or a specific placeholder)
or add an explicit branch before the empty-state block that checks !projectId
and renders nothing or a different message; ensure you reference the existing
query config (enabled: !!orgId && !!projectId) and the empty-state rendering
logic so the component doesn’t present misleading “no activity” text when the
query was never run.
---
Duplicate comments:
In `@apps/code/src/app/dashboard/components/AgentModelUsageChart.tsx`:
- Around line 79-83: The chart lost per-agent scoping because
AgentModelUsageChart only accepts projectId; restore an agent/source filter by
adding an agentId (or sourceId) prop to the AgentModelUsageChart component and
ensure the data query / filter includes that identifier (e.g., add agentId to
the query's where/filter conditions used to build ChartRow results). Update any
call sites that render AgentModelUsageChart in detail mode to pass the selected
agent's id, and ensure the data-fetching function or hook that produces ChartRow
honors agentId when present (fall back to project-wide when agentId is
undefined).
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 20c3b891-a044-4444-9641-d6e548d34ae5
📒 Files selected for processing (4)
apps/code/src/app/dashboard/DashboardClient.tsxapps/code/src/app/dashboard/components/AgentModelUsageChart.tsxapps/code/src/app/dashboard/components/CodingAgents.tsxapps/code/src/app/dashboard/components/UsageOverview.tsx
smakosh
enabled auto-merge
May 12, 2026 10:21
smakosh
added this pull request to the merge queue
May 12, 2026
3 tasks
4 tasks
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
3 participants
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.
Limit the model breakdown chart and usage overview in the DevPass
dashboard to the API key(s) created for the dev plan, including any
previously rotated keys, so usage from API keys created via the
llmgateway dashboard for the same project is excluded.
Summary by CodeRabbit