diff --git a/acceptance/help/output.txt b/acceptance/help/output.txt
index dd59847c64..fdec5582b8 100644
--- a/acceptance/help/output.txt
+++ b/acceptance/help/output.txt
@@ -167,6 +167,7 @@ Developer Tools
 
 Additional Commands:
   account                                Databricks Account Commands
+  aitools                                Databricks AI Tools for coding agents
   api                                    Perform Databricks API call
   auth                                   Authentication related commands
   cache                                  Local cache related commands
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 014471f763..54658f6639 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/databricks/cli/cmd/psql"
+	aitoolscmd "github.com/databricks/cli/experimental/aitools/cmd"
 	ssh "github.com/databricks/cli/experimental/ssh/cmd"
 
 	"github.com/databricks/cli/cmd/account"
@@ -93,6 +94,7 @@ func New(ctx context.Context) *cobra.Command {
 	}
 
 	// Add other subcommands.
+	cli.AddCommand(aitoolscmd.NewAitoolsCmd())
 	cli.AddCommand(api.New())
 	cli.AddCommand(auth.New())
 	cli.AddCommand(completion.New())
diff --git a/cmd/experimental/experimental.go b/cmd/experimental/experimental.go
index eb3b7814e1..51e869ff16 100644
--- a/cmd/experimental/experimental.go
+++ b/cmd/experimental/experimental.go
@@ -20,7 +20,12 @@ 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(aitoolscmd.NewAitoolsCmd())
+	// Keep aitools under experimental as a hidden backward-compatibility alias.
+	// The primary command is now registered at the top level.
+	aitoolsAlias := aitoolscmd.NewAitoolsCmd()
+	aitoolsAlias.Hidden = true
+	aitoolsAlias.Deprecated = "use 'databricks aitools' instead"
+	cmd.AddCommand(aitoolsAlias)
 
 	return cmd
 }
diff --git a/experimental/aitools/cmd/aitools.go b/experimental/aitools/cmd/aitools.go
index f037ac1a22..d110401c00 100644
--- a/experimental/aitools/cmd/aitools.go
+++ b/experimental/aitools/cmd/aitools.go
@@ -6,9 +6,8 @@ import (
 
 func NewAitoolsCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:    "aitools",
-		Hidden: true,
-		Short:  "Databricks AI Tools for coding agents",
+		Use:   "aitools",
+		Short: "Databricks AI Tools for coding agents",
 		Long: `Manage Databricks AI Tools.
 
 Provides commands to: