From 59ec379edbc9ce5aedf088da84413f5e66b87089 Mon Sep 17 00:00:00 2001
From: Ilya Kuznetsov <ilya.kuznetsov@databricks.com>
Date: Wed, 8 Apr 2026 17:56:13 +0200
Subject: [PATCH 1/2] Strip dev prefix during renames

---
 .../job_fields/databricks.yml.tmpl            |  1 +
 .../config-remote-sync/job_fields/output.txt  | 14 +++-
 .../config-remote-sync/job_fields/script      |  2 +
 .../pipeline_fields/output.txt                |  4 +-
 .../config-remote-sync/pipeline_fields/script |  2 +
 bundle/configsync/defaults.go                 | 30 ++++++++
 bundle/configsync/diff.go                     |  4 +-
 bundle/configsync/diff_test.go                | 74 +++++++++++++++++++
 8 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/acceptance/bundle/config-remote-sync/job_fields/databricks.yml.tmpl b/acceptance/bundle/config-remote-sync/job_fields/databricks.yml.tmpl
index d2e63d7cc1..ddff699c6b 100644
--- a/acceptance/bundle/config-remote-sync/job_fields/databricks.yml.tmpl
+++ b/acceptance/bundle/config-remote-sync/job_fields/databricks.yml.tmpl
@@ -4,6 +4,7 @@ bundle:
 resources:
   jobs:
     my_job:
+      name: test-job-$UNIQUE_NAME
       email_notifications:
         on_success:
           - success@example.com
diff --git a/acceptance/bundle/config-remote-sync/job_fields/output.txt b/acceptance/bundle/config-remote-sync/job_fields/output.txt
index 12b9987741..2ccd025fbe 100644
--- a/acceptance/bundle/config-remote-sync/job_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/job_fields/output.txt
@@ -13,6 +13,7 @@ Resource: resources.jobs.my_job
   email_notifications.no_alert_for_skipped_runs: add
   email_notifications.on_failure: add
   job_clusters[0].job_cluster_key: replace
+  name: replace
   parameters: replace
   tags['team']: add
   tasks[task_key='inline_cluster_task'].new_cluster.num_workers: replace
@@ -28,7 +29,12 @@ Resource: resources.jobs.my_job
 >>> diff.py databricks.yml.backup databricks.yml
 --- databricks.yml.backup
 +++ databricks.yml
-@@ -8,13 +8,19 @@
+@@ -5,20 +5,26 @@
+   jobs:
+     my_job:
+-      name: test-job-[UNIQUE_NAME]
++      name: renamed-job-[UNIQUE_NAME]
+       email_notifications:
          on_success:
            - success@example.com
 +        no_alert_for_skipped_runs: true
@@ -55,21 +61,21 @@ Resource: resources.jobs.my_job
 +            - samples.nyctaxi.trips
        environments:
          - environment_key: default
