feat(grid): Unify CLI commands and migrate usage team discovery by ShivainVij · Pull Request #169 · basetenlabs/baseten-cli

ShivainVij · 2026-10-19T17:21:14Z

🚀 What

Move the pre-release Grid commands into a consistent baseten grid hierarchy:

baseten harness setup|sync|status|harness-defaults|usage|teardown
→ baseten grid setup|sync|status|harness-defaults|usage|teardown
baseten route ...
→ baseten grid route ..., including api-key list|delete

The old top-level harness and route commands are removed without compatibility aliases.

Also absorbs #165: replace usage’s dependency on the removed user-teams settings endpoint with team discovery through /v1/teams and per-team settings requests through the Grid API.

💻 How

Grid command hierarchy

Rename command files, runners, flag structs, output types, helpers, and tests to follow the Grid hierarchy.
Keep Grid’s public command definitions and associated types together.
Group the existing Grid help and legacy-path rejection tests with the other Grid tests.
Update command references in help, examples, errors, and existing comments.
Update the Baseten Go SDK and use the /v1/grid/... API endpoints.
Preserve meaningful harness terminology, SDK-defined type names, runtime JSON field names, stored configuration, and credential handling.

Usage team discovery — absorbs #165

List the caller’s teams with GET /v1/teams.
Fetch settings for each selected team with
GET /v1/grid/team_settings/users/me?team_id=<id>.
Show usage across all the caller’s teams by default.
Allow --team to select one team by name or ID.
Preserve per-team spend/limit reporting, empty-team output, and the service-account authentication hint.
Adapt fix(harness): Read usage settings per team instead of the user teams listing #165’s tests to the Grid command paths and current API, retaining the existing usage coverage.

The combined implementation no longer calls
GET /v1/routes/settings/users/{user_id}/teams.

🧪 Testing

Full uncached Go test suite passes, including real Claude Code and Codex smoke tests.
Grid tests pass under the race detector, excluding the separately tested real-agent smoke test.
go vet ./... passes.
Native macOS and Linux/Windows cross-builds pass.
Formatting and whitespace checks pass.
Usage tests cover all-team output, team-name/ID filtering, unknown teams, empty teams, and per-team settings failures.

⏭️ Next steps

