[comp] Production Deploy

apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/Employee.tsx

@@ -16,7 +16,6 @@ interface EmployeeDetailsProps {
   })[];
   fleetPolicies: FleetPolicy[];
   host: Host;
-  isFleetEnabled: boolean;
 }
 
 export function Employee({
@@ -25,7 +24,6 @@ export function Employee({
   trainingVideos,
   fleetPolicies,
   host,
-  isFleetEnabled,
 }: EmployeeDetailsProps) {
   return (
     <div className="flex flex-col gap-4">
@@ -36,7 +34,6 @@ export function Employee({
         trainingVideos={trainingVideos}
         fleetPolicies={fleetPolicies}
         host={host}
-        isFleetEnabled={isFleetEnabled}
       />
     </div>
   );

apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeTasks.tsx

@@ -13,7 +13,6 @@ export const EmployeeTasks = ({
   trainingVideos,
   host,
   fleetPolicies,
-  isFleetEnabled,
 }: {
   employee: Member & {
     user: User;
@@ -24,7 +23,6 @@ export const EmployeeTasks = ({
   })[];
   host: Host;
   fleetPolicies: FleetPolicy[];
-  isFleetEnabled: boolean;
 }) => {
   return (
     <Card>
@@ -43,7 +41,7 @@ export const EmployeeTasks = ({
           <TabsList className="mb-4">
             <TabsTrigger value="policies">Policies</TabsTrigger>
             <TabsTrigger value="training">Training Videos</TabsTrigger>
-            {isFleetEnabled && <TabsTrigger value="device">Device</TabsTrigger>}
+            <TabsTrigger value="device">Device</TabsTrigger>
           </TabsList>
 
           <TabsContent value="policies">
@@ -116,45 +114,43 @@ export const EmployeeTasks = ({
             </div>
           </TabsContent>
 
-          {isFleetEnabled && (
-            <TabsContent value="device">
-              {host ? (
-                <Card>
-                  <CardHeader>
-                    <CardTitle>{host.computer_name}'s Policies</CardTitle>
-                  </CardHeader>
-                  <CardContent className="space-y-3">
-                    {fleetPolicies.map((policy) => (
-                      <div
-                        key={policy.id}
-                        className={cn(
-                          'hover:bg-muted/50 flex items-center justify-between rounded-md border border-l-4 p-3 shadow-sm transition-colors',
-                          policy.response === 'pass' ? 'border-l-green-500' : 'border-l-red-500',
-                        )}
-                      >
-                        <p className="font-medium">{policy.name}</p>
-                        {policy.response === 'pass' ? (
-                          <div className="flex items-center gap-1 text-green-600">
-                            <CheckCircle2 size={16} />
-                            <span>Pass</span>
-                          </div>
-                        ) : (
-                          <div className="flex items-center gap-1 text-red-600">
-                            <XCircle size={16} />
-                            <span>Fail</span>
-                          </div>
-                        )}
-                      </div>
-                    ))}
-                  </CardContent>
-                </Card>
-              ) : (
-                <div className="text-muted-foreground py-6 text-center">
-                  <p>No device found.</p>
-                </div>
-              )}
-            </TabsContent>
-          )}
+          <TabsContent value="device">
+            {host ? (
+              <Card>
+                <CardHeader>
+                  <CardTitle>{host.computer_name}'s Policies</CardTitle>
+                </CardHeader>
+                <CardContent className="space-y-3">
+                  {fleetPolicies.map((policy) => (
+                    <div
+                      key={policy.id}
+                      className={cn(
+                        'hover:bg-muted/50 flex items-center justify-between rounded-md border border-l-4 p-3 shadow-sm transition-colors',
+                        policy.response === 'pass' ? 'border-l-green-500' : 'border-l-red-500',
+                      )}
+                    >
+                      <p className="font-medium">{policy.name}</p>
+                      {policy.response === 'pass' ? (
+                        <div className="flex items-center gap-1 text-green-600">
+                          <CheckCircle2 size={16} />
+                          <span>Pass</span>
+                        </div>
+                      ) : (
+                        <div className="flex items-center gap-1 text-red-600">
+                          <XCircle size={16} />
+                          <span>Fail</span>
+                        </div>
+                      )}
+                    </div>
+                  ))}
+                </CardContent>
+              </Card>
+            ) : (
+              <div className="text-muted-foreground py-6 text-center">
+                <p>No device found.</p>
+              </div>
+            )}
+          </TabsContent>
         </Tabs>
       </CardContent>
     </Card>

apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx

@@ -1,6 +1,5 @@
 import { auth } from '@/utils/auth';
 
-import { getPostHogClient } from '@/app/posthog';
 import {
   type TrainingVideo,
   trainingVideos as trainingVideosData,
@@ -40,10 +39,6 @@ export default async function EmployeeDetailsPage({
   }
 
   const { fleetPolicies, device } = await getFleetPolicies(employee);
-  const isFleetEnabled = await getPostHogClient()?.isFeatureEnabled(
-    'is-fleet-enabled',
-    session?.session.userId,
-  );
 
   return (
     <Employee
@@ -52,7 +47,6 @@ export default async function EmployeeDetailsPage({
       trainingVideos={employeeTrainingVideos}
       fleetPolicies={fleetPolicies}
       host={device}
-      isFleetEnabled={isFleetEnabled ?? false}
     />
   );
 }

apps/app/src/app/(app)/[orgId]/people/layout.tsx

@@ -1,4 +1,3 @@
-import { getPostHogClient } from '@/app/posthog';
 import { auth } from '@/utils/auth';
 import { SecondaryMenu } from '@comp/ui/secondary-menu';
 import { db } from '@db';
@@ -27,11 +26,6 @@ export default async function Layout({ children }: { children: React.ReactNode }
     return roles.includes('employee');
   });
 
-  const isFleetEnabled = await getPostHogClient()?.isFeatureEnabled(
-    'is-fleet-enabled',
-    session?.session.userId,
-  );
-
   return (
     <div className="m-auto max-w-[1200px]">
       <SecondaryMenu
@@ -48,14 +42,10 @@ export default async function Layout({ children }: { children: React.ReactNode }
                 },
               ]
             : []),
-          ...(isFleetEnabled
-            ? [
-                {
-                  path: `/${orgId}/people/devices`,
-                  label: 'Employee Devices',
-                },
-              ]
-            : []),
+          {
+            path: `/${orgId}/people/devices`,
+            label: 'Employee Devices',
+          },
         ]}
       />
 

apps/app/src/jobs/tasks/device/create-fleet-label-for-org.ts

@@ -29,20 +29,21 @@ export const createFleetLabelForOrg = task({
       return;
     }
 
-    const fleetDevicePathMac = process.env.FLEET_DEVICE_PATH_MAC;
-    const fleetDevicePathWindows = process.env.FLEET_DEVICE_PATH_WINDOWS;
+    const fleetDevicePathMac = '/Users/Shared/.fleet';
+    const fleetDevicePathWindows = 'C:\\ProgramData\\CompAI\\Fleet';
+    const windowsFallbackDir = 'C:\\Users\\Public\\CompAI\\Fleet';
 
-    if (!fleetDevicePathMac || !fleetDevicePathWindows) {
-      logger.error('FLEET_DEVICE_PATH_MAC or FLEET_DEVICE_PATH_WINDOWS not configured');
-      return;
-    }
-
-    // Create a query that matches devices from either macOS or Windows
-    const query = `SELECT 1 FROM file WHERE path = '${fleetDevicePathMac}/${organizationId}' OR path = '${fleetDevicePathWindows}\\${organizationId}' LIMIT 1;`;
+    // Simple union query: only file table, constrained per platform path
+    const query = `
+			SELECT 1 FROM file WHERE path = '${fleetDevicePathMac}/${organizationId}'
+			UNION SELECT 1 FROM file WHERE path = '${fleetDevicePathWindows}\\${organizationId}'
+			UNION SELECT 1 FROM file WHERE path = '${windowsFallbackDir}\\${organizationId}'
+			LIMIT 1;`;
+    const normalizedQuery = query.replace(/\s+/g, ' ').trim();
 
     logger.info('Creating label', {
       name: organization.id,
-      query: query,
+      query: normalizedQuery,
     });
 
     const fleet = await getFleetInstance();
@@ -53,7 +54,7 @@ export const createFleetLabelForOrg = task({
       // Create a manual label that we can assign to hosts.
       labelResponse = await fleet.post('/labels', {
         name: organization.id,
-        query: query,
+        query: normalizedQuery,
       });
 
       logger.info('Label created', {

apps/portal/src/app/(app)/(home)/[orgId]/components/EmployeeTasksList.tsx

@@ -15,7 +15,6 @@ interface EmployeeTasksListProps {
   member: Member;
   fleetPolicies: FleetPolicy[];
   host: Host | null;
-  isFleetEnabled: boolean;
 }
 
 export const EmployeeTasksList = ({
@@ -24,7 +23,6 @@ export const EmployeeTasksList = ({
   member,
   fleetPolicies,
   host,
-  isFleetEnabled,
 }: EmployeeTasksListProps) => {
   // Check completion status
   const hasAcceptedPolicies =
@@ -58,16 +56,12 @@ export const EmployeeTasksList = ({
       title: 'Accept security policies',
       content: <PoliciesAccordionItem policies={policies} member={member} />,
     },
-    ...(isFleetEnabled
-      ? [
-          {
-            title: 'Download and install Comp AI Device Agent',
-            content: (
-              <DeviceAgentAccordionItem member={member} host={host} fleetPolicies={fleetPolicies} />
-            ),
-          },
-        ]
-      : []),
+    {
+      title: 'Download and install Comp AI Device Agent',
+      content: (
+        <DeviceAgentAccordionItem member={member} host={host} fleetPolicies={fleetPolicies} />
+      ),
+    },
     {
       title: 'Complete general security awareness training',
       content: <GeneralTrainingAccordionItem trainingVideoCompletions={trainingVideoCompletions} />,

apps/portal/src/app/(app)/(home)/[orgId]/components/OrganizationDashboard.tsx

@@ -15,15 +15,13 @@ interface OrganizationDashboardProps {
   member: MemberWithUserOrg; // Pass the full member object for user info etc.
   fleetPolicies: FleetPolicy[];
   host: Host | null;
-  isFleetEnabled: boolean;
 }
 
 export async function OrganizationDashboard({
   organizationId,
   member,
   fleetPolicies,
   host,
-  isFleetEnabled,
 }: OrganizationDashboardProps) {
   // Fetch policies specific to the selected organization
   const policies = await db.policy.findMany({
@@ -74,7 +72,6 @@ export async function OrganizationDashboard({
       member={member} // Pass the member object down
       fleetPolicies={fleetPolicies}
       host={host}
-      isFleetEnabled={isFleetEnabled ?? false}
     />
   );
 }

apps/portal/src/app/(app)/(home)/[orgId]/page.tsx

@@ -1,7 +1,6 @@
 'use server';
 
 import { auth } from '@/app/lib/auth';
-import { getPostHogClient } from '@/app/posthog';
 import { getFleetInstance } from '@/utils/fleet';
 import type { Member } from '@db';
 import { db } from '@db';
@@ -45,26 +44,13 @@ export default async function OrganizationPage({ params }: { params: Promise<{ o
       return redirect('/'); // Or appropriate login/auth route
     }
 
-    // Check fleet feature flag first
-    let isFleetEnabled = false;
-    try {
-      const postHogClient = await getPostHogClient();
-      isFleetEnabled =
-        (await postHogClient?.isFeatureEnabled('is-fleet-enabled', session?.user.id)) ?? false;
-    } catch (error) {
-      console.error('Error checking fleet feature flag:', error);
-      // Default to false if there's an error
-    }
-
     // Only fetch fleet policies if fleet is enabled
     let fleetPolicies: FleetPolicy[] = [];
     let device: Host | null = null;
 
-    if (isFleetEnabled) {
-      const fleetData = await getFleetPolicies(member);
-      fleetPolicies = fleetData.fleetPolicies;
-      device = fleetData.device;
-    }
+    const fleetData = await getFleetPolicies(member);
+    fleetPolicies = fleetData.fleetPolicies;
+    device = fleetData.device;
 
     return (
       <OrganizationDashboard
@@ -73,7 +59,6 @@ export default async function OrganizationPage({ params }: { params: Promise<{ o
         member={member}
         fleetPolicies={fleetPolicies}
         host={device}
-        isFleetEnabled={isFleetEnabled}
       />
     );
   } catch (error) {

apps/portal/src/app/api/download-agent/fleet-label.ts

@@ -24,30 +24,35 @@ export async function createFleetLabel({
     const fleet = await getFleetInstance();
     logger('Fleet instance obtained successfully');
 
-    // Create platform-specific query
+    // OS-specific queries: mac uses file-only; Windows uses UNION with file and registry
     const query =
       os === 'macos'
         ? `SELECT 1 FROM file WHERE path = '${fleetDevicePathMac}/${employeeId}' LIMIT 1;`
-        : `SELECT 1 FROM file WHERE path = '${fleetDevicePathWindows}\\${employeeId}' LIMIT 1;`;
+        : `SELECT 1 FROM file WHERE path = '${fleetDevicePathWindows}\\${employeeId}'
+           UNION SELECT 1 FROM file WHERE path = 'C:\\Users\\Public\\CompAI\\Fleet\\${employeeId}'
+           LIMIT 1;`;
+
+    // Normalize whitespace to a single line to avoid issues with newlines/tabs
+    const normalizedQuery = query.replace(/\s+/g, ' ').trim();
 
     logger('Generated Fleet query for label creation', {
       employeeId,
       os,
-      query,
+      query: normalizedQuery,
     });
 
     logger('Sending POST request to Fleet API to create label...', {
       labelName: employeeId,
       endpoint: '/labels',
       requestBody: {
         name: employeeId,
-        query: query,
+        query: normalizedQuery,
       },
     });
 
     const response = await fleet.post('/labels', {
       name: employeeId,
-      query: query,
+      query: normalizedQuery,
     });
 
     logger('Fleet API response received', {