Rename experimental/apps-mcp to experimental/aitools

.github/CODEOWNERS

@@ -8,4 +8,4 @@
 /libs/apps/               @databricks/eng-app-devex
 /acceptance/apps/         @databricks/eng-app-devex
 /experimental/aitools/    @databricks/eng-app-devex @lennartkats-db
-/experimental/apps-mcp/   @databricks/eng-app-devex @lennartkats-db
+/experimental/aitools/   @databricks/eng-app-devex @lennartkats-db

.github/workflows/push.yml

@@ -155,37 +155,6 @@ jobs:
     name: "make test-exp-aitools"
     runs-on: ${{ matrix.os }}
 
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
-
-    steps:
-      - name: Checkout repository and submodules
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup build environment
-        uses: ./.github/actions/setup-build-environment
-        with:
-          cache-key: test-exp-aitools
-
-      - name: Run tests
-        run: |
-          make test-exp-aitools
-
-  test-exp-apps-mcp:
-    needs:
-      - cleanups
-      - testmask
-
-    # Only run if the target is in the list of targets from testmask
-    if: ${{ contains(fromJSON(needs.testmask.outputs.targets), 'test-exp-apps-mcp') }}
-    name: "make test-exp-apps-mcp"
-    runs-on: ${{ matrix.os }}
-
     strategy:
       fail-fast: false
       matrix:
@@ -202,11 +171,11 @@ jobs:
       - name: Setup build environment
         uses: ./.github/actions/setup-build-environment
         with:
-          cache-key: test-exp-apps-mcp
+          cache-key: test-exp-aitools
 
       - name: Run tests
         run: |
-          make test-exp-apps-mcp
+          make test-exp-aitools
 
   test-exp-ssh:
     needs:
@@ -283,7 +252,6 @@ jobs:
     needs:
       - test
       - test-exp-aitools
-      - test-exp-apps-mcp
       - test-exp-ssh
       - test-pipelines
 

Makefile

@@ -176,9 +176,6 @@ generate:
 test-exp-aitools:
 	make test TEST_PACKAGES="./experimental/aitools/..." ACCEPTANCE_TEST_FILTER="TestAccept/idontexistyet/aitools"
 
-test-exp-apps-mcp:
-	make test TEST_PACKAGES="./experimental/apps-mcp/..." ACCEPTANCE_TEST_FILTER="TestAccept/idontexistyet/apps-mcp"
-
 test-exp-ssh:
 	make test TEST_PACKAGES="./experimental/ssh/..." ACCEPTANCE_TEST_FILTER="TestAccept/ssh"
 

cmd/experimental/experimental.go

@@ -1,8 +1,7 @@
 package experimental
 
 import (
-	"github.com/databricks/cli/experimental/aitools"
-	mcp "github.com/databricks/cli/experimental/apps-mcp/cmd"
+	mcp "github.com/databricks/cli/experimental/aitools/cmd"
 	"github.com/spf13/cobra"
 )
 
@@ -21,7 +20,6 @@ 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(aitools.New())
 	cmd.AddCommand(mcp.NewMcpCmd())
 
 	return cmd

experimental/apps-mcp/README.md → experimental/aitools/README.md

@@ -1,4 +1,4 @@
-# Databricks MCP Server
+# Databricks aitools Server
 
 A Model Context Protocol (MCP) server for working with Databricks through natural language. This server provides tools for data exploration, workspace management, and executing Databricks CLI commands through AI-powered conversations.
 
@@ -17,19 +17,19 @@ A Model Context Protocol (MCP) server for working with Databricks through natura
 - **Conversational interface**: Work with Databricks using natural language instead of memorizing CLI commands
 - **Context-aware**: Get relevant command suggestions based on your workspace configuration
 - **Unified workflow**: Combine data exploration, bundle management, and app deployment in one tool
-- **Transparency**: Every MCP tool call displays clear, branded output so you always know when Databricks MCP is working
+- **Transparency**: Every MCP tool call displays clear, branded output so you always know when Databricks aitools is working
 
 Perfect for data engineers and developers who want to streamline their Databricks workflows with AI-powered assistance.
 
 **Visual Feedback:**
-When using Databricks MCP, you'll see distinctive branded headers in your chat:
+When using Databricks aitools, you'll see distinctive branded headers in your chat:
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-🚀 Databricks MCP: App scaffolded successfully
+🚀 Databricks aitools: App scaffolded successfully
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ```
 
-This makes it immediately clear you're using the Databricks MCP server, not just plain Claude or Cursor. If you don't see these headers, the MCP server isn't connected (see Troubleshooting below).
+This makes it immediately clear you're using the Databricks aitools server, not just plain Claude or Cursor. If you don't see these headers, the MCP server isn't connected (see Troubleshooting below).
 
 ---
 
@@ -39,7 +39,7 @@ This makes it immediately clear you're using the Databricks MCP server, not just
 
 1. **Install the MCP server automatically:**
    ```bash
-   databricks experimental apps-mcp install
+   databricks experimental aitools install
    ```
 
    This interactive command will:
@@ -111,16 +111,16 @@ Then restart your MCP client for changes to take effect
 
 ### Troubleshooting
 
-#### 🚨 Not seeing Databricks MCP headers in your chat?
+#### 🚨 Not seeing Databricks aitools headers in your chat?
 
 If you ask about Databricks or apps but **don't see the distinctive headers** like:
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-🚀 Databricks MCP: App scaffolded successfully
+🚀 Databricks aitools: App scaffolded successfully
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ```
 
-**You're using plain Claude/Cursor, not the Databricks MCP server!** This means:
+**You're using plain Claude/Cursor, not the Databricks aitools server!** This means:
 - ❌ No access to Databricks data or tools
 - ❌ Generic AI responses instead of actual app generation
 - ❌ No scaffolding, validation, or deployment capabilities
@@ -156,7 +156,7 @@ If the MCP server doesn't connect or shows errors:
 5. **Check Databricks CLI:** Verify the CLI is installed and accessible:
    ```bash
    databricks --version
-   databricks experimental apps-mcp --help
+   databricks experimental aitools --help
    ```
 
 6. **Test authentication:** Try listing catalogs to verify credentials work:
@@ -175,7 +175,7 @@ If issues persist, please report them at https://github.com/databricks/cli/issue
 
 ## Features
 
-The Databricks MCP server provides CLI-based tools for workspace interaction:
+The Databricks aitools server provides CLI-based tools for workspace interaction:
 
 Execute Databricks CLI commands and explore workspace resources:
 
@@ -321,10 +321,10 @@ The `invoke_databricks_cli` tool:
 
 ```bash
 # Install MCP server in coding agents (Claude Code, Cursor, etc.)
-databricks experimental apps-mcp install
+databricks experimental aitools install
 
 # Start MCP server (default mode)
-databricks experimental apps-mcp
+databricks experimental aitools
 ```
 
 ### Environment Variables