ENG-36 Support Intel build for mac, not just Apple Silicon (#1710)

* fix(portal): download relevant device agent per macOS chip on portal

* fix(portal): fix portal build issue

* fix(portal): add log for testing

* fix(portal): add log for testing

---------

Co-authored-by: chasprowebdev <chasgarciaprowebdev@gmail.com>

Author: github-actions[bot]

apps/portal/src/app/api/download-agent/route.ts

@@ -11,6 +11,7 @@ import {
   getReadmeContent,
   getScriptFilename,
 } from './scripts';
+import type { SupportedOS } from './types';
 
 export const runtime = 'nodejs';
 export const dynamic = 'force-dynamic';
@@ -39,9 +40,10 @@ export async function GET(req: NextRequest) {
     orgId: string;
     employeeId: string;
     userId: string;
-    os: 'macos' | 'windows';
+    os: SupportedOS;
   };
-
+  console.log(os);
+  
   // Hardcoded device marker paths used by the setup scripts
   const fleetDevicePathMac = '/Users/Shared/.fleet';
   const fleetDevicePathWindows = 'C:\\ProgramData\\CompAI\\Fleet';
@@ -52,10 +54,10 @@ export async function GET(req: NextRequest) {
   }
 
   // For macOS, serve the DMG directly. For Windows, create a zip with script and installer.
-  if (os === 'macos') {
+  if (os === 'macos' || os === 'macos-intel') {
     try {
       // Direct DMG download for macOS
-      const macosPackageFilename = 'Comp AI Agent-1.0.0-arm64.dmg';
+      const macosPackageFilename = os === 'macos' ? 'Comp AI Agent-1.0.0-arm64.dmg' : 'Comp AI Agent-1.0.0.dmg';
       const packageKey = `macos/${macosPackageFilename}`;
 
       const getObjectCommand = new GetObjectCommand({

apps/portal/src/app/api/download-agent/types.ts

@@ -1,4 +1,4 @@
-export type SupportedOS = 'macos' | 'windows';
+export type SupportedOS = 'macos' | 'windows' | 'macos-intel';
 
 export interface ScriptConfig {
   orgId: string;

apps/portal/src/app/api/download-agent/utils.ts

@@ -3,11 +3,17 @@ import { db } from '@db';
 import type { SupportedOS } from './types';
 
 /**
- * Detects the operating system from a User-Agent string
+ * Detects the operating system (and for macOS, the CPU architecture) from a User-Agent string.
+ *
+ * Returns:
+ * - 'windows' for Windows OS
+ * - 'macos' for Apple Silicon (ARM-based) Macs
+ * - 'macos-intel' for Intel-based Macs
  *
  * Examples of User-Agent strings:
  * - Windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
- * - macOS: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36"
+ * - macOS (Intel): "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36"
+ * - macOS (Apple Silicon): "Mozilla/5.0 (Macintosh; ARM Mac OS X 11_2_3) AppleWebKit/537.36"
  */
 export function detectOSFromUserAgent(userAgent: string | null): SupportedOS | null {
   if (!userAgent) return null;
@@ -19,8 +25,17 @@ export function detectOSFromUserAgent(userAgent: string | null): SupportedOS | n
     return 'windows';
   }
 
-  // Check for macOS (must check before iOS since iOS UA contains "mac")
+  // Check for macOS (and further distinguish Apple Silicon vs Intel)
   if (ua.includes('macintosh') || (ua.includes('mac os') && !ua.includes('like mac'))) {
+    // User-Agent containing 'arm' or 'apple' usually means Apple Silicon
+    if (ua.includes('arm') || ua.includes('apple')) {
+      return 'macos';
+    }
+    // 'intel' in UA indicates Intel-based mac
+    if (ua.includes('intel')) {
+      return 'macos-intel';
+    }
+    // Fallback for when arch info is missing, treat as Apple Silicon (modern default)
     return 'macos';
   }
 

apps/portal/src/utils/s3.ts

@@ -1,3 +1,4 @@
+import { SupportedOS } from '@/app/api/download-agent/types';
 import { GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
@@ -113,7 +114,7 @@ export function extractS3KeyFromUrl(url: string): string {
   return key;
 }
 
-export async function getFleetAgent({ os }: { os: 'macos' | 'windows' }) {
+export async function getFleetAgent({ os }: { os: SupportedOS }) {
   const fleetBucketName = process.env.FLEET_AGENT_BUCKET_NAME;
 
   if (!fleetBucketName) {