databricks · shreyas-goenka · Sep 16, 2026 · Sep 16, 2026 · Sep 16, 2026 · Sep 16, 2026
diff --git a/.nextchanges/notable-changes/direct-state-v3.md b/.nextchanges/notable-changes/direct-state-v3.md
@@ -0,0 +1 @@
+* Bump the direct deployment state version to 3. Clients older than v1.8.0 will reject bundles deployed with this release. ([#6713](https://github.com/databricks/cli/pull/6713))
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -400,6 +400,10 @@ func testAccept(t *testing.T, inprocessMode bool, selectedTests []string, skipTo
 		t.Setenv("CLI_293", cli293Path)
 		repls.SetPath(cli293Path, "[CLI_293]")
 
+		cli18Path := DownloadCLI(t, buildDir, "1.8.0")
+		t.Setenv("CLI_1_8", cli18Path)
+		repls.SetPath(cli18Path, "[CLI_1_8]")
+
 		// CLI version that predates the hashed_fields feature. Used by acceptance/bundle/hashing
 		cli1161Path := DownloadCLI(t, buildDir, "1.16.1")
 		t.Setenv("CLI_1_16_1", cli1161Path)

diff --git a/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt b/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt
@@ -11,7 +11,7 @@ Exit code: [KILLED]
   "cli_version": "[CLI_VERSION]",
   "lineage": "[UUID]",
   "serial": 1,
-  "state_version": 2
+  "state_version": 3
 }
 {
   "k": "resources.jobs.job_01",

diff --git a/acceptance/bundle/deploy/wal/crash-after-create/output.txt b/acceptance/bundle/deploy/wal/crash-after-create/output.txt
@@ -12,7 +12,7 @@ Exit code: [KILLED]
 
 >>> cat .databricks/bundle/default/resources.json.wal
 {
-  "state_version": 2,
+  "state_version": 3,
   "cli_version": "[CLI_VERSION]",
   "lineage": "[UUID]",
   "serial": 1

diff --git a/acceptance/bundle/deploy/wal/header-only-wal/output.txt b/acceptance/bundle/deploy/wal/header-only-wal/output.txt
@@ -7,7 +7,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Exit code: [KILLED]
 
 >>> cat .databricks/bundle/default/resources.json.wal
-{"state_version":2,"cli_version":"[CLI_VERSION]","lineage":"[UUID]","serial":1}
+{"state_version":3,"cli_version":"[CLI_VERSION]","lineage":"[UUID]","serial":1}
 
 === Second deploy (killed again, leaves another header-only WAL)
 >>> errcode [CLI] bundle deploy --force-lock
@@ -17,7 +17,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Exit code: [KILLED]
 
 >>> cat .databricks/bundle/default/resources.json.wal
-{"state_version":2,"cli_version":"[CLI_VERSION]","lineage":"[UUID]","serial":1}
+{"state_version":3,"cli_version":"[CLI_VERSION]","lineage":"[UUID]","serial":1}
 
 === Third deploy (must recover and succeed, not blocked by the leftover WAL)
 >>> errcode [CLI] bundle deploy --force-lock

diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/out.state_after_bind.direct.json b/acceptance/bundle/deployment/bind/dashboard/recreation/out.state_after_bind.direct.json
@@ -1,5 +1,5 @@
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "serial": 2,

diff --git a/acceptance/bundle/dms/declined-deploy/output.txt b/acceptance/bundle/dms/declined-deploy/output.txt
@@ -94,7 +94,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/depends-on/output.txt b/acceptance/bundle/dms/depends-on/output.txt
@@ -86,7 +86,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/empty-grants/output.txt b/acceptance/bundle/dms/empty-grants/output.txt
@@ -158,7 +158,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/existing-state/output.txt b/acceptance/bundle/dms/existing-state/output.txt
@@ -21,7 +21,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> jq {state_version, features} .databricks/bundle/default/resources.json
 {
-  "state_version": 2,
+  "state_version": 3,
   "features": null
 }
 
@@ -77,7 +77,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> jq {state_version, features} .databricks/bundle/default/resources.json
 {
-  "state_version": 2,
+  "state_version": 3,
   "features": {
     "deployment_history": {}
   }

diff --git a/acceptance/bundle/dms/failed-delete/output.txt b/acceptance/bundle/dms/failed-delete/output.txt
@@ -87,7 +87,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw state after successful deploy
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -178,7 +178,7 @@ API message: Fault injected by test.
 === The state shows the resource still exists but the operation is marked failed
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/failed-recreate/output.txt b/acceptance/bundle/dms/failed-recreate/output.txt
@@ -87,7 +87,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw state after successful deploy
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -173,7 +173,7 @@ Files: 2 uploaded, 0 deleted
 === The raw state after failed recreate shows no resource
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/failed-update-permissions/output.txt b/acceptance/bundle/dms/failed-update-permissions/output.txt
@@ -40,7 +40,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 === The raw recorded state after deploy
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -94,7 +94,7 @@ Files: 1 uploaded, 0 deleted
 === The raw recorded state after the failure
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/multiple-resources/output.txt b/acceptance/bundle/dms/multiple-resources/output.txt
@@ -65,7 +65,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 5 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -130,7 +130,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 5 unchanged
 === The raw recorded state after redeploy
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/no-drift/output.txt b/acceptance/bundle/dms/no-drift/output.txt
@@ -45,7 +45,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -178,7 +178,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 === The raw recorded state the service holds after the update
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/no-resources/output.txt b/acceptance/bundle/dms/no-resources/output.txt
@@ -47,7 +47,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 0 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -113,7 +113,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 0 unchanged
 === The raw recorded state after redeploy
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/operation-upload-fails-once/output.txt b/acceptance/bundle/dms/operation-upload-fails-once/output.txt
@@ -34,7 +34,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw recorded state after deploy
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -76,7 +76,7 @@ Files: 2 uploaded, 0 deleted
 === The raw recorded state after the failure
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/provenance/output.txt b/acceptance/bundle/dms/provenance/output.txt
@@ -95,7 +95,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms -t dev
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/record-failure/output.txt b/acceptance/bundle/dms/record-failure/output.txt
@@ -87,7 +87,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/stale-plan/output.txt b/acceptance/bundle/dms/stale-plan/output.txt
@@ -30,7 +30,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/dms/state-features/databricks.yml.tmpl b/acceptance/bundle/dms/state-features/databricks.yml.tmpl
@@ -0,0 +1,9 @@
+bundle:
+  name: dms-state-features-$UNIQUE_NAME
+experimental:
+  deployment_history: true
+
+resources:
+  jobs:
+    foo:
+      name: state-features
diff --git a/.../bundle/state/feature_flags/out.test.toml → ...e/bundle/dms/state-features/out.test.toml b/.../bundle/state/feature_flags/out.test.toml → ...e/bundle/dms/state-features/out.test.toml
diff --git a/acceptance/bundle/dms/state-features/output.txt b/acceptance/bundle/dms/state-features/output.txt
@@ -0,0 +1,51 @@
+
+=== Deploy records version 3 and the deployment_history feature, with resources held in DMS
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-state-features-[UNIQUE_NAME]/default/files...
+Created jobs.foo
+Files: 3 uploaded, 0 deleted
+Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
+
+>>> jq {state_version, features, state} .databricks/bundle/default/resources.json
+{
+  "state_version": 3,
+  "features": {
+    "deployment_history": {}
+  },
+  "state": {}
+}
+
+=== Reopening version 3 reads resources from DMS and produces a no-op plan
+>>> [CLI] bundle plan
+Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
+
+>>> print_requests.py --dms //resources --get --oneline
+{"method": "GET", "path": "/api/2.0/bundle/deployments/[NUMID]/resources"}
+
+=== Disabling deployment history refuses plan, deploy, and destroy
+>>> musterr env DATABRICKS_BUNDLE_DEPLOYMENT_HISTORY=false [CLI] bundle plan
+Error: unsetting experimental.deployment_history is not supported
+
+This deployment's resources are recorded with the deployment history feature enabled. Set experimental.deployment_history: true to deploy or destroy this bundle
+
+
+>>> musterr env DATABRICKS_BUNDLE_DEPLOYMENT_HISTORY=false [CLI] bundle deploy
+Error: unsetting experimental.deployment_history is not supported
+
+This deployment's resources are recorded with the deployment history feature enabled. Set experimental.deployment_history: true to deploy or destroy this bundle
+
+
+>>> musterr env DATABRICKS_BUNDLE_DEPLOYMENT_HISTORY=false [CLI] bundle destroy --auto-approve
+Error: unsetting experimental.deployment_history is not supported
+
+This deployment's resources are recorded with the deployment history feature enabled. Set experimental.deployment_history: true to deploy or destroy this bundle
+
+
+>>> print_requests.py --dms //api/2.0/bundle --oneline
+
+=== Reenabling deployment history still reads the unchanged resources from DMS
+>>> [CLI] bundle plan
+Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
+
+>>> print_requests.py --dms //resources --get --oneline
+{"method": "GET", "path": "/api/2.0/bundle/deployments/[NUMID]/resources"}
diff --git a/acceptance/bundle/dms/state-features/script b/acceptance/bundle/dms/state-features/script
@@ -0,0 +1,25 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
+title "Deploy records version 3 and the deployment_history feature, with resources held in DMS"
+trace $CLI bundle deploy
+trace jq '{state_version, features, state}' .databricks/bundle/default/resources.json
+rm -f "$OUT_REQUESTS"
+
+title "Reopening version 3 reads resources from DMS and produces a no-op plan"
+trace $CLI bundle plan
+trace print_requests.py --dms //resources --get --oneline
+
+title "Disabling deployment history refuses plan, deploy, and destroy"
+update_file.py databricks.yml 'deployment_history: true' 'deployment_history: false'
+for command in plan deploy; do
+    trace musterr env DATABRICKS_BUNDLE_DEPLOYMENT_HISTORY=false $CLI bundle "$command" 2>&1 | contains.py "unsetting experimental.deployment_history is not supported"
+done
+trace musterr env DATABRICKS_BUNDLE_DEPLOYMENT_HISTORY=false $CLI bundle destroy --auto-approve 2>&1 | contains.py "unsetting experimental.deployment_history is not supported"
+trace print_requests.py --dms //api/2.0/bundle --oneline
+
+title "Reenabling deployment history still reads the unchanged resources from DMS"
+update_file.py databricks.yml 'deployment_history: false' 'deployment_history: true'
+trace $CLI bundle plan
+trace print_requests.py --dms //resources --get --oneline
+
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/successful-recreate/output.txt b/acceptance/bundle/dms/successful-recreate/output.txt
@@ -87,7 +87,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw recorded state the service holds for this deployment
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {
@@ -189,7 +189,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === The raw recorded state after recreate
 >>> print_state.py --no-dms
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "features": {

diff --git a/acceptance/bundle/migrate/basic/out.new_state.json b/acceptance/bundle/migrate/basic/out.new_state.json
@@ -1,5 +1,5 @@
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "serial": 6,

diff --git a/acceptance/bundle/migrate/dashboards/out.new_state.json b/acceptance/bundle/migrate/dashboards/out.new_state.json
@@ -1,5 +1,5 @@
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "serial": 3,

diff --git a/acceptance/bundle/migrate/default-python/out.state_after_migration.json b/acceptance/bundle/migrate/default-python/out.state_after_migration.json
@@ -1,5 +1,5 @@
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "serial": 5,

diff --git a/acceptance/bundle/migrate/grants/out.new_state.json b/acceptance/bundle/migrate/grants/out.new_state.json
@@ -1,5 +1,5 @@
 {
- "state_version": 2,
+ "state_version": 3,
  "cli_version": "[CLI_VERSION]",
  "lineage": "[UUID]",
  "serial": 9,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Bump the direct deployment state version to 3. Clients older than v1.8.0 will reject bundles deployed with this release. ([#6713](https://github.com/databricks/cli/pull/6713))