From 1c7774e35b06b89788f3ba2083a9b83b743aca1c Mon Sep 17 00:00:00 2001
From: Marlon Gamez <marlongamez@google.com>
Date: Thu, 12 Jun 2025 19:32:13 -0700
Subject: [PATCH] Use allowedTiers from LoadCodeAssist response when calling
 OnboardUser (#995)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Jerop Kipruto <jerop@google.com>
Co-authored-by: Marat Boshernitsan <maratb@nitsan.org>
Co-authored-by: Marat Boshernitsan <maratb@google.com>
---
 packages/core/src/code_assist/setup.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/code_assist/setup.ts b/packages/core/src/code_assist/setup.ts
index 6ff61523..6771bbcc 100644
--- a/packages/core/src/code_assist/setup.ts
+++ b/packages/core/src/code_assist/setup.ts
@@ -35,8 +35,11 @@ export async function setupUser(
     metadata: clientMetadata,
   });
 
+  const onboardTier: string =
+    loadRes.allowedTiers?.find((tier) => tier.isDefault)?.id ?? 'legacy-tier';
+
   const onboardReq: OnboardUserRequest = {
-    tierId: 'legacy-tier',
+    tierId: onboardTier,
     cloudaicompanionProject: loadRes.cloudaicompanionProject || '',
     metadata: clientMetadata,
   };