From 6c80f238285d94fe58aa52a455917d10d2b31b7b Mon Sep 17 00:00:00 2001
From: riddhibhagwat-db <riddhi.bhagwat@databricks.com>
Date: Thu, 11 Jun 2026 18:52:04 +0000
Subject: [PATCH 1/2] experimental/air: scaffold AI runtime CLI command package

Add the experimental `air` command group as the Go port surface for the
Python `air` CLI. Every subcommand (run, status, list, logs, cancel,
register-image) is registered as a stub that returns a not-implemented
error; the real implementations land in later milestones.

The package lives under experimental/air/cmd (imported as aircmd), matching
the layout of the other experimental features (aitools, genie, postgres);
cmd/experimental/ keeps only the dispatcher. TEST_PACKAGES in Taskfile.yml
gains ./experimental/air/... so the unit tests keep running after the move.

Includes unit tests for the command-tree wiring and the not-implemented
stubs, plus an acceptance test exercising the stubs end-to-end.

Co-authored-by: Isaac
---
 Taskfile.yml                                  |  2 +-
 .../experimental/air/help/out.test.toml       |  3 ++
 acceptance/experimental/air/help/output.txt   | 29 ++++++++++++++
 acceptance/experimental/air/help/script       |  5 +++
 acceptance/experimental/air/help/test.toml    |  3 ++
 .../air/unimplemented/out.test.toml           |  3 ++
 .../experimental/air/unimplemented/output.txt | 36 +++++++++++++++++
 .../experimental/air/unimplemented/script     | 19 +++++++++
 .../experimental/air/unimplemented/test.toml  |  3 ++
 cmd/experimental/experimental.go              |  2 +
 experimental/air/cmd/air.go                   | 36 +++++++++++++++++
 experimental/air/cmd/air_test.go              | 22 +++++++++++
 experimental/air/cmd/cancel.go                | 39 +++++++++++++++++++
 experimental/air/cmd/list.go                  | 31 +++++++++++++++
 experimental/air/cmd/logs.go                  | 34 ++++++++++++++++
 experimental/air/cmd/register_image.go        | 33 ++++++++++++++++
 experimental/air/cmd/run.go                   | 36 +++++++++++++++++
 experimental/air/cmd/status.go                | 19 +++++++++
 experimental/air/cmd/stubs_test.go            | 31 +++++++++++++++
 19 files changed, 385 insertions(+), 1 deletion(-)
 create mode 100644 acceptance/experimental/air/help/out.test.toml
 create mode 100644 acceptance/experimental/air/help/output.txt
 create mode 100644 acceptance/experimental/air/help/script
 create mode 100644 acceptance/experimental/air/help/test.toml
 create mode 100644 acceptance/experimental/air/unimplemented/out.test.toml
 create mode 100644 acceptance/experimental/air/unimplemented/output.txt
 create mode 100644 acceptance/experimental/air/unimplemented/script
 create mode 100644 acceptance/experimental/air/unimplemented/test.toml
 create mode 100644 experimental/air/cmd/air.go
 create mode 100644 experimental/air/cmd/air_test.go
 create mode 100644 experimental/air/cmd/cancel.go
 create mode 100644 experimental/air/cmd/list.go
 create mode 100644 experimental/air/cmd/logs.go
 create mode 100644 experimental/air/cmd/register_image.go
 create mode 100644 experimental/air/cmd/run.go
 create mode 100644 experimental/air/cmd/status.go
 create mode 100644 experimental/air/cmd/stubs_test.go

diff --git a/Taskfile.yml b/Taskfile.yml
index d72140290e2..32cb14d0c43 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -4,7 +4,7 @@ vars:
   # Absolute path so tasks with `dir:` (lint-go-tools, lint-go-codegen) can use it.
   GO_TOOL: go tool -modfile={{.ROOT_DIR}}/tools/go.mod
   EXE_EXT: '{{if eq OS "windows"}}.exe{{end}}'
