Merge pull request #6933 from GeorgiZhelev/fix/find-session-by-alias-or-userid

Fix --alias to also match by userId for UUID-aliased sessions

Author: gonzaloriestra

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 = {

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
     }
   }