From f29b94320f41bc616dd825171cb299b6a040a9df Mon Sep 17 00:00:00 2001
From: Nikolay Edigaryev <edigaryev@gmail.com>
Date: Tue, 27 Jan 2026 22:26:55 +0100
Subject: [PATCH] Move default local-dev context logic to CreateDevController()

---
 internal/command/dev/dev.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/internal/command/dev/dev.go b/internal/command/dev/dev.go
index 5de4f17..6977182 100644
--- a/internal/command/dev/dev.go
+++ b/internal/command/dev/dev.go
@@ -198,21 +198,6 @@ func CreateDevControllerAndWorker(
 		return nil, nil, err
 	}
 
-	// set local-dev context as active
-	configHandle, err := config.NewHandle()
-	if err != nil {
-		return nil, nil, err
-	}
-	localContext := config.Context{URL: devController.Address()}
-	err = configHandle.CreateContext("local-dev", localContext, true)
-	if err != nil {
-		return nil, nil, err
-	}
-	err = configHandle.SetDefaultContext("local-dev")
-	if err != nil {
-		return nil, nil, err
-	}
-
 	return devController, devWorker, nil
 }
 
@@ -247,6 +232,21 @@ func CreateDevController(
 		return nil, nil, err
 	}
 
+	// set local-dev context as active
+	configHandle, err := config.NewHandle()
+	if err != nil {
+		return nil, nil, err
+	}
+	localContext := config.Context{URL: devController.Address()}
+	err = configHandle.CreateContext("local-dev", localContext, true)
+	if err != nil {
+		return nil, nil, err
+	}
+	err = configHandle.SetDefaultContext("local-dev")
+	if err != nil {
+		return nil, nil, err
+	}
+
 	return devController, defaultClient, nil
 }