From 0dc3126e2cdf52397d0ae0ca9c0e4c0186b8b6d8 Mon Sep 17 00:00:00 2001 From: Caroline Chen <324939130+caroline-db@users.noreply.github.com> Date: Fri, 25 Sep 2026 19:25:55 +0000 Subject: [PATCH 1/4] air: group commands under AI Runtime in root help --- acceptance/help/output.txt | 4 +++- cmd/air/air.go | 5 +++-- cmd/air/air_test.go | 7 +++++++ cmd/cmd.go | 14 ++++++++++---- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/acceptance/help/output.txt b/acceptance/help/output.txt index d572b4c32a3..6d4999763cd 100644 --- a/acceptance/help/output.txt +++ b/acceptance/help/output.txt @@ -177,13 +177,15 @@ Environments Domains domains *Beta* Manage domains for organizing and discovering data assets. +AI Runtime + air *Public Preview* Run and manage AI Runtime training workloads + Developer Tools bundle Declarative Automation Bundles let you express data/AI/analytics projects as code. sync Synchronize a local directory to a workspace directory Additional Commands: account Databricks Account Commands - air Run and manage AI Runtime training workloads aitools Databricks skills and plugins for coding agents api Perform Databricks API call auth Authentication related commands diff --git a/cmd/air/air.go b/cmd/air/air.go index 928a62b7c0f..64344729549 100644 --- a/cmd/air/air.go +++ b/cmd/air/air.go @@ -10,8 +10,9 @@ import ( // New returns the root command for the AI Runtime CLI. func New() *cobra.Command { cmd := &cobra.Command{ - Use: "air", - Short: "Run and manage AI Runtime training workloads", + Use: "air", + Short: "*Public Preview* Run and manage AI Runtime training workloads", + GroupID: "air", Long: `Run and manage AI Runtime training workloads on Databricks serverless GPU compute. These commands are under active development.`, diff --git a/cmd/air/air_test.go b/cmd/air/air_test.go index 39a84eed2ef..ee1adc5caa6 100644 --- a/cmd/air/air_test.go +++ b/cmd/air/air_test.go @@ -23,6 +23,13 @@ func TestNewRegistersAllSubcommands(t *testing.T) { assert.Len(t, registered, len(want), "unexpected number of subcommands") } +func TestNewHelpMetadata(t *testing.T) { + cmd := New() + + assert.Equal(t, "air", cmd.GroupID) + assert.Contains(t, cmd.Short, "*Public Preview*") +} + func TestRunErrorIncludesDebugTip(t *testing.T) { originalErr := errors.New("failed") runCommand := &cobra.Command{ diff --git a/cmd/cmd.go b/cmd/cmd.go index 7888af65068..57a3a0944f3 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -126,10 +126,16 @@ func New(ctx context.Context) *cobra.Command { cli.AddCommand(ssh.New()) // Add workspace command groups, filtering out empty groups or groups with only hidden commands. - configureGroups(cli, append(workspace.Groups(), cobra.Group{ - ID: "development", - Title: "Developer Tools", - })) + configureGroups(cli, append(workspace.Groups(), + cobra.Group{ + ID: "air", + Title: "AI Runtime", + }, + cobra.Group{ + ID: "development", + Title: "Developer Tools", + }, + )) return cli } From 22453887acd6343d6b3dd04762877666583f2f2e Mon Sep 17 00:00:00 2001 From: Caroline Chen <324939130+caroline-db@users.noreply.github.com> Date: Fri, 25 Sep 2026 19:26:31 +0000 Subject: [PATCH 2/4] air: add changelog entry --- .nextchanges/cli/air-help-group.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nextchanges/cli/air-help-group.md diff --git a/.nextchanges/cli/air-help-group.md b/.nextchanges/cli/air-help-group.md new file mode 100644 index 00000000000..be75c2067f2 --- /dev/null +++ b/.nextchanges/cli/air-help-group.md @@ -0,0 +1 @@ +* Group `air` commands under AI Runtime and label them as Public Preview in root help. ([#6846](https://github.com/databricks/cli/pull/6846)) From 0423780208028f11d63c21da0d816721a5420bca Mon Sep 17 00:00:00 2001 From: Caroline Chen <324939130+caroline-db@users.noreply.github.com> Date: Fri, 2 Oct 2026 14:18:15 +0000 Subject: [PATCH 3/4] air: group commands under developer tools --- .nextchanges/cli/air-help-group.md | 2 +- acceptance/help/output.txt | 4 +--- cmd/air/air.go | 2 +- cmd/air/air_test.go | 2 +- cmd/cmd.go | 14 ++++---------- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.nextchanges/cli/air-help-group.md b/.nextchanges/cli/air-help-group.md index be75c2067f2..8c549eca050 100644 --- a/.nextchanges/cli/air-help-group.md +++ b/.nextchanges/cli/air-help-group.md @@ -1 +1 @@ -* Group `air` commands under AI Runtime and label them as Public Preview in root help. ([#6846](https://github.com/databricks/cli/pull/6846)) +* Group `air` commands under Developer Tools and label them as Public Preview in root help. ([#6846](https://github.com/databricks/cli/pull/6846)) diff --git a/acceptance/help/output.txt b/acceptance/help/output.txt index 6d4999763cd..2f32ff953d9 100644 --- a/acceptance/help/output.txt +++ b/acceptance/help/output.txt @@ -177,10 +177,8 @@ Environments Domains domains *Beta* Manage domains for organizing and discovering data assets. -AI Runtime - air *Public Preview* Run and manage AI Runtime training workloads - Developer Tools + air *Public Preview* Run and manage AI Runtime training workloads bundle Declarative Automation Bundles let you express data/AI/analytics projects as code. sync Synchronize a local directory to a workspace directory diff --git a/cmd/air/air.go b/cmd/air/air.go index 64344729549..2fae3f3cb7f 100644 --- a/cmd/air/air.go +++ b/cmd/air/air.go @@ -12,7 +12,7 @@ func New() *cobra.Command { cmd := &cobra.Command{ Use: "air", Short: "*Public Preview* Run and manage AI Runtime training workloads", - GroupID: "air", + GroupID: "development", Long: `Run and manage AI Runtime training workloads on Databricks serverless GPU compute. These commands are under active development.`, diff --git a/cmd/air/air_test.go b/cmd/air/air_test.go index ee1adc5caa6..f6f497bfa8f 100644 --- a/cmd/air/air_test.go +++ b/cmd/air/air_test.go @@ -26,7 +26,7 @@ func TestNewRegistersAllSubcommands(t *testing.T) { func TestNewHelpMetadata(t *testing.T) { cmd := New() - assert.Equal(t, "air", cmd.GroupID) + assert.Equal(t, "development", cmd.GroupID) assert.Contains(t, cmd.Short, "*Public Preview*") } diff --git a/cmd/cmd.go b/cmd/cmd.go index 57a3a0944f3..7888af65068 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -126,16 +126,10 @@ func New(ctx context.Context) *cobra.Command { cli.AddCommand(ssh.New()) // Add workspace command groups, filtering out empty groups or groups with only hidden commands. - configureGroups(cli, append(workspace.Groups(), - cobra.Group{ - ID: "air", - Title: "AI Runtime", - }, - cobra.Group{ - ID: "development", - Title: "Developer Tools", - }, - )) + configureGroups(cli, append(workspace.Groups(), cobra.Group{ + ID: "development", + Title: "Developer Tools", + })) return cli } From a47ddbcff19f0a573907756dd0dc7b1aba256432 Mon Sep 17 00:00:00 2001 From: Caroline Chen <324939130+caroline-db@users.noreply.github.com> Date: Fri, 2 Oct 2026 14:24:37 +0000 Subject: [PATCH 4/4] air: remove changelog entry --- .nextchanges/cli/air-help-group.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .nextchanges/cli/air-help-group.md diff --git a/.nextchanges/cli/air-help-group.md b/.nextchanges/cli/air-help-group.md deleted file mode 100644 index 8c549eca050..00000000000 --- a/.nextchanges/cli/air-help-group.md +++ /dev/null @@ -1 +0,0 @@ -* Group `air` commands under Developer Tools and label them as Public Preview in root help. ([#6846](https://github.com/databricks/cli/pull/6846))