diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
index 9b7b567525..c83f73e98e 100644
--- a/src/gql/generated/types.ts
+++ b/src/gql/generated/types.ts
@@ -5158,172 +5158,6 @@ export type UpdateUserSettingsMutation = {
   updateUserSettings: boolean;
 };
 
-export type AwsRegionsQueryVariables = Exact<{ [key: string]: never }>;
-
-export type AwsRegionsQuery = {
-  __typename?: "Query";
-  awsRegions?: Array<string> | null;
-};
-
-export type DistroEventsQueryVariables = Exact<{
-  distroId: Scalars["String"]["input"];
-  limit?: InputMaybe<Scalars["Int"]["input"]>;
-  before?: InputMaybe<Scalars["Time"]["input"]>;
-}>;
-
-export type DistroEventsQuery = {
-  __typename?: "Query";
-  distroEvents: {
-    __typename?: "DistroEventsPayload";
-    count: number;
-    eventLogEntries: Array<{
-      __typename?: "DistroEvent";
-      after?: any | null;
-      before?: any | null;
-      data?: any | null;
-      timestamp: Date;
-      user: string;
-    }>;
-  };
-};
-
-export type DistroTaskQueueQueryVariables = Exact<{
-  distroId: Scalars["String"]["input"];
-}>;
-
-export type DistroTaskQueueQuery = {
-  __typename?: "Query";
-  distroTaskQueue: Array<{
-    __typename?: "TaskQueueItem";
-    activatedBy: string;
-    buildVariant: string;
-    displayName: string;
-    expectedDuration: number;
-    id: string;
-    priority: number;
-    project: string;
-    requester: TaskQueueItemType;
-    version: string;
-  }>;
-};
-
-export type DistroQueryVariables = Exact<{
-  distroId: Scalars["String"]["input"];
-}>;
-
-export type DistroQuery = {
-  __typename?: "Query";
-  distro?: {
-    __typename?: "Distro";
-    aliases: Array<string>;
-    arch: Arch;
-    authorizedKeysFile: string;
-    cloneMethod: CloneMethod;
-    containerPool: string;
-    disabled: boolean;
-    disableShallowClone: boolean;
-    isCluster: boolean;
-    isVirtualWorkStation: boolean;
-    name: string;
-    note: string;
-    provider: Provider;
-    providerSettingsList: Array<any>;
-    setup: string;
-    setupAsSudo: boolean;
-    sshKey: string;
-    sshOptions: Array<string>;
-    user: string;
-    userSpawnAllowed: boolean;
-    validProjects: Array<string | null>;
-    workDir: string;
-    bootstrapSettings: {
-      __typename?: "BootstrapSettings";
-      clientDir: string;
-      communication: CommunicationMethod;
-      jasperBinaryDir: string;
-      jasperCredentialsPath: string;
-      method: BootstrapMethod;
-      rootDir: string;
-      serviceUser: string;
-      shellPath: string;
-      env: Array<{ __typename?: "EnvVar"; key: string; value: string }>;
-      preconditionScripts: Array<{
-        __typename?: "PreconditionScript";
-        path: string;
-        script: string;
-      }>;
-      resourceLimits: {
-        __typename?: "ResourceLimits";
-        lockedMemoryKb: number;
-        numFiles: number;
-        numProcesses: number;
-        numTasks: number;
-        virtualMemoryKb: number;
-      };
-    };
-    dispatcherSettings: {
-      __typename?: "DispatcherSettings";
-      version: DispatcherVersion;
-    };
-    expansions: Array<{ __typename?: "Expansion"; key: string; value: string }>;
-    finderSettings: { __typename?: "FinderSettings"; version: FinderVersion };
-    homeVolumeSettings: {
-      __typename?: "HomeVolumeSettings";
-      formatCommand: string;
-    };
-    hostAllocatorSettings: {
-      __typename?: "HostAllocatorSettings";
-      acceptableHostIdleTime: number;
-      feedbackRule: FeedbackRule;
-      futureHostFraction: number;
-      hostsOverallocatedRule: OverallocatedRule;
-      maximumHosts: number;
-      minimumHosts: number;
-      roundingRule: RoundingRule;
-      version: HostAllocatorVersion;
-    };
-    iceCreamSettings: {
-      __typename?: "IceCreamSettings";
-      configPath: string;
-      schedulerHost: string;
-    };
-    plannerSettings: {
-      __typename?: "PlannerSettings";
-      commitQueueFactor: number;
-      expectedRuntimeFactor: number;
-      generateTaskFactor: number;
-      groupVersions: boolean;
-      mainlineTimeInQueueFactor: number;
-      patchFactor: number;
-      patchTimeInQueueFactor: number;
-      targetTime: number;
-      version: PlannerVersion;
-    };
-  } | null;
-};
-
-export type FailedTaskStatusIconTooltipQueryVariables = Exact<{
-  taskId: Scalars["String"]["input"];
-}>;
-
-export type FailedTaskStatusIconTooltipQuery = {
-  __typename?: "Query";
-  task?: {
-    __typename?: "Task";
-    execution: number;
-    id: string;
-    tests: {
-      __typename?: "TaskTestResult";
-      filteredTestCount: number;
-      testResults: Array<{
-        __typename?: "TestResult";
-        id: string;
-        testFile: string;
-      }>;
-    };
-  } | null;
-};
-
 export type AgentLogsQueryVariables = Exact<{
   id: Scalars["String"]["input"];
   execution?: InputMaybe<Scalars["Int"]["input"]>;
@@ -5439,6 +5273,13 @@ export type AnnotationEventDataQuery = {
   } | null;
 };
 
