From da1cf3bd6a572b685ae080908aafd1f2e8a5c999 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Sun, 30 Nov 2025 15:24:24 +0000
Subject: [PATCH] further cli improvements

---
 cli/src/core/context.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cli/src/core/context.ts b/cli/src/core/context.ts
index a2b31b1125..60612991b5 100644
--- a/cli/src/core/context.ts
+++ b/cli/src/core/context.ts
@@ -244,10 +244,7 @@ export async function tryResolveBranchWorkspace(
     );
   }
 
-  if (workspaceIdIfForked) {
-    workspaceId = workspaceIdIfForked;
-    log.info(`Inferred workspace id \`${workspaceId}\` from branch name because this is a workspace fork branch (\`${rawBranch}\`). `);
-  }
+
 
   // Handle multiple profiles - use special branch-aware logic
   let selectedProfile: Workspace;
@@ -291,6 +288,14 @@ export async function tryResolveBranchWorkspace(
     );
 
     log.info(colors.green(`Using workspace profile '${selectedProfile.name}' for branch '${currentBranch}'`));
+
+
+  }
+
+  if (workspaceIdIfForked) {
+    selectedProfile.name = `${selectedProfile.name}/${workspaceIdIfForked}`;
+    selectedProfile.workspaceId = workspaceIdIfForked;
+    log.info(`Inferred workspace id \`${workspaceId}\` from branch name because this is a workspace fork branch (\`${rawBranch}\`). `);
   }
 
   return selectedProfile;