databricks · denik · Jun 24, 2026 · Jun 23, 2026 · Jun 23, 2026 · Jun 23, 2026
diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
@@ -14,6 +14,7 @@
 * References to a registered model's `registered_model_id` now resolve under the direct engine, matching Terraform behavior ([#5621](https://github.com/databricks/cli/pull/5621)).
 * Fix missing field descriptions in the bundle JSON schema for fields whose upstream API docs arrived after the field was first annotated (e.g. `vector_search_endpoints.*.target_qps`); stale placeholder markers no longer hide them ([#5588](https://github.com/databricks/cli/pull/5588)).
 * Fix `bundle deploy --plan` dropping a `postgres_role`'s `role_id`, which caused the role to be recreated on the next deploy ([#5672](https://github.com/databricks/cli/pull/5672)).
+* direct: Fix spurious cluster recreate when `apply_policy_default_values: true` is set ([#5693](https://github.com/databricks/cli/pull/5693)).
 
 ### Dependency updates
 * Bump `github.com/databricks/databricks-sdk-go` from v0.141.0 to v0.147.0 ([#5636](https://github.com/databricks/cli/pull/5636)).

diff --git a/acceptance/bundle/invariant/configs/cluster_apply_policy_default_values.yml.tmpl b/acceptance/bundle/invariant/configs/cluster_apply_policy_default_values.yml.tmpl
@@ -0,0 +1,12 @@
+bundle:
+  name: test-bundle-$UNIQUE_NAME
+
+resources:
+  clusters:
+    foo:
+      cluster_name: test-cluster-$UNIQUE_NAME
+      spark_version: 13.3.x-scala2.12
+      node_type_id: $NODE_TYPE_ID
+      instance_pool_id: $TEST_INSTANCE_POOL_ID
+      num_workers: 1
+      apply_policy_default_values: true
diff --git a/acceptance/bundle/invariant/continue_293/out.test.toml b/acceptance/bundle/invariant/continue_293/out.test.toml
diff --git a/acceptance/bundle/invariant/migrate/out.test.toml b/acceptance/bundle/invariant/migrate/out.test.toml
diff --git a/acceptance/bundle/invariant/no_drift/out.test.toml b/acceptance/bundle/invariant/no_drift/out.test.toml
diff --git a/acceptance/bundle/invariant/test.toml b/acceptance/bundle/invariant/test.toml
@@ -25,6 +25,7 @@ EnvMatrix.INPUT_CONFIG = [
     "app.yml.tmpl",
     "catalog.yml.tmpl",
     "cluster.yml.tmpl",
+    "cluster_apply_policy_default_values.yml.tmpl",
     "dashboard.yml.tmpl",
     "database_catalog.yml.tmpl",
     "database_instance.yml.tmpl",

diff --git a/acceptance/bundle/refschema/out.fields.txt b/acceptance/bundle/refschema/out.fields.txt
diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.direct.json b/acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.direct.json
@@ -26,7 +26,8 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[ENDPOINT_ID_1]"
+        "endpoint_id": "[ENDPOINT_ID_1]",
+        "name": "[ENDPOINT_NAME_1]"
       },
       "changes": {
         "description": {

diff --git a/...undle/resources/model_serving_endpoints/recreate/catalog-name/out.second-plan.direct.json b/...undle/resources/model_serving_endpoints/recreate/catalog-name/out.second-plan.direct.json
@@ -66,7 +66,28 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "auto_capture_config": {
+            "catalog_name": "main",
+            "schema_name": "default",
+            "table_name_prefix": "my_table"
+          },
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ORIGINAL_ENDPOINT_ID]"
       },
       "changes": {
         "config.auto_capture_config.catalog_name": {

diff --git a/...bundle/resources/model_serving_endpoints/recreate/name-change/out.second-plan.direct.json b/...bundle/resources/model_serving_endpoints/recreate/name-change/out.second-plan.direct.json
@@ -56,7 +56,23 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ORIGINAL_ENDPOINT_ID]"
       },
       "changes": {
         "description": {

diff --git a/...le/resources/model_serving_endpoints/recreate/route-optimized/out.second-plan.direct.json b/...le/resources/model_serving_endpoints/recreate/route-optimized/out.second-plan.direct.json
@@ -49,7 +49,19 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "served_entities": [
+            {
+              "entity_name": "system.ai.llama_v3_2_1b_instruct",
+              "entity_version": "1",
+              "name": "llama",
+              "scale_to_zero_enabled": true,
+              "workload_size": "Small"
+            }
+          ]
+        },
+        "name": "[ORIGINAL_ENDPOINT_ID]"
       },
       "changes": {
         "description": {

diff --git a/...bundle/resources/model_serving_endpoints/recreate/schema-name/out.second-plan.direct.json b/...bundle/resources/model_serving_endpoints/recreate/schema-name/out.second-plan.direct.json
@@ -66,7 +66,28 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "auto_capture_config": {
+            "catalog_name": "main",
+            "schema_name": "default",
+            "table_name_prefix": "my_table"
+          },
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ORIGINAL_ENDPOINT_ID]"
       },
       "changes": {
         "config.auto_capture_config.schema_name": {

diff --git a/...undle/resources/model_serving_endpoints/recreate/table-prefix/out.second-plan.direct.json b/...undle/resources/model_serving_endpoints/recreate/table-prefix/out.second-plan.direct.json
@@ -66,7 +66,28 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "auto_capture_config": {
+            "catalog_name": "main",
+            "schema_name": "default",
+            "table_name_prefix": "my_table"
+          },
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ORIGINAL_ENDPOINT_ID]"
       },
       "changes": {
         "config.auto_capture_config.table_name_prefix": {

diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.plan.direct.json b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.plan.direct.json
@@ -66,7 +66,28 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "ai_gateway": {
+          "inference_table_config": {
+            "catalog_name": "first-inference-catalog"
+          }
+        },
+        "config": {
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ENDPOINT_ID]"
       },
       "changes": {
         "ai_gateway.inference_table_config.catalog_name": {

diff --git a/...undle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.plan.direct.json b/...undle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.plan.direct.json
@@ -78,7 +78,34 @@
             }
           ]
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "ai_gateway": {
+          "inference_table_config": {
+            "catalog_name": "first-inference-catalog"
+          }
+        },
+        "config": {
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ENDPOINT_ID]",
+        "tags": [
+          {
+            "key": "team",
+            "value": "my-team-one"
+          }
+        ]
       },
       "changes": {
         "ai_gateway.inference_table_config.catalog_name": {

diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/out.plan.direct.json b/acceptance/bundle/resources/model_serving_endpoints/update/config/out.plan.direct.json
@@ -56,7 +56,23 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ENDPOINT_ID]"
       },
       "changes": {
         "config.served_entities[0].external_model.name": {

diff --git a/.../bundle/resources/model_serving_endpoints/update/email-notifications/out.plan.direct.json b/.../bundle/resources/model_serving_endpoints/update/email-notifications/out.plan.direct.json
@@ -66,7 +66,28 @@
             "ready": "NOT_READY"
           }
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "email_notifications": {
+          "on_update_success": [
+            "user1@example.com"
+          ]
+        },
+        "name": "[ENDPOINT_ID]"
       },
       "changes": {
         "description": {

diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.plan.direct.json b/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.plan.direct.json
@@ -68,7 +68,29 @@
             }
           ]
         },
-        "endpoint_id": "[UUID]"
+        "endpoint_id": "[UUID]",
+        "config": {
+          "served_entities": [
+            {
+              "external_model": {
+                "name": "gpt-4o-mini",
+                "openai_config": {
+                  "openai_api_key": "{{secrets/test-scope/openai-key}}"
+                },
+                "provider": "openai",
+                "task": "llm/v1/chat"
+              },
+              "name": "prod"
+            }
+          ]
+        },
+        "name": "[ENDPOINT_ID]",
+        "tags": [
+          {
+            "key": "team",
+            "value": "my-team-one"
+          }
+        ]
       },
       "changes": {
         "description": {

diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.plan.direct.json b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.plan.direct.json
@@ -38,7 +38,7 @@
         },
         "warehouse_id": {
           "action": "skip",
-          "reason": "input_only",
+          "reason": "missing_in_remote",
           "old": "[TEST_DEFAULT_WAREHOUSE_ID]",
           "new": "[TEST_DEFAULT_WAREHOUSE_ID]"
         }

diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/out.plan.direct.json b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/out.plan.direct.json
@@ -35,7 +35,7 @@
         },
         "warehouse_id": {
           "action": "skip",
-          "reason": "input_only",
+          "reason": "missing_in_remote",
           "old": "[TEST_DEFAULT_WAREHOUSE_ID]",
           "new": "[TEST_DEFAULT_WAREHOUSE_ID]"
         }

diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/out.plan.direct.json b/acceptance/bundle/resources/quality_monitors/change_table_name/out.plan.direct.json
@@ -38,7 +38,7 @@
         },
         "warehouse_id": {
           "action": "skip",
-          "reason": "input_only",
+          "reason": "missing_in_remote",
           "old": "[TEST_DEFAULT_WAREHOUSE_ID]",
           "new": "[TEST_DEFAULT_WAREHOUSE_ID]"
         }

diff --git a/acceptance/bundle/resources/quality_monitors/create/out.plan_noop.direct.json b/acceptance/bundle/resources/quality_monitors/create/out.plan_noop.direct.json
@@ -20,7 +20,7 @@
       "changes": {
         "warehouse_id": {
           "action": "skip",
-          "reason": "input_only",
+          "reason": "missing_in_remote",
           "old": "[TEST_DEFAULT_WAREHOUSE_ID]",
           "new": "[TEST_DEFAULT_WAREHOUSE_ID]"
         }

diff --git a/bundle/deployplan/plan.go b/bundle/deployplan/plan.go
@@ -103,6 +103,9 @@ const (
 	ReasonRemoteAlreadySet = "remote_already_set"
 	ReasonEmpty            = "empty"
 	ReasonCustom           = "custom"
+	// ReasonMissingInRemote: field is not present in RemoteType (write-only / input-only).
+	// Remote always appears nil, so treat the absence as a no-op when there is no local change.
+	ReasonMissingInRemote = "missing_in_remote"
 
 	// Special reason that results in removing this change from the plan
 	ReasonDrop = "!drop"