From 5a0e6ed1d6a32e0faefeedde5754fda00ad4cf6f Mon Sep 17 00:00:00 2001
From: Nikolay Edigaryev <edigaryev@gmail.com>
Date: Wed, 11 Feb 2026 18:04:21 +0100
Subject: [PATCH] Instantiate new client for each spawned worker (#402)

---
 internal/command/worker/run.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/command/worker/run.go b/internal/command/worker/run.go
index 1eab660..042f250 100644
--- a/internal/command/worker/run.go
+++ b/internal/command/worker/run.go
@@ -165,11 +165,6 @@ func runWorker(cmd *cobra.Command, args []string) (err error) {
 			"in the bootstrap token", ErrRunFailed)
 	}
 
-	controllerClient, err := client.New(clientOpts...)
-	if err != nil {
-		return err
-	}
-
 	// Initialize the logger
 	logger, err := createLogger()
 	if err != nil {
@@ -226,6 +221,11 @@ func runWorker(cmd *cobra.Command, args []string) (err error) {
 				workerOptsLocal = append(workerOptsLocal, worker.WithNameSuffix(fmt.Sprintf("-%d", i+1)))
 			}
 
+			controllerClient, err := client.New(clientOpts...)
+			if err != nil {
+				return err
+			}
+
 			workerInstance, err := worker.New(controllerClient, workerOptsLocal...)
 			if err != nil {
 				return err