diff --git a/docs/docs/_prerequisites.mdx b/docs/docs/_prerequisites.mdx
index 38b7875..68b0d19 100644
--- a/docs/docs/_prerequisites.mdx
+++ b/docs/docs/_prerequisites.mdx
@@ -1,4 +1,4 @@
 ## Prerequisites
 
 - [Node.js](https://nodejs.org) v22+ environment with `npm`
-- Databricks CLI (v0.286.0 or higher): install and configure it according to the [official tutorial](https://docs.databricks.com/aws/en/dev-tools/cli/tutorial).
+- Databricks CLI (v0.287.0 or higher): install and configure it according to the [official tutorial](https://docs.databricks.com/aws/en/dev-tools/cli/tutorial).
diff --git a/docs/docs/development/_prerequisites_app.mdx b/docs/docs/development/_prerequisites_app.mdx
index 591c58d..e5e3684 100644
--- a/docs/docs/development/_prerequisites_app.mdx
+++ b/docs/docs/development/_prerequisites_app.mdx
@@ -1,5 +1,5 @@
 ## Prerequisites
 
 - [Node.js](https://nodejs.org) v22+ environment with `npm`
-- Databricks CLI (v0.286.0 or higher): install and configure it according to the [official tutorial](https://docs.databricks.com/aws/en/dev-tools/cli/tutorial).
+- Databricks CLI (v0.287.0 or higher): install and configure it according to the [official tutorial](https://docs.databricks.com/aws/en/dev-tools/cli/tutorial).
 - A new Databricks app with AppKit installed. See [Bootstrap a new Databricks app](../index.md) for more details.
diff --git a/template/package-lock.json b/template/package-lock.json
index 6378b03..84d74e1 100644
--- a/template/package-lock.json
+++ b/template/package-lock.json
@@ -9,8 +9,8 @@
       "version": "1.0.0",
       "license": "Unlicensed",
       "dependencies": {
-        "@databricks/appkit": "0.3.0",
-        "@databricks/appkit-ui": "0.3.0",
+        "@databricks/appkit": "0.5.2",
+        "@databricks/appkit-ui": "0.5.2",
         "@databricks/sdk-experimental": "^0.14.2",
         "clsx": "^2.1.1",
         "embla-carousel-react": "^8.6.0",
@@ -535,9 +535,9 @@
       }
     },
     "node_modules/@databricks/appkit": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@databricks/appkit/-/appkit-0.3.0.tgz",
-      "integrity": "sha512-qU+htmDhDLNNr/IlRTnb8TJrVz1bc+LD8CWcac7r8lHqTmhP4iMOGxOgmFZxFjYV4bp89sWcrgd/KCa9N1glUw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@databricks/appkit/-/appkit-0.5.2.tgz",
+      "integrity": "sha512-/CajSwHlmX5zIT9xbKkAMUMVHq06kY4TKCcJSy6NSikjPmjkR/n5MV5SO4PlMZ0NVZcSuKTnvomSlDU0CWqidA==",
       "hasInstallScript": true,
       "dependencies": {
         "@ast-grep/napi": "^0.37.0",
@@ -557,6 +557,7 @@
         "@opentelemetry/sdk-node": "^0.208.0",
         "@opentelemetry/semantic-conventions": "^1.38.0",
         "@types/semver": "^7.7.1",
+        "commander": "^12.1.0",
         "dotenv": "^16.6.1",
         "express": "^4.22.0",
         "obug": "^2.1.1",
@@ -567,17 +568,16 @@
         "zod-to-ts": "^2.0.0"
       },
       "bin": {
-        "appkit-generate-types": "bin/generate-types.js",
-        "appkit-lint": "bin/appkit-lint.js",
-        "appkit-setup": "bin/setup-claude.js"
+        "appkit": "bin/appkit.js"
       }
     },
     "node_modules/@databricks/appkit-ui": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@databricks/appkit-ui/-/appkit-ui-0.3.0.tgz",
-      "integrity": "sha512-zsxw62LAnxn2kH124Nd5neMWbT3CpbIgzy28rH21Okdff72nPl+IgPfVs9QlRFTPWqXUfgHmOihIrj1YAWI3kA==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@databricks/appkit-ui/-/appkit-ui-0.5.2.tgz",
+      "integrity": "sha512-8Enb4VT2Xf2DZHcbOlcu6oySY5p5rTxexj8AENl+Dwryq0bhidBwh4GjvRGhKg16dTe6HeYar/LnHrGhbWNdVQ==",
       "hasInstallScript": true,
       "dependencies": {
+        "@ast-grep/napi": "^0.37.0",
         "@hookform/resolvers": "^5.2.2",
         "@radix-ui/react-accordion": "^1.2.12",
         "@radix-ui/react-alert-dialog": "^1.1.15",
@@ -611,6 +611,7 @@
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
+        "commander": "^12.1.0",
         "date-fns": "^4.1.0",
         "echarts-for-react": "^3.0.5",
         "embla-carousel-react": "^8.6.0",
@@ -626,7 +627,7 @@
         "zod": "^4.1.13"
       },
       "bin": {
-        "appkit-setup": "bin/setup-claude.js"
+        "appkit": "bin/appkit.js"
       },
       "peerDependencies": {
         "react": "^18.0.0 || ^19.0.0",
@@ -7974,6 +7975,15 @@
         "node": ">=12.20.0"
       }
     },
+    "node_modules/commander": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
diff --git a/template/package.json b/template/package.json
index 71db79c..33af170 100644
--- a/template/package.json
+++ b/template/package.json
@@ -12,7 +12,7 @@
     "typecheck": "tsc -p ./tsconfig.server.json --noEmit && tsc -p ./tsconfig.client.json --noEmit",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "lint:ast-grep": "appkit-lint",
+    "lint:ast-grep": "appkit lint",
     "format": "prettier --check .",
     "format:fix": "prettier --write .",
     "test": "vitest run && npm run test:smoke",
@@ -20,16 +20,16 @@
     "test:e2e:ui": "playwright test --ui",
     "test:smoke": "playwright install chromium && playwright test tests/smoke.spec.ts",
     "clean": "rm -rf client/dist dist build node_modules .smoke-test test-results playwright-report",
-    "typegen": "appkit-generate-types",
-    "setup": "appkit-setup --write"
+    "typegen": "appkit generate-types",
+    "setup": "appkit setup --write"
   },
   "keywords": [],
   "author": "",
   "license": "Unlicensed",
   "description": "{{.app_description}}",
   "dependencies": {
-    "@databricks/appkit": "0.3.0",
-    "@databricks/appkit-ui": "0.3.0",
+    "@databricks/appkit": "0.5.2",
+    "@databricks/appkit-ui": "0.5.2",
     "@databricks/sdk-experimental": "^0.14.2",
     "clsx": "^2.1.1",
     "embla-carousel-react": "^8.6.0",