refactor: streamline cloud model disabling logic in authentication flow

- Extracted the logic for disabling cloud models into a separate function, `disableCloudModelsIfEnabled`, to improve code readability and maintainability.
- Updated the `handleInactiveAccount` and sign-out processes to utilize the new function, ensuring consistent behavior when clearing sessions.
- Enhanced error handling in the CDP form detection process by adding logging for AX tree retrieval attempts, improving debugging capabilities.

Author: mikr13

src/components/ui/combobox.tsx

@@ -34,7 +34,9 @@ export interface ComboboxProps {
   className?: string;
   id?: string;
   name?: string;
-  portalContainer?: React.ComponentProps<typeof PopoverContent>["portalContainer"];
+  portalContainer?: React.ComponentProps<
+    typeof PopoverContent
+  >["portalContainer"];
   "aria-invalid"?: boolean;
 }
 

src/components/ui/popover.tsx

@@ -22,7 +22,9 @@ function PopoverContent({
   portalContainer,
   ...props
 }: React.ComponentProps<typeof PopoverPrimitive.Content> & {
-  portalContainer?: React.ComponentProps<typeof PopoverPrimitive.Portal>["container"];
+  portalContainer?: React.ComponentProps<
+    typeof PopoverPrimitive.Portal
+  >["container"];
 }) {
   return (
     <PopoverPrimitive.Portal container={portalContainer}>

src/hooks/use-auth.ts

@@ -45,26 +45,31 @@ export function useAuth(): AuthState & AuthActions {
     setInactiveMessage(null);
   }, []);
 
+  const disableCloudModelsIfEnabled = useCallback(async () => {
+    const currentSettings = await storage.aiSettings.getValue();
+
+    if (currentSettings.cloudModelsEnabled) {
+      await storage.aiSettings.setValue({
+        ...currentSettings,
+        cloudModelsEnabled: false,
+      });
+    }
+  }, []);
+
   const handleInactiveAccount = useCallback(
     async (message?: string) => {
       const authService = getAuthService();
       await authService.clearSession();
       queryClient.setQueryData(["auth", "session"], null);
 
-      const currentSettings = await storage.aiSettings.getValue();
-      if (currentSettings.cloudModelsEnabled) {
-        await storage.aiSettings.setValue({
-          ...currentSettings,
-          cloudModelsEnabled: false,
-        });
-      }
+      await disableCloudModelsIfEnabled();
 
       setPendingApproval(true);
       setInactiveMessage(
         message ?? "Account pending approval. Please contact support.",
       );
     },
-    [queryClient],
+    [queryClient, disableCloudModelsIfEnabled],
   );
 
   const fetchUserStatus = useCallback(
@@ -215,15 +220,9 @@ export function useAuth(): AuthState & AuthActions {
   const signOutMutation = useMutation({
     mutationFn: async () => {
       const authService = getAuthService();
-      await authService.clearSession();
 
-      const currentSettings = await storage.aiSettings.getValue();
-      if (currentSettings.cloudModelsEnabled) {
-        await storage.aiSettings.setValue({
-          ...currentSettings,
-          cloudModelsEnabled: false,
-        });
-      }
+      await authService.clearSession();
+      await disableCloudModelsIfEnabled();
 
       logger.debug("Signed out successfully");
     },

src/lib/cdp/cdp-fill-verifier.ts

@@ -35,8 +35,10 @@ function normalize(value: unknown): string {
 function valuesMatch(actual: string, expected: string): boolean {
   const actualNorm = normalize(actual);
   const expectedNorm = normalize(expected);
+
   if (!expectedNorm) return actualNorm.length === 0;
   if (actualNorm === expectedNorm) return true;
+
   return actualNorm.includes(expectedNorm) || expectedNorm.includes(actualNorm);
 }
 

src/lib/cdp/cdp-form-detector.ts

@@ -73,12 +73,20 @@ export async function detectFormFields(
   let axTree: AXTreeResponse | null = null;
 
   for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
-    axTree = await sendCommand<AXTreeResponse>(
-      tabId,
-      "Accessibility.getFullAXTree",
-    );
+    try {
+      axTree = await sendCommand<AXTreeResponse>(
+        tabId,
+        "Accessibility.getFullAXTree",
+      );
+    } catch (error) {
+      logger.error("Failed to get AX tree:", {
+        error,
+        attempt: attempt + 1,
+      });
+      axTree = null;
+    }
 
-    if (axTree?.nodes?.length > 0) break;
+    if (axTree?.nodes && axTree.nodes.length > 0) break;
 
     logger.warn(
       `AX tree empty on attempt ${attempt + 1}, retrying in ${RETRY_DELAY_MS}ms`,