-@@ -24,5 +30,5 @@
+@@ -27,5 +33,5 @@
                - ./*.whl
        job_clusters:
 -        - job_cluster_key: test_cluster
 +        - job_cluster_key: test_cluster_renamed
            new_cluster:
              spark_version: [[DEFAULT_SPARK_VERSION]]
-@@ -33,5 +39,5 @@
+@@ -36,5 +42,5 @@
            notebook_task:
              notebook_path: /Users/{{workspace_user_name}}/notebook
 -          job_cluster_key: test_cluster
 +          job_cluster_key: test_cluster_renamed
          - task_key: inline_cluster_task
            notebook_task:
-@@ -40,5 +46,7 @@
+@@ -43,5 +49,7 @@
              spark_version: [[DEFAULT_SPARK_VERSION]]
              node_type_id: [NODE_TYPE_ID]
 -            num_workers: 1
diff --git a/acceptance/bundle/config-remote-sync/job_fields/script b/acceptance/bundle/config-remote-sync/job_fields/script
index 8d600aaeaa..264304d734 100755
--- a/acceptance/bundle/config-remote-sync/job_fields/script
+++ b/acceptance/bundle/config-remote-sync/job_fields/script
@@ -17,6 +17,8 @@ job_id="$(read_id.py my_job)"
 title "Modify job fields remotely"
 echo
 edit_resource.py jobs $job_id <<EOF
+# Rename the job remotely; config-remote-sync should strip the dev prefix
+r["name"] = r["name"].replace("test-job-$UNIQUE_NAME", "renamed-job-$UNIQUE_NAME")
 r["email_notifications"]["on_failure"] = ["failure@example.com"]
 r["email_notifications"]["no_alert_for_skipped_runs"] = True
 r["parameters"].append({"name": "region", "default": "us-east-1"})
diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
index ea2c6a557b..9f612ecb78 100644
--- a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
@@ -10,6 +10,7 @@ Detected changes in 1 resource(s):
 Resource: resources.pipelines.my_pipeline
   configuration['key2']: add
   environment.dependencies: replace
+  name: replace
   notifications[0].alerts: replace
   notifications[0].email_recipients: replace
   root_path: add
@@ -24,7 +25,8 @@ Resource: resources.pipelines.my_pipeline
 --- databricks.yml.backup
 +++ databricks.yml
 @@ -7,18 +7,25 @@
-       name: test-pipeline-[UNIQUE_NAME]
+-      name: test-pipeline-[UNIQUE_NAME]
++      name: renamed-pipeline-[UNIQUE_NAME]
        catalog: main
 -      schema: default
 +      schema: prod
diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/script b/acceptance/bundle/config-remote-sync/pipeline_fields/script
index a83b940966..1fe0261689 100755
--- a/acceptance/bundle/config-remote-sync/pipeline_fields/script
+++ b/acceptance/bundle/config-remote-sync/pipeline_fields/script
@@ -13,6 +13,8 @@ pipeline_id="$(read_id.py my_pipeline)"
 
 title "Modify pipeline fields remotely"
 edit_resource.py pipelines $pipeline_id <<EOF
+# Rename the pipeline remotely; config-remote-sync should strip the dev prefix
+r["name"] = r["name"].replace("test-pipeline-$UNIQUE_NAME", "renamed-pipeline-$UNIQUE_NAME")
 r["configuration"]["key2"] = "value2"
 r["notifications"][0]["email_recipients"].append("admin@example.com")
 r["notifications"][0]["alerts"].append("on-update-failure")
diff --git a/bundle/configsync/defaults.go b/bundle/configsync/defaults.go
index 9b0157bf03..af1b0d7e57 100644
--- a/bundle/configsync/defaults.go
+++ b/bundle/configsync/defaults.go
@@ -176,3 +176,33 @@ func resetValueIfNeeded(path string, value any) any {
 	}
 	return value
 }
+
+// prefixedNameFields lists resource name field patterns where the name prefix
+// (e.g. "[dev user] ") is applied during deployment and should be stripped
+// when syncing remote changes back to config.
+var prefixedNameFields = []string{
+	"resources.jobs.*.name",
+	"resources.pipelines.*.name",
+	"resources.dashboards.*.display_name",
+}
+
+// stripNamePrefix strips the configured name prefix from name field values
+// so that the raw (unprefixed) name is written back to the config YAML.
+func stripNamePrefix(path string, value any, prefix string) any {
+	if prefix == "" {
+		return value
+	}
+
+	s, ok := value.(string)
+	if !ok {
+		return value
+	}
+
+	for _, pattern := range prefixedNameFields {
+		if matchPattern(pattern, path) {
+			return strings.TrimPrefix(s, prefix)
+		}
+	}
+
+	return value
+}
diff --git a/bundle/configsync/diff.go b/bundle/configsync/diff.go
index 0d8bddc2e9..452e819864 100644
--- a/bundle/configsync/diff.go
+++ b/bundle/configsync/diff.go
@@ -149,13 +149,15 @@ func DetectChanges(ctx context.Context, b *bundle.Bundle, engine engine.EngineTy
 					continue
 				}
 
-				change, err := convertChangeDesc(resourceKey+"."+path, changeDesc)
+				fullPath := resourceKey + "." + path
+				change, err := convertChangeDesc(fullPath, changeDesc)
 				if err != nil {
 					return nil, fmt.Errorf("failed to compute config change for path %s: %w", path, err)
 				}
 				if change.Operation == OperationSkip {
 					continue
 				}
+				change.Value = stripNamePrefix(fullPath, change.Value, b.Config.Presets.NamePrefix)
 				resourceChanges[path] = change
 			}
 		}
diff --git a/bundle/configsync/diff_test.go b/bundle/configsync/diff_test.go
index 8ed7618b5b..f55a645378 100644
--- a/bundle/configsync/diff_test.go
+++ b/bundle/configsync/diff_test.go
@@ -6,6 +6,80 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestStripNamePrefix(t *testing.T) {
+	tests := []struct {
+		name   string
+		path   string
+		value  any
+		prefix string
+		want   any
+	}{
+		{
+			name:   "job name with normal prefix",
+			path:   "resources.jobs.my_job.name",
+			value:  "[dev user] my_job",
+			prefix: "[dev user] ",
+			want:   "my_job",
+		},
+		{
+			name:   "pipeline name with normal prefix",
+			path:   "resources.pipelines.my_pipeline.name",
+			value:  "[dev user] my_pipeline",
+			prefix: "[dev user] ",
+			want:   "my_pipeline",
+		},
+		{
+			name:   "dashboard display_name with prefix",
+			path:   "resources.dashboards.my_dash.display_name",
+			value:  "[dev user] my_dash",
+			prefix: "[dev user] ",
+			want:   "my_dash",
+		},
+		{
+			name:   "name does not start with prefix",
+			path:   "resources.jobs.my_job.name",
+			value:  "my_job",
+			prefix: "[dev user] ",
+			want:   "my_job",
+		},
+		{
+			name:   "empty prefix is noop",
+			path:   "resources.jobs.my_job.name",
+			value:  "[dev user] my_job",
+			prefix: "",
+			want:   "[dev user] my_job",
+		},
+		{
+			name:   "non-name field is not stripped",
+			path:   "resources.jobs.my_job.description",
+			value:  "[dev user] some description",
+			prefix: "[dev user] ",
+			want:   "[dev user] some description",
+		},
+		{
+			name:   "non-string value is unchanged",
+			path:   "resources.jobs.my_job.name",
+			value:  42,
+			prefix: "[dev user] ",
+			want:   42,
+		},
+		{
+			name:   "nil value is unchanged",
+			path:   "resources.jobs.my_job.name",
+			value:  nil,
+			prefix: "[dev user] ",
+			want:   nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := stripNamePrefix(tt.path, tt.value, tt.prefix)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
 func TestMatchPattern(t *testing.T) {
 	tests := []struct {
 		name    string

From 8447095c9676f90e4c6e99996a94c4903a2a284a Mon Sep 17 00:00:00 2001
From: Ilya Kuznetsov <ilya.kuznetsov@databricks.com>
Date: Thu, 9 Apr 2026 13:07:34 +0200
Subject: [PATCH 2/2] Regenerate acceptance test outputs for config-remote-sync

Co-authored-by: Isaac
---
 .../bundle/config-remote-sync/job_fields/output.txt       | 8 ++++----
 .../bundle/config-remote-sync/pipeline_fields/output.txt  | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/acceptance/bundle/config-remote-sync/job_fields/output.txt b/acceptance/bundle/config-remote-sync/job_fields/output.txt
index 2ccd025fbe..fb45fd6daa 100644
--- a/acceptance/bundle/config-remote-sync/job_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/job_fields/output.txt
@@ -29,7 +29,7 @@ Resource: resources.jobs.my_job
 >>> diff.py databricks.yml.backup databricks.yml
 --- databricks.yml.backup
 +++ databricks.yml
-@@ -5,20 +5,26 @@
+@@ -5,17 +5,23 @@
    jobs:
      my_job:
 -      name: test-job-[UNIQUE_NAME]
@@ -61,21 +61,21 @@ Resource: resources.jobs.my_job
 +            - samples.nyctaxi.trips
        environments:
          - environment_key: default
-@@ -27,5 +33,5 @@
+@@ -25,5 +31,5 @@
                - ./*.whl
        job_clusters:
 -        - job_cluster_key: test_cluster
 +        - job_cluster_key: test_cluster_renamed
            new_cluster:
              spark_version: [[DEFAULT_SPARK_VERSION]]
-@@ -36,5 +42,5 @@
+@@ -34,5 +40,5 @@
            notebook_task:
              notebook_path: /Users/{{workspace_user_name}}/notebook
 -          job_cluster_key: test_cluster
 +          job_cluster_key: test_cluster_renamed
          - task_key: inline_cluster_task
            notebook_task:
-@@ -43,5 +49,7 @@
+@@ -41,5 +47,7 @@
              spark_version: [[DEFAULT_SPARK_VERSION]]
              node_type_id: [NODE_TYPE_ID]
 -            num_workers: 1
diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
index 9f612ecb78..e14b94f76f 100644
--- a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
@@ -24,7 +24,9 @@ Resource: resources.pipelines.my_pipeline
 >>> diff.py databricks.yml.backup databricks.yml
 --- databricks.yml.backup
 +++ databricks.yml
-@@ -7,18 +7,25 @@
+@@ -5,20 +5,27 @@
+   pipelines:
+     my_pipeline:
 -      name: test-pipeline-[UNIQUE_NAME]
 +      name: renamed-pipeline-[UNIQUE_NAME]
        catalog: main