+export type AwsRegionsQueryVariables = Exact<{ [key: string]: never }>;
+
+export type AwsRegionsQuery = {
+  __typename?: "Query";
+  awsRegions?: Array<string> | null;
+};
+
 export type BaseVersionAndTaskQueryVariables = Exact<{
   taskId: Scalars["String"]["input"];
 }>;
@@ -5717,67 +5558,226 @@ export type DisplayTaskQuery = {
   } | null;
 };
 
-export type DistrosQueryVariables = Exact<{
-  onlySpawnable: Scalars["Boolean"]["input"];
+export type DistroEventsQueryVariables = Exact<{
+  distroId: Scalars["String"]["input"];
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  before?: InputMaybe<Scalars["Time"]["input"]>;
 }>;
 
-export type DistrosQuery = {
-  __typename?: "Query";
-  distros: Array<{
-    __typename?: "Distro";
-    isVirtualWorkStation: boolean;
-    name: string;
-  } | null>;
-};
-
-export type GithubOrgsQueryVariables = Exact<{ [key: string]: never }>;
-
-export type GithubOrgsQuery = {
+export type DistroEventsQuery = {
   __typename?: "Query";
-  spruceConfig?: {
-    __typename?: "SpruceConfig";
-    githubOrgs: Array<string>;
-  } | null;
+  distroEvents: {
+    __typename?: "DistroEventsPayload";
+    count: number;
+    eventLogEntries: Array<{
+      __typename?: "DistroEvent";
+      after?: any | null;
+      before?: any | null;
+      data?: any | null;
+      timestamp: Date;
+      user: string;
+    }>;
+  };
 };
 
-export type GithubProjectConflictsQueryVariables = Exact<{
-  projectId: Scalars["String"]["input"];
+export type DistroTaskQueueQueryVariables = Exact<{
+  distroId: Scalars["String"]["input"];
 }>;
 
-export type GithubProjectConflictsQuery = {
+export type DistroTaskQueueQuery = {
   __typename?: "Query";
-  githubProjectConflicts: {
-    __typename?: "GithubProjectConflicts";
-    commitCheckIdentifiers?: Array<string> | null;
-    commitQueueIdentifiers?: Array<string> | null;
-    prTestingIdentifiers?: Array<string> | null;
-  };
+  distroTaskQueue: Array<{
+    __typename?: "TaskQueueItem";
+    activatedBy: string;
+    buildVariant: string;
+    displayName: string;
+    expectedDuration: number;
+    id: string;
+    priority: number;
+    project: string;
+    requester: TaskQueueItemType;
+    version: string;
+  }>;
 };
 
-export type HasVersionQueryVariables = Exact<{
-  id: Scalars["String"]["input"];
-}>;
-
-export type HasVersionQuery = { __typename?: "Query"; hasVersion: boolean };
-
-export type HostEventsQueryVariables = Exact<{
-  id: Scalars["String"]["input"];
-  tag: Scalars["String"]["input"];
-  limit?: InputMaybe<Scalars["Int"]["input"]>;
-  page?: InputMaybe<Scalars["Int"]["input"]>;
+export type DistroQueryVariables = Exact<{
+  distroId: Scalars["String"]["input"];
 }>;
 
-export type HostEventsQuery = {
+export type DistroQuery = {
   __typename?: "Query";
-  hostEvents: {
-    __typename?: "HostEvents";
-    count: number;
-    eventLogEntries: Array<{
-      __typename?: "HostEventLogEntry";
-      eventType?: string | null;
-      id: string;
-      processedAt: Date;
-      resourceId: string;
+  distro?: {
+    __typename?: "Distro";
+    aliases: Array<string>;
+    arch: Arch;
+    authorizedKeysFile: string;
+    cloneMethod: CloneMethod;
+    containerPool: string;
+    disabled: boolean;
+    disableShallowClone: boolean;
+    isCluster: boolean;
+    isVirtualWorkStation: boolean;
+    name: string;
+    note: string;
+    provider: Provider;
+    providerSettingsList: Array<any>;
+    setup: string;
+    setupAsSudo: boolean;
+    sshKey: string;
+    sshOptions: Array<string>;
+    user: string;
+    userSpawnAllowed: boolean;
+    validProjects: Array<string | null>;
+    workDir: string;
+    bootstrapSettings: {
+      __typename?: "BootstrapSettings";
+      clientDir: string;
+      communication: CommunicationMethod;
+      jasperBinaryDir: string;
+      jasperCredentialsPath: string;
+      method: BootstrapMethod;
+      rootDir: string;
+      serviceUser: string;
+      shellPath: string;
+      env: Array<{ __typename?: "EnvVar"; key: string; value: string }>;
+      preconditionScripts: Array<{
+        __typename?: "PreconditionScript";
+        path: string;
+        script: string;
+      }>;
+      resourceLimits: {
+        __typename?: "ResourceLimits";
+        lockedMemoryKb: number;
+        numFiles: number;
+        numProcesses: number;
+        numTasks: number;
+        virtualMemoryKb: number;
+      };
+    };
+    dispatcherSettings: {
+      __typename?: "DispatcherSettings";
+      version: DispatcherVersion;
+    };
+    expansions: Array<{ __typename?: "Expansion"; key: string; value: string }>;
+    finderSettings: { __typename?: "FinderSettings"; version: FinderVersion };
+    homeVolumeSettings: {
+      __typename?: "HomeVolumeSettings";
+      formatCommand: string;
+    };
+    hostAllocatorSettings: {
+      __typename?: "HostAllocatorSettings";
+      acceptableHostIdleTime: number;
+      feedbackRule: FeedbackRule;
+      futureHostFraction: number;
+      hostsOverallocatedRule: OverallocatedRule;
+      maximumHosts: number;
+      minimumHosts: number;
+      roundingRule: RoundingRule;
+      version: HostAllocatorVersion;
+    };
+    iceCreamSettings: {
+      __typename?: "IceCreamSettings";
+      configPath: string;
+      schedulerHost: string;
+    };
+    plannerSettings: {
+      __typename?: "PlannerSettings";
+      commitQueueFactor: number;
+      expectedRuntimeFactor: number;
+      generateTaskFactor: number;
+      groupVersions: boolean;
+      mainlineTimeInQueueFactor: number;
+      patchFactor: number;
+      patchTimeInQueueFactor: number;
+      targetTime: number;
+      version: PlannerVersion;
+    };
+  } | null;
+};
+
+export type DistrosQueryVariables = Exact<{
+  onlySpawnable: Scalars["Boolean"]["input"];
+}>;
+
+export type DistrosQuery = {
+  __typename?: "Query";
+  distros: Array<{
+    __typename?: "Distro";
+    isVirtualWorkStation: boolean;
+    name: string;
+  } | null>;
+};
+
+export type FailedTaskStatusIconTooltipQueryVariables = Exact<{
+  taskId: Scalars["String"]["input"];
+}>;
+
+export type FailedTaskStatusIconTooltipQuery = {
+  __typename?: "Query";
+  task?: {
+    __typename?: "Task";
+    execution: number;
+    id: string;
+    tests: {
+      __typename?: "TaskTestResult";
+      filteredTestCount: number;
+      testResults: Array<{
+        __typename?: "TestResult";
+        id: string;
+        testFile: string;
+      }>;
+    };
+  } | null;
+};
+
+export type GithubOrgsQueryVariables = Exact<{ [key: string]: never }>;
+
+export type GithubOrgsQuery = {
+  __typename?: "Query";
+  spruceConfig?: {
+    __typename?: "SpruceConfig";
+    githubOrgs: Array<string>;
+  } | null;
+};
+
+export type GithubProjectConflictsQueryVariables = Exact<{
+  projectId: Scalars["String"]["input"];
+}>;
+
+export type GithubProjectConflictsQuery = {
+  __typename?: "Query";
+  githubProjectConflicts: {
+    __typename?: "GithubProjectConflicts";
+    commitCheckIdentifiers?: Array<string> | null;
+    commitQueueIdentifiers?: Array<string> | null;
+    prTestingIdentifiers?: Array<string> | null;
+  };
+};
+
+export type HasVersionQueryVariables = Exact<{
+  id: Scalars["String"]["input"];
+}>;
+
+export type HasVersionQuery = { __typename?: "Query"; hasVersion: boolean };
+
+export type HostEventsQueryVariables = Exact<{
+  id: Scalars["String"]["input"];
+  tag: Scalars["String"]["input"];
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  page?: InputMaybe<Scalars["Int"]["input"]>;
+}>;
+
+export type HostEventsQuery = {
+  __typename?: "Query";
+  hostEvents: {
+    __typename?: "HostEvents";
+    count: number;
+    eventLogEntries: Array<{
+      __typename?: "HostEventLogEntry";
+      eventType?: string | null;
+      id: string;
+      processedAt: Date;
+      resourceId: string;
       resourceType: string;
       timestamp?: Date | null;
       data: {
@@ -5835,6 +5835,51 @@ export type HostQuery = {
   } | null;
 };
 
+export type HostsQueryVariables = Exact<{
+  hostId?: InputMaybe<Scalars["String"]["input"]>;
+  distroId?: InputMaybe<Scalars["String"]["input"]>;
+  currentTaskId?: InputMaybe<Scalars["String"]["input"]>;
+  statuses?: InputMaybe<Array<Scalars["String"]["input"]>>;
+  startedBy?: InputMaybe<Scalars["String"]["input"]>;
+  sortBy?: InputMaybe<HostSortBy>;
+  sortDir?: InputMaybe<SortDirection>;
+  page?: InputMaybe<Scalars["Int"]["input"]>;
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+}>;
+
+export type HostsQuery = {
+  __typename?: "Query";
+  hosts: {
+    __typename?: "HostsResponse";
+    filteredHostsCount?: number | null;
+    totalHostsCount: number;
+    hosts: Array<{
+      __typename?: "Host";
+      distroId?: string | null;
+      elapsed?: Date | null;
+      hostUrl: string;
+      id: string;
+      noExpiration: boolean;
+      provider: string;
+      startedBy: string;
+      status: string;
+      tag: string;
+      totalIdleTime?: number | null;
+      uptime?: Date | null;
+      distro?: {
+        __typename?: "DistroInfo";
+        bootstrapMethod?: string | null;
+        id?: string | null;
+      } | null;
+      runningTask?: {
+        __typename?: "TaskInfo";
+        id?: string | null;
+        name?: string | null;
+      } | null;
+    }>;
+  };
+};
+
 export type InstanceTypesQueryVariables = Exact<{ [key: string]: never }>;
 
 export type InstanceTypesQuery = {
@@ -6924,52 +6969,118 @@ export type ProjectEventLogsQuery = {
   };
 };
 
-export type ProjectSettingsQueryVariables = Exact<{
+export type ProjectHealthViewQueryVariables = Exact<{
   identifier: Scalars["String"]["input"];
 }>;
 
-export type ProjectSettingsQuery = {
+export type ProjectHealthViewQuery = {
   __typename?: "Query";
   projectSettings: {
     __typename?: "ProjectSettings";
-    githubWebhooksEnabled: boolean;
-    aliases?: Array<{
-      __typename?: "ProjectAlias";
-      alias: string;
-      description?: string | null;
-      gitTag: string;
-      id: string;
-      remotePath: string;
-      task: string;
-      taskTags: Array<string>;
-      variant: string;
-      variantTags: Array<string>;
-      parameters: Array<{
-        __typename?: "Parameter";
-        key: string;
-        value: string;
-      }>;
-    }> | null;
     projectRef?: {
       __typename?: "Project";
       id: string;
-      identifier: string;
-      repoRefId: string;
-      admins?: Array<string | null> | null;
-      restricted?: boolean | null;
-      batchTime: number;
-      branch: string;
-      deactivatePrevious?: boolean | null;
-      disabledStatsCache?: boolean | null;
-      dispatchingDisabled?: boolean | null;
-      displayName: string;
-      enabled?: boolean | null;
-      owner: string;
-      patchingDisabled?: boolean | null;
-      remotePath: string;
-      repo: string;
-      repotrackerDisabled?: boolean | null;
-      spawnHostScriptPath: string;
+      projectHealthView: ProjectHealthView;
+    } | null;
+  };
+};
+
+export type ProjectPatchesQueryVariables = Exact<{
+  projectIdentifier: Scalars["String"]["input"];
+  patchesInput: PatchesInput;
+}>;
+
+export type ProjectPatchesQuery = {
+  __typename?: "Query";
+  project: {
+    __typename?: "Project";
+    displayName: string;
+    id: string;
+    patches: {
+      __typename?: "Patches";
+      filteredPatchCount: number;
+      patches: Array<{
+        __typename?: "Patch";
+        activated: boolean;
+        alias?: string | null;
+        author: string;
+        authorDisplayName: string;
+        canEnqueueToCommitQueue: boolean;
+        commitQueuePosition?: number | null;
+        createTime?: Date | null;
+        description: string;
+        id: string;
+        projectIdentifier: string;
+        status: string;
+        projectMetadata?: {
+          __typename?: "Project";
+          owner: string;
+          repo: string;
+        } | null;
+        versionFull?: {
+          __typename?: "Version";
+          id: string;
+          status: string;
+          taskStatusStats?: {
+            __typename?: "TaskStats";
+            counts?: Array<{
+              __typename?: "StatusCount";
+              count: number;
+              status: string;
+            }> | null;
+          } | null;
+        } | null;
+      }>;
+    };
+  };
+};
+
+export type ProjectSettingsQueryVariables = Exact<{
+  identifier: Scalars["String"]["input"];
+}>;
+
+export type ProjectSettingsQuery = {
+  __typename?: "Query";
+  projectSettings: {
+    __typename?: "ProjectSettings";
+    githubWebhooksEnabled: boolean;
+    aliases?: Array<{
+      __typename?: "ProjectAlias";
+      alias: string;
+      description?: string | null;
+      gitTag: string;
+      id: string;
+      remotePath: string;
+      task: string;
+      taskTags: Array<string>;
+      variant: string;
+      variantTags: Array<string>;
+      parameters: Array<{
+        __typename?: "Parameter";
+        key: string;
+        value: string;
+      }>;
+    }> | null;
+    projectRef?: {
+      __typename?: "Project";
+      id: string;
+      identifier: string;
+      repoRefId: string;
+      admins?: Array<string | null> | null;
+      restricted?: boolean | null;
+      batchTime: number;
+      branch: string;
+      deactivatePrevious?: boolean | null;
+      disabledStatsCache?: boolean | null;
+      dispatchingDisabled?: boolean | null;
+      displayName: string;
+      enabled?: boolean | null;
+      owner: string;
+      patchingDisabled?: boolean | null;
+      remotePath: string;
+      repo: string;
+      repotrackerDisabled?: boolean | null;
+      spawnHostScriptPath: string;
       stepbackDisabled?: boolean | null;
       versionControlEnabled?: boolean | null;
       notifyOnBuildFailure?: boolean | null;
@@ -7815,6 +7926,97 @@ export type RepoSettingsQuery = {
   };
 };
 
+export type SpawnExpirationInfoQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SpawnExpirationInfoQuery = {
+  __typename?: "Query";
+  myHosts: Array<{ __typename?: "Host"; id: string; noExpiration: boolean }>;
+  myVolumes: Array<{
+    __typename?: "Volume";
+    id: string;
+    noExpiration: boolean;
+  }>;
+};
+
+export type SpawnTaskQueryVariables = Exact<{
+  taskId: Scalars["String"]["input"];
+}>;
+
+export type SpawnTaskQuery = {
+  __typename?: "Query";
+  task?: {
+    __typename?: "Task";
+    canSync: boolean;
+    buildVariant: string;
+    buildVariantDisplayName?: string | null;
+    displayName: string;
+    execution: number;
+    id: string;
+    revision?: string | null;
+    status: string;
+    project?: {
+      __typename?: "Project";
+      id: string;
+      spawnHostScriptPath: string;
+    } | null;
+  } | null;
+};
+
+export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SpruceConfigQuery = {
+  __typename?: "Query";
+  spruceConfig?: {
+    __typename?: "SpruceConfig";
+    banner?: string | null;
+    bannerTheme?: string | null;
+    containerPools?: {
+      __typename?: "ContainerPoolsConfig";
+      pools: Array<{
+        __typename?: "ContainerPool";
+        distro: string;
+        id: string;
+        maxContainers: number;
+        port: number;
+      }>;
+    } | null;
+    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
+    keys: Array<{ __typename?: "SSHKey"; location: string; name: string }>;
+    providers?: {
+      __typename?: "CloudProviderConfig";
+      aws?: {
+        __typename?: "AWSConfig";
+        maxVolumeSizePerUser?: number | null;
+        pod?: {
+          __typename?: "AWSPodConfig";
+          ecs?: {
+            __typename?: "ECSConfig";
+            maxCPU: number;
+            maxMemoryMb: number;
+          } | null;
+        } | null;
+      } | null;
+    } | null;
+    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
+    spawnHost: {
+      __typename?: "SpawnHostConfig";
+      spawnHostsPerUser: number;
+      unexpirableHostsPerUser: number;
+      unexpirableVolumesPerUser: number;
+    };
+    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
+  } | null;
+};
+
+export type SubnetAvailabilityZonesQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type SubnetAvailabilityZonesQuery = {
+  __typename?: "Query";
+  subnetAvailabilityZones: Array<string>;
+};
+
 export type SystemLogsQueryVariables = Exact<{
   id: Scalars["String"]["input"];
   execution?: InputMaybe<Scalars["Int"]["input"]>;
@@ -7948,6 +8150,18 @@ export type TaskNamesForBuildVariantQuery = {
   taskNamesForBuildVariant?: Array<string> | null;
 };
 
+export type TaskQueueDistrosQueryVariables = Exact<{ [key: string]: never }>;
+
+export type TaskQueueDistrosQuery = {
+  __typename?: "Query";
+  taskQueueDistros: Array<{
+    __typename?: "TaskQueueDistro";
+    hostCount: number;
+    id: string;
+    taskCount: number;
+  }>;
+};
+
 export type TaskStatusesQueryVariables = Exact<{
   id: Scalars["String"]["input"];
 }>;
@@ -8237,49 +8451,174 @@ export type UserConfigQuery = {
   } | null;
 };
 
-export type UserSettingsQueryVariables = Exact<{ [key: string]: never }>;
+export type UserDistroSettingsPermissionsQueryVariables = Exact<{
+  distroId: Scalars["String"]["input"];
+}>;
 
-export type UserSettingsQuery = {
+export type UserDistroSettingsPermissionsQuery = {
   __typename?: "Query";
-  userSettings?: {
-    __typename?: "UserSettings";
-    dateFormat?: string | null;
-    region?: string | null;
-    slackMemberId?: string | null;
-    slackUsername?: string | null;
-    timezone?: string | null;
-    githubUser?: {
-      __typename?: "GithubUser";
-      lastKnownAs?: string | null;
-    } | null;
-    notifications?: {
-      __typename?: "Notifications";
-      buildBreak?: string | null;
-      commitQueue?: string | null;
-      patchFinish?: string | null;
-      patchFirstFailure?: string | null;
-      spawnHostExpiration?: string | null;
-      spawnHostOutcome?: string | null;
-    } | null;
-    useSpruceOptions?: {
-      __typename?: "UseSpruceOptions";
-      hasUsedMainlineCommitsBefore?: boolean | null;
-      hasUsedSpruceBefore?: boolean | null;
-      spruceV1?: boolean | null;
-    } | null;
-  } | null;
+  user: {
+    __typename?: "User";
+    userId: string;
+    permissions: {
+      __typename?: "Permissions";
+      canCreateDistro: boolean;
+      distroPermissions: { __typename?: "DistroPermissions"; admin: boolean };
+    };
+  };
 };
 
-export type UserQueryVariables = Exact<{ [key: string]: never }>;
+export type UserPatchesQueryVariables = Exact<{
+  userId: Scalars["String"]["input"];
+  patchesInput: PatchesInput;
+}>;
 
-export type UserQuery = {
+export type UserPatchesQuery = {
   __typename?: "Query";
   user: {
     __typename?: "User";
-    displayName: string;
-    emailAddress: string;
     userId: string;
-    permissions: { __typename?: "Permissions"; canEditAdminSettings: boolean };
+    patches: {
+      __typename?: "Patches";
+      filteredPatchCount: number;
+      patches: Array<{
+        __typename?: "Patch";
+        activated: boolean;
+        alias?: string | null;
+        author: string;
+        authorDisplayName: string;
+        canEnqueueToCommitQueue: boolean;
+        commitQueuePosition?: number | null;
+        createTime?: Date | null;
+        description: string;
+        id: string;
+        projectIdentifier: string;
+        status: string;
+        projectMetadata?: {
+          __typename?: "Project";
+          owner: string;
+          repo: string;
+        } | null;
+        versionFull?: {
+          __typename?: "Version";
+          id: string;
+          status: string;
+          taskStatusStats?: {
+            __typename?: "TaskStats";
+            counts?: Array<{
+              __typename?: "StatusCount";
+              count: number;
+              status: string;
+            }> | null;
+          } | null;
+        } | null;
+      }>;
+    };
+  };
+};
+
+export type UserProjectSettingsPermissionsQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type UserProjectSettingsPermissionsQuery = {
+  __typename?: "Query";
+  user: {
+    __typename?: "User";
+    userId: string;
+    permissions: { __typename?: "Permissions"; canCreateProject: boolean };
+  };
+};
+
+export type UserSettingsQueryVariables = Exact<{ [key: string]: never }>;
+
+export type UserSettingsQuery = {
+  __typename?: "Query";
+  userSettings?: {
+    __typename?: "UserSettings";
+    dateFormat?: string | null;
+    region?: string | null;
+    slackMemberId?: string | null;
+    slackUsername?: string | null;
+    timezone?: string | null;
+    githubUser?: {
+      __typename?: "GithubUser";
+      lastKnownAs?: string | null;
+    } | null;
+    notifications?: {
+      __typename?: "Notifications";
+      buildBreak?: string | null;
+      commitQueue?: string | null;
+      patchFinish?: string | null;
+      patchFirstFailure?: string | null;
+      spawnHostExpiration?: string | null;
+      spawnHostOutcome?: string | null;
+    } | null;
+    useSpruceOptions?: {
+      __typename?: "UseSpruceOptions";
+      hasUsedMainlineCommitsBefore?: boolean | null;
+      hasUsedSpruceBefore?: boolean | null;
+      spruceV1?: boolean | null;
+    } | null;
+  } | null;
+};
+
+export type UserSubscriptionsQueryVariables = Exact<{ [key: string]: never }>;
+
+export type UserSubscriptionsQuery = {
+  __typename?: "Query";
+  user: {
+    __typename?: "User";
+    userId: string;
+    subscriptions?: Array<{
+      __typename?: "GeneralSubscription";
+      id: string;
+      ownerType: string;
+      resourceType: string;
+      trigger: string;
+      triggerData?: { [key: string]: any } | null;
+      regexSelectors: Array<{
+        __typename?: "Selector";
+        data: string;
+        type: string;
+      }>;
+      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
+      subscriber?: {
+        __typename?: "SubscriberWrapper";
+        type: string;
+        subscriber: {
+          __typename?: "Subscriber";
+          emailSubscriber?: string | null;
+          jiraCommentSubscriber?: string | null;
+          slackSubscriber?: string | null;
+        };
+      } | null;
+    }> | null;
+  };
+  userSettings?: {
+    __typename?: "UserSettings";
+    notifications?: {
+      __typename?: "Notifications";
+      buildBreakId?: string | null;
+      commitQueueId?: string | null;
+      patchFinishId?: string | null;
+      patchFirstFailureId?: string | null;
+      spawnHostExpirationId?: string | null;
+      spawnHostOutcomeId?: string | null;
+    } | null;
+  } | null;
+};
+
+export type UserQueryVariables = Exact<{ [key: string]: never }>;
+
+export type UserQuery = {
+  __typename?: "Query";
+  user: {
+    __typename?: "User";
+    displayName: string;
+    emailAddress: string;
+    userId: string;
+    permissions: { __typename?: "Permissions"; canEditAdminSettings: boolean };
   };
 };
 
@@ -8494,342 +8833,3 @@ export type ViewableProjectRefsQuery = {
     repo?: { __typename?: "RepoRef"; id: string } | null;
   } | null>;
 };
-
-export type HostsQueryVariables = Exact<{
-  hostId?: InputMaybe<Scalars["String"]["input"]>;
-  distroId?: InputMaybe<Scalars["String"]["input"]>;
-  currentTaskId?: InputMaybe<Scalars["String"]["input"]>;
-  statuses?: InputMaybe<Array<Scalars["String"]["input"]>>;
-  startedBy?: InputMaybe<Scalars["String"]["input"]>;
-  sortBy?: InputMaybe<HostSortBy>;
-  sortDir?: InputMaybe<SortDirection>;
-  page?: InputMaybe<Scalars["Int"]["input"]>;
-  limit?: InputMaybe<Scalars["Int"]["input"]>;
-}>;
-
-export type HostsQuery = {
-  __typename?: "Query";
-  hosts: {
-    __typename?: "HostsResponse";
-    filteredHostsCount?: number | null;
-    totalHostsCount: number;
-    hosts: Array<{
-      __typename?: "Host";
-      distroId?: string | null;
-      elapsed?: Date | null;
-      hostUrl: string;
-      id: string;
-      noExpiration: boolean;
-      provider: string;
-      startedBy: string;
-      status: string;
-      tag: string;
-      totalIdleTime?: number | null;
-      uptime?: Date | null;
-      distro?: {
-        __typename?: "DistroInfo";
-        bootstrapMethod?: string | null;
-        id?: string | null;
-      } | null;
-      runningTask?: {
-        __typename?: "TaskInfo";
-        id?: string | null;
-        name?: string | null;
-      } | null;
-    }>;
-  };
-};
-
-export type ProjectHealthViewQueryVariables = Exact<{
-  identifier: Scalars["String"]["input"];
-}>;
-
-export type ProjectHealthViewQuery = {
-  __typename?: "Query";
-  projectSettings: {
-    __typename?: "ProjectSettings";
-    projectRef?: {
-      __typename?: "Project";
-      id: string;
-      projectHealthView: ProjectHealthView;
-    } | null;
-  };
-};
-
-export type ProjectPatchesQueryVariables = Exact<{
-  projectIdentifier: Scalars["String"]["input"];
-  patchesInput: PatchesInput;
-}>;
-
-export type ProjectPatchesQuery = {
-  __typename?: "Query";
-  project: {
-    __typename?: "Project";
-    displayName: string;
-    id: string;
-    patches: {
-      __typename?: "Patches";
-      filteredPatchCount: number;
-      patches: Array<{
-        __typename?: "Patch";
-        activated: boolean;
-        alias?: string | null;
-        author: string;
-        authorDisplayName: string;
-        canEnqueueToCommitQueue: boolean;
-        commitQueuePosition?: number | null;
-        createTime?: Date | null;
-        description: string;
-        id: string;
-        projectIdentifier: string;
-        status: string;
-        projectMetadata?: {
-          __typename?: "Project";
-          owner: string;
-          repo: string;
-        } | null;
-        versionFull?: {
-          __typename?: "Version";
-          id: string;
-          status: string;
-          taskStatusStats?: {
-            __typename?: "TaskStats";
-            counts?: Array<{
-              __typename?: "StatusCount";
-              count: number;
-              status: string;
-            }> | null;
-          } | null;
-        } | null;
-      }>;
-    };
-  };
-};
-
-export type SpawnExpirationInfoQueryVariables = Exact<{ [key: string]: never }>;
-
-export type SpawnExpirationInfoQuery = {
-  __typename?: "Query";
-  myHosts: Array<{ __typename?: "Host"; id: string; noExpiration: boolean }>;
-  myVolumes: Array<{
-    __typename?: "Volume";
-    id: string;
-    noExpiration: boolean;
-  }>;
-};
-
-export type SpawnTaskQueryVariables = Exact<{
-  taskId: Scalars["String"]["input"];
-}>;
-
-export type SpawnTaskQuery = {
-  __typename?: "Query";
-  task?: {
-    __typename?: "Task";
-    canSync: boolean;
-    buildVariant: string;
-    buildVariantDisplayName?: string | null;
-    displayName: string;
-    execution: number;
-    id: string;
-    revision?: string | null;
-    status: string;
-    project?: {
-      __typename?: "Project";
-      id: string;
-      spawnHostScriptPath: string;
-    } | null;
-  } | null;
-};
-
-export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
-
-export type SpruceConfigQuery = {
-  __typename?: "Query";
-  spruceConfig?: {
-    __typename?: "SpruceConfig";
-    banner?: string | null;
-    bannerTheme?: string | null;
-    containerPools?: {
-      __typename?: "ContainerPoolsConfig";
-      pools: Array<{
-        __typename?: "ContainerPool";
-        distro: string;
-        id: string;
-        maxContainers: number;
-        port: number;
-      }>;
-    } | null;
-    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
-    keys: Array<{ __typename?: "SSHKey"; location: string; name: string }>;
-    providers?: {
-      __typename?: "CloudProviderConfig";
-      aws?: {
-        __typename?: "AWSConfig";
-        maxVolumeSizePerUser?: number | null;
-        pod?: {
-          __typename?: "AWSPodConfig";
-          ecs?: {
-            __typename?: "ECSConfig";
-            maxCPU: number;
-            maxMemoryMb: number;
-          } | null;
-        } | null;
-      } | null;
-    } | null;
-    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
-    spawnHost: {
-      __typename?: "SpawnHostConfig";
-      spawnHostsPerUser: number;
-      unexpirableHostsPerUser: number;
-      unexpirableVolumesPerUser: number;
-    };
-    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
-  } | null;
-};
-
-export type SubnetAvailabilityZonesQueryVariables = Exact<{
-  [key: string]: never;
-}>;
-
-export type SubnetAvailabilityZonesQuery = {
-  __typename?: "Query";
-  subnetAvailabilityZones: Array<string>;
-};
-
-export type TaskQueueDistrosQueryVariables = Exact<{ [key: string]: never }>;
-
-export type TaskQueueDistrosQuery = {
-  __typename?: "Query";
-  taskQueueDistros: Array<{
-    __typename?: "TaskQueueDistro";
-    hostCount: number;
-    id: string;
-    taskCount: number;
-  }>;
-};
-
-export type UserDistroSettingsPermissionsQueryVariables = Exact<{
-  distroId: Scalars["String"]["input"];
-}>;
-
-export type UserDistroSettingsPermissionsQuery = {
-  __typename?: "Query";
-  user: {
-    __typename?: "User";
-    userId: string;
-    permissions: {
-      __typename?: "Permissions";
-      canCreateDistro: boolean;
-      distroPermissions: { __typename?: "DistroPermissions"; admin: boolean };
-    };
-  };
-};
-
-export type UserPatchesQueryVariables = Exact<{
-  userId: Scalars["String"]["input"];
-  patchesInput: PatchesInput;
-}>;
-
-export type UserPatchesQuery = {
-  __typename?: "Query";
-  user: {
-    __typename?: "User";
-    userId: string;
-    patches: {
-      __typename?: "Patches";
-      filteredPatchCount: number;
-      patches: Array<{
-        __typename?: "Patch";
-        activated: boolean;
-        alias?: string | null;
-        author: string;
-        authorDisplayName: string;
-        canEnqueueToCommitQueue: boolean;
-        commitQueuePosition?: number | null;
-        createTime?: Date | null;
-        description: string;
-        id: string;
-        projectIdentifier: string;
-        status: string;
-        projectMetadata?: {
-          __typename?: "Project";
-          owner: string;
-          repo: string;
-        } | null;
-        versionFull?: {
-          __typename?: "Version";
-          id: string;
-          status: string;
-          taskStatusStats?: {
-            __typename?: "TaskStats";
-            counts?: Array<{
-              __typename?: "StatusCount";
-              count: number;
-              status: string;
-            }> | null;
-          } | null;
-        } | null;
-      }>;
-    };
-  };
-};
-
-export type UserProjectSettingsPermissionsQueryVariables = Exact<{
-  [key: string]: never;
-}>;
-
-export type UserProjectSettingsPermissionsQuery = {
-  __typename?: "Query";
-  user: {
-    __typename?: "User";
-    userId: string;
-    permissions: { __typename?: "Permissions"; canCreateProject: boolean };
-  };
-};
-
-export type UserSubscriptionsQueryVariables = Exact<{ [key: string]: never }>;
-
-export type UserSubscriptionsQuery = {
-  __typename?: "Query";
-  user: {
-    __typename?: "User";
-    userId: string;
-    subscriptions?: Array<{
-      __typename?: "GeneralSubscription";
-      id: string;
-      ownerType: string;
-      resourceType: string;
-      trigger: string;
-      triggerData?: { [key: string]: any } | null;
-      regexSelectors: Array<{
-        __typename?: "Selector";
-        data: string;
-        type: string;
-      }>;
-      selectors: Array<{ __typename?: "Selector"; data: string; type: string }>;
-      subscriber?: {
-        __typename?: "SubscriberWrapper";
-        type: string;
-        subscriber: {
-          __typename?: "Subscriber";
-          emailSubscriber?: string | null;
-          jiraCommentSubscriber?: string | null;
-          slackSubscriber?: string | null;
-        };
-      } | null;
-    }> | null;
-  };
-  userSettings?: {
-    __typename?: "UserSettings";
-    notifications?: {
-      __typename?: "Notifications";
-      buildBreakId?: string | null;
-      commitQueueId?: string | null;
-      patchFinishId?: string | null;
-      patchFirstFailureId?: string | null;
-      spawnHostExpirationId?: string | null;
-      spawnHostOutcomeId?: string | null;
-    } | null;
-  } | null;
-};