-  TEST_PACKAGES: ./acceptance/internal ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/ssh/... .
+  TEST_PACKAGES: ./acceptance/internal ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/air/... ./experimental/ssh/... .
   ACCEPTANCE_TEST_FILTER: ""
   # Single brace-expansion glob covering every //go:embed target in the repo,
   # computed by grepping `//go:embed` directives. Evaluated lazily by Task so
diff --git a/acceptance/experimental/air/help/out.test.toml b/acceptance/experimental/air/help/out.test.toml
new file mode 100644
index 00000000000..d6187dcb046
--- /dev/null
+++ b/acceptance/experimental/air/help/out.test.toml
@@ -0,0 +1,3 @@
+Local = true
+Cloud = false
+EnvMatrix.DATABRICKS_BUNDLE_ENGINE = []
diff --git a/acceptance/experimental/air/help/output.txt b/acceptance/experimental/air/help/output.txt
new file mode 100644
index 00000000000..cf7e5af634c
--- /dev/null
+++ b/acceptance/experimental/air/help/output.txt
@@ -0,0 +1,29 @@
+
+=== help
+>>> [CLI] experimental air --help
+Run and manage AI runtime training workloads on Databricks serverless GPU compute.
+
+This command set is the Go port of the standalone Python "air" CLI. It is
+experimental and may change in future versions.
+
+Usage:
+  databricks experimental air [command]
+
+Available Commands:
+  cancel         Cancel one or more runs
+  list           List recent runs
+  logs           Stream or fetch logs for a run
+  register-image Mirror a Docker image into the workspace registry
+  run            Submit a training workload from a YAML config
+  status         Show status and configuration for a run
+
+Flags:
+  -h, --help   help for air
+
+Global Flags:
+      --debug            enable debug logging
+  -o, --output type      output type: text or json (default text)
+  -p, --profile string   ~/.databrickscfg profile
+  -t, --target string    bundle target to use (if applicable)
+
+Use "databricks experimental air [command] --help" for more information about a command.
diff --git a/acceptance/experimental/air/help/script b/acceptance/experimental/air/help/script
new file mode 100644
index 00000000000..cd67a6fc1b1
--- /dev/null
+++ b/acceptance/experimental/air/help/script
@@ -0,0 +1,5 @@
+# Pin the command tree so any change to a subcommand or its short description
+# shows up as a diff here.
+
+title "help"
+trace $CLI experimental air --help
diff --git a/acceptance/experimental/air/help/test.toml b/acceptance/experimental/air/help/test.toml
new file mode 100644
index 00000000000..49709b578ef
--- /dev/null
+++ b/acceptance/experimental/air/help/test.toml
@@ -0,0 +1,3 @@
+# --help prints without authenticating, so no server stubs are needed.
+[EnvMatrix]
+DATABRICKS_BUNDLE_ENGINE = []
diff --git a/acceptance/experimental/air/unimplemented/out.test.toml b/acceptance/experimental/air/unimplemented/out.test.toml
new file mode 100644
index 00000000000..d6187dcb046
--- /dev/null
+++ b/acceptance/experimental/air/unimplemented/out.test.toml
@@ -0,0 +1,3 @@
+Local = true
+Cloud = false
+EnvMatrix.DATABRICKS_BUNDLE_ENGINE = []
diff --git a/acceptance/experimental/air/unimplemented/output.txt b/acceptance/experimental/air/unimplemented/output.txt
new file mode 100644
index 00000000000..3dc88de3b77
--- /dev/null
+++ b/acceptance/experimental/air/unimplemented/output.txt
@@ -0,0 +1,36 @@
+
+=== run
+>>> [CLI] experimental air run
+Error: `air run` is not implemented yet
+
+Exit code: 1
+
+=== status
+>>> [CLI] experimental air status 123
+Error: `air status` is not implemented yet
+
+Exit code: 1
+
+=== list
+>>> [CLI] experimental air list
+Error: `air list` is not implemented yet
+
+Exit code: 1
+
+=== logs
+>>> [CLI] experimental air logs 123
+Error: `air logs` is not implemented yet
+
+Exit code: 1
+
+=== cancel
+>>> [CLI] experimental air cancel 123
+Error: `air cancel` is not implemented yet
+
+Exit code: 1
+
+=== register-image
+>>> [CLI] experimental air register-image my-image:latest
+Error: `air register-image` is not implemented yet
+
+Exit code: 1
diff --git a/acceptance/experimental/air/unimplemented/script b/acceptance/experimental/air/unimplemented/script
new file mode 100644
index 00000000000..83397b4b741
--- /dev/null
+++ b/acceptance/experimental/air/unimplemented/script
@@ -0,0 +1,19 @@
+# Each stub must fail with "not implemented"; errcode records the exit code.
+
+title "run"
+errcode trace $CLI experimental air run
+
+title "status"
+errcode trace $CLI experimental air status 123
+
+title "list"
+errcode trace $CLI experimental air list
+
+title "logs"
+errcode trace $CLI experimental air logs 123
+
+title "cancel"
+errcode trace $CLI experimental air cancel 123
+
+title "register-image"
+errcode trace $CLI experimental air register-image my-image:latest
diff --git a/acceptance/experimental/air/unimplemented/test.toml b/acceptance/experimental/air/unimplemented/test.toml
new file mode 100644
index 00000000000..c233c30a86c
--- /dev/null
+++ b/acceptance/experimental/air/unimplemented/test.toml
@@ -0,0 +1,3 @@
+# Stubs fail locally before any API call, so no server stubs needed.
+[EnvMatrix]
+DATABRICKS_BUNDLE_ENGINE = []
diff --git a/cmd/experimental/experimental.go b/cmd/experimental/experimental.go
index 8d9827c5c94..d87c893abc5 100644
--- a/cmd/experimental/experimental.go
+++ b/cmd/experimental/experimental.go
@@ -1,6 +1,7 @@
 package experimental
 
 import (
+	aircmd "github.com/databricks/cli/experimental/air/cmd"
 	aitoolscmd "github.com/databricks/cli/experimental/aitools/cmd"
 	geniecmd "github.com/databricks/cli/experimental/genie/cmd"
 	postgrescmd "github.com/databricks/cli/experimental/postgres/cmd"
@@ -22,6 +23,7 @@ These commands provide early access to new features that are still under
 development. They may change or be removed in future versions without notice.`,
 	}
 
+	cmd.AddCommand(aircmd.New())
 	cmd.AddCommand(aitoolscmd.NewAitoolsCmd())
 	cmd.AddCommand(geniecmd.NewGenieCmd())
 	cmd.AddCommand(postgrescmd.New())
diff --git a/experimental/air/cmd/air.go b/experimental/air/cmd/air.go
new file mode 100644
index 00000000000..3f9122c828c
--- /dev/null
+++ b/experimental/air/cmd/air.go
@@ -0,0 +1,36 @@
+package aircmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+// New returns the root command for the experimental AI runtime CLI.
+//
+// Milestone 0: scaffolds the command group with every subcommand registered as a
+// stub (not yet implemented), pending the port from the Python `air` CLI.
+func New() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "air",
+		Short: "Run and manage AI runtime training workloads",
+		Long: `Run and manage AI runtime training workloads on Databricks serverless GPU compute.
+
+This command set is the Go port of the standalone Python "air" CLI. It is
+experimental and may change in future versions.`,
+	}
+
+	cmd.AddCommand(newRunCommand())
+	cmd.AddCommand(newStatusCommand())
+	cmd.AddCommand(newListCommand())
+	cmd.AddCommand(newLogsCommand())
+	cmd.AddCommand(newCancelCommand())
+	cmd.AddCommand(newRegisterImageCommand())
+
+	return cmd
+}
+
+// notImplemented returns the placeholder error used by milestone-0 stubs.
+func notImplemented(name string) error {
+	return fmt.Errorf("`air %s` is not implemented yet", name)
+}
diff --git a/experimental/air/cmd/air_test.go b/experimental/air/cmd/air_test.go
new file mode 100644
index 00000000000..26268690850
--- /dev/null
+++ b/experimental/air/cmd/air_test.go
@@ -0,0 +1,22 @@
+package aircmd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// TestNewRegistersAllSubcommands asserts the `air` command wires up every
+// expected subcommand, so none is accidentally dropped from New.
+func TestNewRegistersAllSubcommands(t *testing.T) {
+	registered := make(map[string]bool)
+	for _, c := range New().Commands() {
+		registered[c.Name()] = true
+	}
+
+	want := []string{"run", "status", "list", "logs", "cancel", "register-image"}
+	for _, name := range want {
+		assert.True(t, registered[name], "subcommand %q is not registered", name)
+	}
+	assert.Len(t, registered, len(want), "unexpected number of subcommands")
+}
diff --git a/experimental/air/cmd/cancel.go b/experimental/air/cmd/cancel.go
new file mode 100644
index 00000000000..ad7fffc7125
--- /dev/null
+++ b/experimental/air/cmd/cancel.go
@@ -0,0 +1,39 @@
+package aircmd
+
+import (
+	"github.com/databricks/cli/cmd/root"
+	"github.com/spf13/cobra"
+)
+
+func newCancelCommand() *cobra.Command {
+	var (
+		all bool
+		yes bool
+	)
+
+	cmd := &cobra.Command{
+		Use:   "cancel [RUN_ID...]",
+		Short: "Cancel one or more runs",
+		Long:  `Cancel one or more runs by ID, or cancel all of your active runs with --all.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return notImplemented("cancel")
+		},
+	}
+
+	cmd.Flags().BoolVar(&all, "all", false, "Cancel all of your active runs")
+	cmd.Flags().BoolVarP(&yes, "yes", "y", false, "Skip the confirmation prompt")
+
+	// Require exactly one of: one or more RUN_IDs, or --all. Cobra parses flags
+	// before running this, so `all` reflects the user's input.
+	cmd.Args = func(cmd *cobra.Command, args []string) error {
+		switch {
+		case all && len(args) > 0:
+			return &root.InvalidArgsError{Command: cmd, Message: "cannot combine RUN_ID arguments with --all"}
+		case !all && len(args) == 0:
+			return &root.InvalidArgsError{Command: cmd, Message: "provide at least one RUN_ID, or use --all"}
+		}
+		return nil
+	}
+
+	return cmd
+}
diff --git a/experimental/air/cmd/list.go b/experimental/air/cmd/list.go
new file mode 100644
index 00000000000..bf24cff9b23
--- /dev/null
+++ b/experimental/air/cmd/list.go
@@ -0,0 +1,31 @@
+package aircmd
+
+import (
+	"github.com/databricks/cli/cmd/root"
+	"github.com/spf13/cobra"
+)
+
+func newListCommand() *cobra.Command {
+	var (
+		limit    int
+		active   bool
+		allUsers bool
+		filters  []string
+	)
+
+	cmd := &cobra.Command{
+		Use:   "list",
+		Args:  root.NoArgs,
+		Short: "List recent runs",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return notImplemented("list")
+		},
+	}
+
+	cmd.Flags().IntVar(&limit, "limit", 20, "Maximum number of runs to show")
+	cmd.Flags().BoolVar(&active, "active", false, "Show only active runs")
+	cmd.Flags().BoolVar(&allUsers, "all-users", false, "Show runs from all users")
+	cmd.Flags().StringArrayVar(&filters, "filter", nil, "Filter runs, e.g. experiment=foo* (repeatable)")
+
+	return cmd
+}
diff --git a/experimental/air/cmd/logs.go b/experimental/air/cmd/logs.go
new file mode 100644
index 00000000000..4dbbe41c278
--- /dev/null
+++ b/experimental/air/cmd/logs.go
@@ -0,0 +1,34 @@
+package aircmd
+
+import (
+	"github.com/databricks/cli/cmd/root"
+	"github.com/spf13/cobra"
+)
+
+func newLogsCommand() *cobra.Command {
+	var (
+		node       int
+		lines      int
+		retry      int
+		downloadTo string
+		review     bool
+	)
+
+	cmd := &cobra.Command{
+		Use:   "logs RUN_ID",
+		Args:  root.ExactArgs(1),
+		Short: "Stream or fetch logs for a run",
+		Long:  `Stream logs from an active run, or fetch logs from a completed run.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return notImplemented("logs")
+		},
+	}
+
+	cmd.Flags().IntVar(&node, "node", 0, "Fetch logs from this node")
+	cmd.Flags().IntVar(&lines, "lines", 10000, "For completed runs, print the last N lines")
+	cmd.Flags().IntVar(&retry, "retry", -1, "View logs from a specific retry attempt; -1 means latest")
+	cmd.Flags().StringVar(&downloadTo, "download-to", "", "Download all logs to this directory instead of printing")
+	cmd.Flags().BoolVar(&review, "review", false, "Download logs from all nodes and filter for error signatures")
+
+	return cmd
+}
diff --git a/experimental/air/cmd/register_image.go b/experimental/air/cmd/register_image.go
new file mode 100644
index 00000000000..a5be3df408b
--- /dev/null
+++ b/experimental/air/cmd/register_image.go
@@ -0,0 +1,33 @@
+package aircmd
+
+import (
+	"github.com/databricks/cli/cmd/root"
+	"github.com/spf13/cobra"
+)
+
+func newRegisterImageCommand() *cobra.Command {
+	var (
+		scope           string
+		key             string
+		interactiveAuth bool
+		tagPolicy       string
+		timeoutMinutes  int
+	)
+
+	cmd := &cobra.Command{
+		Use:   "register-image IMAGE_URL",
+		Args:  root.ExactArgs(1),
+		Short: "Mirror a Docker image into the workspace registry",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return notImplemented("register-image")
+		},
+	}
+
+	cmd.Flags().StringVar(&scope, "scope", "", "Databricks secret scope holding registry credentials")
+	cmd.Flags().StringVar(&key, "key", "", "Databricks secret key holding registry credentials")
+	cmd.Flags().BoolVar(&interactiveAuth, "interactive-authenticate", false, "Prompt for registry credentials and store them as a secret")
+	cmd.Flags().StringVar(&tagPolicy, "tag-policy", "auto", "Image resolution policy: auto or latest")
+	cmd.Flags().IntVar(&timeoutMinutes, "timeout-minutes", 60, "Timeout to wait for the image to become available")
+
+	return cmd
+}
diff --git a/experimental/air/cmd/run.go b/experimental/air/cmd/run.go
new file mode 100644
index 00000000000..0bc3d1fd94b
--- /dev/null
+++ b/experimental/air/cmd/run.go
@@ -0,0 +1,36 @@
+package aircmd
+
+import (
+	"github.com/databricks/cli/cmd/root"
+	"github.com/spf13/cobra"
+)
+
+func newRunCommand() *cobra.Command {
+	var (
+		file           string
+		watch          bool
+		overrides      []string
+		dryRun         bool
+		idempotencyKey string
+	)
+
+	cmd := &cobra.Command{
+		Use:   "run",
+		Args:  root.NoArgs,
+		Short: "Submit a training workload from a YAML config",
+		Long: `Submit a training workload to Databricks serverless GPU compute.
+
+The workload is described by a YAML config file (see --file).`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return notImplemented("run")
+		},
+	}
+
+	cmd.Flags().StringVarP(&file, "file", "f", "", "Path to the workload YAML config")
+	cmd.Flags().BoolVar(&watch, "watch", false, "Stream logs until the run completes")
+	cmd.Flags().StringArrayVar(&overrides, "override", nil, "Override a YAML field, e.g. compute.num_accelerators=8 (repeatable)")
+	cmd.Flags().BoolVar(&dryRun, "dry-run", false, "Validate the config without submitting")
+	cmd.Flags().StringVar(&idempotencyKey, "idempotency-key", "", "Return the existing run if this key was already used")
+
+	return cmd
+}
diff --git a/experimental/air/cmd/status.go b/experimental/air/cmd/status.go
new file mode 100644
index 00000000000..a0db0619331
--- /dev/null
+++ b/experimental/air/cmd/status.go
@@ -0,0 +1,19 @@
+package aircmd
+
+import (
+	"github.com/databricks/cli/cmd/root"
+	"github.com/spf13/cobra"
+)
+
+func newStatusCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "status RUN_ID",
+		Args:  root.ExactArgs(1),
+		Short: "Show status and configuration for a run",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return notImplemented("status")
+		},
+	}
+
+	return cmd
+}
diff --git a/experimental/air/cmd/stubs_test.go b/experimental/air/cmd/stubs_test.go
new file mode 100644
index 00000000000..8ffd197973f
--- /dev/null
+++ b/experimental/air/cmd/stubs_test.go
@@ -0,0 +1,31 @@
+package aircmd
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// TestStubCommandsReturnNotImplemented asserts each unimplemented subcommand
+// fails with a "not implemented" error. Drop a command here once it lands.
+func TestStubCommandsReturnNotImplemented(t *testing.T) {
+	stubs := map[string]*cobra.Command{
+		"run":            newRunCommand(),
+		"status":         newStatusCommand(),
+		"list":           newListCommand(),
+		"logs":           newLogsCommand(),
+		"cancel":         newCancelCommand(),
+		"register-image": newRegisterImageCommand(),
+	}
+
+	for name, cmd := range stubs {
+		t.Run(name, func(t *testing.T) {
+			require.NotNil(t, cmd.RunE, "command should define RunE")
+			err := cmd.RunE(cmd, nil)
+			assert.EqualError(t, err, fmt.Sprintf("`air %s` is not implemented yet", name))
+		})
+	}
+}

From 059bd61ca8e04f4e2ecd4f3c6c92c45f98208b99 Mon Sep 17 00:00:00 2001
From: riddhibhagwat-db <riddhi.bhagwat@databricks.com>
Date: Fri, 12 Jun 2026 23:10:23 +0000
Subject: [PATCH 2/2] experimental/air: rename `status` subcommand to `get`

Rename the run-details subcommand from `status` to `get`, matching the Python
air CLI's current `air get run` naming (it replaced `get status`). Renames the
file, constructor, command name, and updates the stub/help/unimplemented tests
and goldens accordingly.

Co-authored-by: Isaac
---
 acceptance/experimental/air/help/output.txt          | 2 +-
 acceptance/experimental/air/unimplemented/output.txt | 6 +++---
 acceptance/experimental/air/unimplemented/script     | 4 ++--
 experimental/air/cmd/air.go                          | 2 +-
 experimental/air/cmd/air_test.go                     | 2 +-
 experimental/air/cmd/{status.go => get.go}           | 8 ++++----
 experimental/air/cmd/stubs_test.go                   | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename experimental/air/cmd/{status.go => get.go} (59%)

diff --git a/acceptance/experimental/air/help/output.txt b/acceptance/experimental/air/help/output.txt
index cf7e5af634c..3a0f86e164f 100644
--- a/acceptance/experimental/air/help/output.txt
+++ b/acceptance/experimental/air/help/output.txt
@@ -11,11 +11,11 @@ Usage:
 
 Available Commands:
   cancel         Cancel one or more runs
+  get            Show details for a run
   list           List recent runs
   logs           Stream or fetch logs for a run
   register-image Mirror a Docker image into the workspace registry
   run            Submit a training workload from a YAML config
-  status         Show status and configuration for a run
 
 Flags:
   -h, --help   help for air
diff --git a/acceptance/experimental/air/unimplemented/output.txt b/acceptance/experimental/air/unimplemented/output.txt
index 3dc88de3b77..4a07a38a378 100644
--- a/acceptance/experimental/air/unimplemented/output.txt
+++ b/acceptance/experimental/air/unimplemented/output.txt
@@ -5,9 +5,9 @@ Error: `air run` is not implemented yet
 
 Exit code: 1
 
-=== status
->>> [CLI] experimental air status 123
-Error: `air status` is not implemented yet
+=== get
+>>> [CLI] experimental air get 123
+Error: `air get` is not implemented yet
 
 Exit code: 1
 
diff --git a/acceptance/experimental/air/unimplemented/script b/acceptance/experimental/air/unimplemented/script
index 83397b4b741..2ed885c0e66 100644
--- a/acceptance/experimental/air/unimplemented/script
+++ b/acceptance/experimental/air/unimplemented/script
@@ -3,8 +3,8 @@
 title "run"
 errcode trace $CLI experimental air run
 
-title "status"
-errcode trace $CLI experimental air status 123
+title "get"
+errcode trace $CLI experimental air get 123
 
 title "list"
 errcode trace $CLI experimental air list
diff --git a/experimental/air/cmd/air.go b/experimental/air/cmd/air.go
index 3f9122c828c..81ffb2dd346 100644
--- a/experimental/air/cmd/air.go
+++ b/experimental/air/cmd/air.go
@@ -21,7 +21,7 @@ experimental and may change in future versions.`,
 	}
 
 	cmd.AddCommand(newRunCommand())
-	cmd.AddCommand(newStatusCommand())
+	cmd.AddCommand(newGetCommand())
 	cmd.AddCommand(newListCommand())
 	cmd.AddCommand(newLogsCommand())
 	cmd.AddCommand(newCancelCommand())
diff --git a/experimental/air/cmd/air_test.go b/experimental/air/cmd/air_test.go
index 26268690850..7efac253a2b 100644
--- a/experimental/air/cmd/air_test.go
+++ b/experimental/air/cmd/air_test.go
@@ -14,7 +14,7 @@ func TestNewRegistersAllSubcommands(t *testing.T) {
 		registered[c.Name()] = true
 	}
 
-	want := []string{"run", "status", "list", "logs", "cancel", "register-image"}
+	want := []string{"run", "get", "list", "logs", "cancel", "register-image"}
 	for _, name := range want {
 		assert.True(t, registered[name], "subcommand %q is not registered", name)
 	}
diff --git a/experimental/air/cmd/status.go b/experimental/air/cmd/get.go
similarity index 59%
rename from experimental/air/cmd/status.go
rename to experimental/air/cmd/get.go
index a0db0619331..0ab0b8226bf 100644
--- a/experimental/air/cmd/status.go
+++ b/experimental/air/cmd/get.go
@@ -5,13 +5,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func newStatusCommand() *cobra.Command {
+func newGetCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "status RUN_ID",
+		Use:   "get RUN_ID",
 		Args:  root.ExactArgs(1),
-		Short: "Show status and configuration for a run",
+		Short: "Show details for a run",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return notImplemented("status")
+			return notImplemented("get")
 		},
 	}
 
diff --git a/experimental/air/cmd/stubs_test.go b/experimental/air/cmd/stubs_test.go
index 8ffd197973f..a6e24177f33 100644
--- a/experimental/air/cmd/stubs_test.go
+++ b/experimental/air/cmd/stubs_test.go
@@ -14,7 +14,7 @@ import (
 func TestStubCommandsReturnNotImplemented(t *testing.T) {
 	stubs := map[string]*cobra.Command{
 		"run":            newRunCommand(),
-		"status":         newStatusCommand(),
+		"get":            newGetCommand(),
 		"list":           newListCommand(),
 		"logs":           newLogsCommand(),
 		"cancel":         newCancelCommand(),