Planned follow-up PRs: (follow-ups completed here: #173)

grid team-settings and grid user-settings commands (new; including the
--team-becomes-optional change for setup/sync)
grid connection and grid classifier commands (new)

…listing The usage command listed your teams and your Code settings in each with GET /v1/routes/settings/users/me/teams, which is being removed. Use GET /v1/teams for your teams and GET /v1/routes/settings/teams/{team}/users/me for your settings in each, which say the same things. Org admins are members of every team, so they still see every team. Claude-Session: https://claude.ai/code/session_01UkWMh7GwDgbmR88spBWMEm

Copilot

🟡 Changes recommended

An existing usage test still invokes the removed harness usage path and will fail.

1 open issue

Update usage test to invoke the renamed grid command · New

What changed in this PR

Moves the CLI’s pre-release harness and route commands under baseten grid, preserving their flags and API behavior.

Changes:

Adds the Grid command tree and removes legacy root paths.
Updates runner registrations, help examples, and command hints.
Migrates existing tests and adds namespace regression coverage.

File	Description
internal/cmd/command.route.go	Re-registers route commands under Grid.
internal/cmd/command.route_usage.go	Moves route usage registration.
internal/cmd/command.route_usage_test.go	Updates route usage invocations.
internal/cmd/command.route_test.go	Updates route test paths.
internal/cmd/command.route_apikey.go	Updates key registrations and hints.
internal/cmd/command.route_apikey_test.go	Updates key-management test paths.
internal/cmd/command.harness.go	Updates harness registrations and hints.
internal/cmd/command.harness_usage.go	Registers Grid usage.
internal/cmd/command.harness_usage_test.go	Migrates usage test invocations.
internal/cmd/command.harness_test.go	Updates lifecycle tests and expected hints.
internal/cmd/command.harness_defaults.go	Moves defaults registration.
internal/cmd/command.harness_defaults_test.go	Updates defaults test paths.
internal/cmd/command_test.go	Adds help and legacy-path regression tests.
cmd/command.route.go	Updates route help and examples.
cmd/command.org.go	Updates API-key help wording.
cmd/command.harness.go	Retains shared types after moving declarations.
cmd/command.grid.go	Defines Grid and its command subtree.
cmd/command.go	Replaces legacy roots with Grid.

_{Review effort: Balanced}

Pins baseten-go to the client regenerated for the renamed Grid API, so every call site moves to the GetGrid*/PostGrid*/PatchGrid*/DeleteGrid* methods. grid usage now reads your settings from GET /v1/grid/team_settings/users/me and passes --team straight through as team_id: the server uses your only team, or asks for --team when you belong to several. The client-side team listing and name matching are gone, along with the "No usage this month" branch they fed. Claude-Session: https://claude.ai/code/session_01UkWMh7GwDgbmR88spBWMEm

youngzheng-oss · 2026-10-19T20:21:10Z

Pushed db76a44 on top of this branch (Young). It does the API half of the rename that this PR left for later, and addresses Chad's point on #165 about resolving teams server side.

What it changes

go.mod pins baseten-go to a client regenerated for the /v1/grid paths (branch young/grid-api-regen, from the backend stack https://github.com/basetenlabs/baseten/pull/34429 → https://github.com/basetenlabs/baseten/pull/34483 → https://github.com/basetenlabs/baseten/pull/34484). Method names follow the paths, so every call site moves to GetGridRoutes, GetGridSettingsTeams, GetGridRoutesUsage, and so on. Schema types are unchanged.
grid usage reads your settings from GET /v1/grid/team_settings/users/me and passes --team straight through as team_id. The server uses your only team, or returns "Team ID is required when you belong to multiple." The client-side team listing and name matching are gone, and --team is now an ID. Help text updated to match.
Test mocks moved to the new paths; the usage tests cover the single-team, multi-team 400, and explicit-team cases.

Sequencing: this needs the three backend PRs merged and the baseten-go regen merged and re-pinned before it can release, which matches Chad's note that the CLI rename cannot land ahead of the API. The mock-based suite passes; Test_Harness_Setup_RealHarness/opencode fails the same way on main.

CLAassistant · 2026-10-19T20:21:22Z

All committers have signed the CLA.

Preserve the source PR's all-team usage and team name/ID filtering while using the current Grid API and Grid-named files. Resolve the usage implementation and test conflicts without restoring legacy command files.

* adding functionality to cli * Update go.sum * adding functionality to cli

cretz · 2026-10-20T13:58:49Z

 					Summary: "List API keys",
 					Description: "List API keys (metadata only; key values are never returned). " +
-						"Routes API keys, which harness setup creates and manages, are listed only with --type routes.",
+						"Routes API keys, which grid setup creates and manages, are listed only with --type routes.",


I am curious, will we be changing this API key type to "grid routes" and/or do we potentially plan to get rid of this API key type altogether?

I think we need to support some long lived credentials for the near future, and calling it a Grid API key feels better than Grid Routes? Maybe that introduces some confusion on whether this API key is inference only vs gives the capability for Grid management as well.

I would vote for CLI documentation just calling this Grid API keys for now

Changed to say Grid API keys

But does this fix the problem? We still have an API key type API side called "routes" and that API key type will stay named "routes" forever?

We should probably update the API key type that is surfaced to end users from Routes -> Grid, internally not worth the migration. So I think this change is correct, and we can fast follow with the key type rename

cretz · 2026-10-20T14:55:03Z

 			ctx.LogLine("If you're using a team or workspace API key, run 'baseten auth login' to see your own usage.")
 		}
+	}
+	listing, err := api.GetTeams(ctx, managementapi.GetV1TeamsParams{})


Can you help me understand this a bit? Guess I didn't review this closely when it was first written, but why are we collecting user teams and making an API call per team here? Does this show there is a use case for getting settings across teams and that our assumption in API that you will only want settings for one team is incorrect?

@cretz how do you feel about us merging route usage and usage into a single command to simplify:

grid route usage [--team] [--user].

--team is required if the caller is part of multiple teams. if specified, --user must be in the team specified

you can pass in--user when you are an admin to see a specific user's usage, or no user. that'll give you usage for everyone in the team (resolved or explicit)

how do you feel about us merging route usage and usage into a single command to simplify:

I would be very much in favor of this and had suggested this (I always like CLI structure being close to API). See the comment I made on grid usage in the internal design document.

--team is required if the caller is part of multiple teams. if specified, --user must be in the team specified

IMO the team and user arguments (or their absence) should react the same as they do API side

@ShivainVij do you want to centralize around this? lemme know if this works for you too

cool! going to remove grid usage and all associated tests

`grid usage` listed your teams and fetched your settings in each to draw your spend against your limit, the one place the CLI still stitched teams together client-side. Per the review on this PR, usage is one command: `grid route usage [--team] [--user-id]`, whose arguments behave as the API does. Without --team, usage spans the teams you can see; without --user-id, members see their own usage and admins see everyone's. Your spend against your limit in a team is `grid user-settings describe`. Claude-Session: https://claude.ai/code/session_01UkWMh7GwDgbmR88spBWMEm

The list spans every team you can see unless --team narrows it, so two rows can share a name. A TEAM column, as the connection list already has, tells them apart. Claude-Session: https://claude.ai/code/session_01UkWMh7GwDgbmR88spBWMEm

cretz

Looks good, mostly only little stuff. Can also merge basetenlabs/baseten-go#70 and update go.mod here to use Go SDK main's commit hash

cretz · 2026-10-21T15:10:18Z

 					Summary: "List API keys",
 					Description: "List API keys (metadata only; key values are never returned). " +
