From cf1219322c169a1715abc3686d86099689e8aa9c Mon Sep 17 00:00:00 2001
From: Nasit Sarwar Sony <nasitsony96@gmail.com>
Date: Sat, 30 May 2026 07:22:11 -0700
Subject: [PATCH] Prefix dev server cluster ID with 'dev-server-'

---
 internal/temporalcli/commands.server.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/temporalcli/commands.server.go b/internal/temporalcli/commands.server.go
index 90c5b2fe3..2afea7172 100644
--- a/internal/temporalcli/commands.server.go
+++ b/internal/temporalcli/commands.server.go
@@ -191,7 +191,7 @@ func persistentClusterID() string {
 	file := defaultDeprecatedEnvConfigFile("temporalio", "version-info")
 	if file == "" {
 		// No file, can do nothing here
-		return uuid.NewString()
+		return "dev-server-" + uuid.NewString()
 	}
 	// Try to get existing first
 	env, _ := readDeprecatedEnvConfigFile(file)
@@ -199,7 +199,7 @@ func persistentClusterID() string {
 		return id
 	}
 	// Create and try to write
-	id := uuid.NewString()
+	id := "dev-server-" + uuid.NewString()
 	_ = writeDeprecatedEnvConfigFile(file, map[string]map[string]string{"default": {"cluster-id": id}})
 	return id
 }