From 3e2b6b4bc5ab52a38196f5af1a6e511a97600fb4 Mon Sep 17 00:00:00 2001
From: Georgi Zhelev <30194786+GeorgiZhelev@users.noreply.github.com>
Date: Tue, 3 Mar 2026 21:12:08 +0200
Subject: [PATCH] Fix --alias to also match by userId for UUID-aliased sessions

---
 .../cli-kit/src/private/node/session/store.test.ts    | 11 +++++++++++
 packages/cli-kit/src/private/node/session/store.ts    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/cli-kit/src/private/node/session/store.test.ts b/packages/cli-kit/src/private/node/session/store.test.ts
index 625163c1ab5..5fe3f1c05a3 100644
--- a/packages/cli-kit/src/private/node/session/store.test.ts
+++ b/packages/cli-kit/src/private/node/session/store.test.ts
@@ -178,6 +178,17 @@ describe('session store', () => {
       expect(result).toBeUndefined()
     })
 
+    test('returns userId when alias matches userId directly', async () => {
+      // Given
+      vi.mocked(getSessions).mockReturnValue(JSON.stringify(mockSessions))
+
+      // When
+      const result = await findSessionByAlias('user1')
+
+      // Then
+      expect(result).toBe('user1')
+    })
+
     test('returns first matching userId when multiple sessions have same alias', async () => {
       // Given
       const sessionsWithDuplicateAlias = {
diff --git a/packages/cli-kit/src/private/node/session/store.ts b/packages/cli-kit/src/private/node/session/store.ts
index 6a867fdf687..17d20b030b9 100644
--- a/packages/cli-kit/src/private/node/session/store.ts
+++ b/packages/cli-kit/src/private/node/session/store.ts
@@ -71,7 +71,7 @@ export async function findSessionByAlias(alias: string): Promise<string | undefi
   if (!fqdnSessions) return undefined
 
   for (const [userId, session] of Object.entries(fqdnSessions)) {
-    if (session.identity.alias === alias) {
+    if (session.identity.alias === alias || userId === alias) {
       return userId
     }
   }