-						"Routes API keys, which harness setup creates and manages, are listed only with --type routes.",
+						"Routes API keys, which grid setup creates and manages, are listed only with --type routes.",


But does this fix the problem? We still have an API key type API side called "routes" and that API key type will stay named "routes" forever?

cretz · 2026-10-21T15:19:46Z

+	CommandFlags
+	GridTeamFlags
+	Harness                  string               `flag:"harness" desc:"Harness whose default route IDs to update." enum:"claude-code,codex,opencode,pi"`
+	PrimaryRoute             OptionalFlag[string] `flag:"primary-route" desc:"Primary route ID; null clears the configured default. Requires --harness." nullable:"true"`


Technically this still is inconsistent in that we're asking users to refer to routes by different unique identifiers in different commands. But if you can confirm we are ok with this inconsistency, no prob.

youngzheng-oss and others added 2 commits October 15, 2026 09:42

grid rename

11378b5

Copilot AI balanced review requested due to automatic review settings October 19, 2026 17:21

Copilot started reviewing on behalf of ShivainVij October 19, 2026 17:21

View session

youngzheng-oss reviewed Oct 19, 2026

View reviewed changes

Comment thread cmd/command.grid_route.go Outdated

Copilot AI reviewed Oct 19, 2026

View reviewed changes

Comment thread cmd/command.go

ShivainVij and others added 2 commits October 19, 2026 10:59

Update command.harness_usage_test.go

2f35d1b

ShivainVij added 3 commits October 19, 2026 15:31

Merge branch 'main' into shivain/grid-rename

12e56e3

refactor(grid): align command files and symbols with Grid hierarchy

c518c93

Merge PR #165 usage team discovery into Grid commands

7397675

Preserve the source PR's all-team usage and team name/ID filtering while using the current Grid API and Grid-named files. Resolve the usage implementation and test conflicts without restoring legacy command files.

ShivainVij changed the title ~~feat(grid): Move harness and route commands under the grid namespace~~ feat(grid): Unify CLI commands and migrate usage team discovery Oct 19, 2026

ShivainVij added this pull request to stack #174 October 20, 2026 04:20

ShivainVij mentioned this pull request Oct 20, 2026

feat(grid): Add settings, connections, and classifier commands #173

Merged

Update go.sum

0ee24ff

ShivainVij removed this pull request from stack #174 October 20, 2026 09:18

feat(grid): Add settings, connections, and classifier commands (#173)

83efd56

* adding functionality to cli * Update go.sum * adding functionality to cli

cretz reviewed Oct 20, 2026

View reviewed changes

ShivainVij added 10 commits October 20, 2026 11:31

responding to comments (1)

9f45d0d

responding to comments (2)

208984d

renaming

a52e787

Update command.grid.go

d3f8bf5

Removing to match spec

1caded8

updating with new sdk

a827c61

grid settings flag rename to route id

19b14d8

updated create/update outputs to be concise confirmations

0125e94

Update command.grid_test.go

f26ba07

test renaming

bf1a1f2

ShivainVij and others added 4 commits October 20, 2026 14:46

matching create (use hasGridRouteClassifier)

a4802ba

Show the team in grid route list

0de0e7f

The list spans every team you can see unless --team narrows it, so two rows can share a name. A TEAM column, as the connection list already has, tells them apart. Claude-Session: https://claude.ai/code/session_01UkWMh7GwDgbmR88spBWMEm

Merge branch 'main' into shivain/grid-rename

93153d4

mingminglang-baseten mentioned this pull request Oct 21, 2026

Add promotion-time settings flags to model deployment promote #176

Merged

cretz reviewed Oct 21, 2026

View reviewed changes

talyaacovi mentioned this pull request Oct 21, 2026

Add hidden traffic-rule commands for environment shadow rules #179

Merged

ShivainVij added 8 commits October 21, 2026 10:32

inline cleanup

5a831f0

command. filename matching

858f076

more file org cleanup

aae186c

formatting

a04414f

defaultToCaller never set

8c6a384

Addressing more comments

600a2c1

show ids as well in route describe

cd785b5

updating SDK + use ID for setup command

b249c25

cretz approved these changes Oct 21, 2026

View reviewed changes

ShivainVij merged commit afbc2ff into main Oct 21, 2026
4 checks passed

ShivainVij deleted the shivain/grid-rename branch October 21, 2026 19:58

youngzheng-oss mentioned this pull request Oct 22, 2026

feat(grid): bring back grid usage with its spend chart #187

Closed

Conversation

ShivainVij commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 What

💻 How

Grid command hierarchy

Usage team discovery — absorbs #165

🧪 Testing

⏭️ Next steps

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

youngzheng-oss commented Oct 19, 2026

Uh oh!

CLAassistant commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cretz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ShivainVij commented Oct 19, 2026 •

edited

Loading

CLAassistant commented Oct 19, 2026 •

edited

Loading