From 33e218a9f7e72967105b50d9dda3580d7714874b Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 12:01:05 -0500
Subject: [PATCH 01/53] feat(onboarding): add internal boot step to flow

- Purpose: introduce a dedicated onboarding step for internal boot setup using existing webgui behavior and endpoints.

- Before: onboarding had no internal boot step, so users had to leave onboarding and configure it elsewhere.

- Problem: internal boot setup was disconnected from first-run setup and could not be intentionally skipped/recorded in onboarding state.

- Change: added an INTERNAL_BOOT step after core settings, hidden for partner builds, with skip support and persisted draft state.

- Implementation: added internal boot template parser/submission helper, new step UI with validation (slots/devices/size/update BIOS), and modal/step registry wiring.
---
 .../components/Onboarding/OnboardingModal.vue |  41 +-
 .../components/Onboarding/OnboardingSteps.vue |   2 +
 .../Onboarding/composables/internalBoot.ts    | 205 +++++++
 web/src/components/Onboarding/stepRegistry.ts |   7 +
 .../steps/OnboardingInternalBootStep.vue      | 499 ++++++++++++++++++
 .../Onboarding/store/onboardingDraft.ts       |  85 +++
 6 files changed, 826 insertions(+), 13 deletions(-)
 create mode 100644 web/src/components/Onboarding/composables/internalBoot.ts
 create mode 100644 web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue

diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 76bbaddef9..47333eca11 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -31,7 +31,7 @@ const { activationRequired, hasActivationCode, registrationState } = storeToRefs
   useActivationCodeDataStore()
 );
 const onboardingStore = useUpgradeOnboardingStore();
-const { shouldShowOnboarding, isVersionDrift, completedAtVersion, canDisplayOnboardingModal } =
+const { shouldShowOnboarding, isVersionDrift, completedAtVersion, canDisplayOnboardingModal, isPartnerBuild } =
   storeToRefs(onboardingStore);
 const { refetchOnboarding } = onboardingStore;
 const purchaseStore = usePurchaseStore();
@@ -61,6 +61,7 @@ const activateExternal = computed(() => purchaseStore.openInNewTab);
 type StepId =
   | 'OVERVIEW'
   | 'CONFIGURE_SETTINGS'
+  | 'INTERNAL_BOOT'
   | 'ADD_PLUGINS'
   | 'ACTIVATE_LICENSE'
   | 'SUMMARY'
@@ -70,6 +71,7 @@ type StepId =
 const HARDCODED_STEPS: Array<{ id: StepId; required: boolean }> = [
   { id: 'OVERVIEW', required: false },
   { id: 'CONFIGURE_SETTINGS', required: false },
+  { id: 'INTERNAL_BOOT', required: false },
   { id: 'ADD_PLUGINS', required: false },
   { id: 'ACTIVATE_LICENSE', required: true },
   { id: 'SUMMARY', required: false },
@@ -83,20 +85,15 @@ const showActivationStep = computed(() => {
 });
 
 // Determine which steps to show based on user state
-const availableSteps = computed<StepId[]>(() => {
-  if (showActivationStep.value) {
-    return HARDCODED_STEPS.map((s) => s.id);
-  }
-  return HARDCODED_STEPS.filter((s) => s.id !== 'ACTIVATE_LICENSE').map((s) => s.id);
-});
+const visibleHardcodedSteps = computed(() =>
+  HARDCODED_STEPS.filter((step) => showActivationStep.value || step.id !== 'ACTIVATE_LICENSE').filter(
+    (step) => !isPartnerBuild.value || step.id !== 'INTERNAL_BOOT'
+  )
+);
+const availableSteps = computed<StepId[]>(() => visibleHardcodedSteps.value.map((step) => step.id));
 
 // Filtered steps as full objects for OnboardingSteps component
-const filteredSteps = computed(() => {
-  if (showActivationStep.value) {
-    return HARDCODED_STEPS;
-  }
-  return HARDCODED_STEPS.filter((s) => s.id !== 'ACTIVATE_LICENSE');
-});
+const filteredSteps = computed(() => visibleHardcodedSteps.value);
 
 const isLoginPage = computed(() => {
   const hasLoginRoute = window.location.pathname.includes('login');
@@ -243,6 +240,14 @@ const handlePluginsSkip = async () => {
   await goToNextStep();
 };
 
+const handleInternalBootComplete = async () => {
+  await goToNextStep();
+};
+
+const handleInternalBootSkip = async () => {
+  await goToNextStep();
+};
+
 const handleExitIntent = () => {
   showExitConfirmDialog.value = true;
 };
@@ -311,6 +316,16 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
       };
     }
 
+    case 'INTERNAL_BOOT': {
+      const hardcodedStep = HARDCODED_STEPS.find((s) => s.id === 'INTERNAL_BOOT');
+      return {
+        ...baseProps,
+        onComplete: handleInternalBootComplete,
+        onSkip: hardcodedStep?.required ? undefined : handleInternalBootSkip,
+        showSkip: !hardcodedStep?.required,
+      };
+    }
+
     case 'ACTIVATE_LICENSE':
       return {
         ...baseProps,
diff --git a/web/src/components/Onboarding/OnboardingSteps.vue b/web/src/components/Onboarding/OnboardingSteps.vue
index 46a24bed27..6798cf4f3f 100644
--- a/web/src/components/Onboarding/OnboardingSteps.vue
+++ b/web/src/components/Onboarding/OnboardingSteps.vue
@@ -10,6 +10,7 @@ import { stepMetadata } from '~/components/Onboarding/stepRegistry';
 type StepId =
   | 'OVERVIEW'
   | 'CONFIGURE_SETTINGS'
+  | 'INTERNAL_BOOT'
   | 'ADD_PLUGINS'
   | 'ACTIVATE_LICENSE'
   | 'SUMMARY'
@@ -54,6 +55,7 @@ const dynamicSteps = computed(() => {
     const defaultSteps = [
       metadataLookup.OVERVIEW,
       metadataLookup.CONFIGURE_SETTINGS,
+      metadataLookup.INTERNAL_BOOT,
       metadataLookup.ADD_PLUGINS,
       metadataLookup.ACTIVATE_LICENSE,
     ];
diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
new file mode 100644
index 0000000000..24d14a981b
--- /dev/null
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -0,0 +1,205 @@
+export interface InternalBootDeviceOption {
+  value: string;
+  label: string;
+  sizeMiB: number | null;
+}
+
+export interface InternalBootTemplateData {
+  isBootPoolUiAvailable: boolean;
+  isBootPoolEligible: boolean;
+  poolNameDefault: string;
+  slotOptions: number[];
+  deviceOptions: InternalBootDeviceOption[];
+  bootSizePresetsMiB: number[];
+  defaultBootSizeMiB: number;
+  defaultUpdateBios: boolean;
+}
+
+export interface InternalBootSelection {
+  poolName: string;
+  devices: string[];
+  bootSizeMiB: number;
+  updateBios: boolean;
+}
+
+export interface SubmitInternalBootOptions {
+  reboot?: boolean;
+}
+
+export interface InternalBootSubmitResult {
+  ok: boolean;
+  code?: number;
+  output: string;
+}
+
+const DEFAULT_BOOT_SIZE_MIB = 16384;
+
+const parseInteger = (value: string | null | undefined): number | null => {
+  if (!value) {
+    return null;
+  }
+  const parsed = Number.parseInt(value, 10);
+  return Number.isFinite(parsed) ? parsed : null;
+};
+
+const parsePositiveInteger = (value: string | null | undefined): number | null => {
+  const parsed = parseInteger(value);
+  if (parsed === null || parsed <= 0) {
+    return null;
+  }
+  return parsed;
+};
+
+const parseTemplateData = (html: string): InternalBootTemplateData => {
+  const parser = new DOMParser();
+  const documentNode = parser.parseFromString(html, 'text/html');
+  const templateRoot = documentNode.querySelector('#templatePopupBootPool');
+
+  if (!templateRoot) {
+    return {
+      isBootPoolUiAvailable: false,
+      isBootPoolEligible: false,
+      poolNameDefault: 'cache',
+      slotOptions: [1, 2],
+      deviceOptions: [],
+      bootSizePresetsMiB: [16384, 32768, 65536, 131072],
+      defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
+      defaultUpdateBios: true,
+    };
+  }
+
+  const slotOptions = Array.from(templateRoot.querySelectorAll('select[name="poolSlots"] option'))
+    .map((option) => parsePositiveInteger(option.getAttribute('value')))
+    .filter((value): value is number => value !== null);
+
+  const deviceOptions = Array.from(
+    templateRoot.querySelectorAll('#bootPoolDevicesSource select option')
+  )
+    .map((option) => {
+      const value = option.getAttribute('value')?.trim() ?? '';
+      if (!value) {
+        return null;
+      }
+      return {
+        value,
+        label: option.textContent?.trim() ?? value,
+        sizeMiB: parsePositiveInteger(option.getAttribute('data-size-mib')),
+      };
+    })
+    .filter((option): option is InternalBootDeviceOption => option !== null);
+
+  const bootSizePresetsMiB = Array.from(
+    templateRoot.querySelectorAll('select[name="poolBootSizePreset"] option')
+  )
+    .map((option) => parseInteger(option.getAttribute('value')))
+    .filter((value): value is number => value !== null && value >= 0);
+
+  const defaultBootSizeMiB =
+    parsePositiveInteger(
+      templateRoot.querySelector('input[name="poolBootSize"]')?.getAttribute('value')
+    ) ?? bootSizePresetsMiB[0] ?? DEFAULT_BOOT_SIZE_MIB;
+
+  const poolNameDefault =
+    templateRoot.querySelector<HTMLInputElement>('input[name="poolName"]')?.value?.trim() || 'cache';
+  const defaultUpdateBios = Boolean(
+    templateRoot.querySelector<HTMLInputElement>('input[name="poolUpdateBios"]')?.checked
+  );
+  const isBootPoolEligible = Boolean(
+    documentNode.querySelector('input[onclick="addBootPoolPopup()"]')
+  );
+
+  return {
+    isBootPoolUiAvailable: true,
+    isBootPoolEligible,
+    poolNameDefault,
+    slotOptions: slotOptions.length > 0 ? slotOptions : [1, 2],
+    deviceOptions,
+    bootSizePresetsMiB:
+      bootSizePresetsMiB.length > 0 ? bootSizePresetsMiB : [16384, 32768, 65536, 131072],
+    defaultBootSizeMiB,
+    defaultUpdateBios,
+  };
+};
+
+export const fetchInternalBootTemplateData = async (): Promise<InternalBootTemplateData> => {
+  const response = await fetch('/Main/PoolDevices', {
+    credentials: 'same-origin',
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to load pool devices page (${response.status})`);
+  }
+
+  const html = await response.text();
+  return parseTemplateData(html);
+};
+
+const buildInternalBootArgs = (
+  selection: InternalBootSelection,
+  options: SubmitInternalBootOptions
+): string[] => {
+  const args = [selection.poolName, String(selection.bootSizeMiB), ...selection.devices];
+  if (selection.updateBios) {
+    args.push('updatebios');
+  }
+  if (options.reboot) {
+    args.push('reboot');
+  }
+  args.push('update');
+  return args;
+};
+
+export const submitInternalBootCreation = async (
+  selection: InternalBootSelection,
+  options: SubmitInternalBootOptions = {}
+): Promise<InternalBootSubmitResult> => {
+  const payload = new URLSearchParams();
+  const args = buildInternalBootArgs(selection, options);
+  for (const arg of args) {
+    payload.append('args[]', arg);
+  }
+
+  const response = await fetch('/plugins/dynamix/include/mkbootpool.php', {
+    method: 'POST',
+    credentials: 'same-origin',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+    },
+    body: payload.toString(),
+  });
+
+  const raw = await response.text();
+
+  try {
+    const parsed = JSON.parse(raw) as {
+      ok?: boolean;
+      code?: number;
+      output?: string;
+    };
+    return {
+      ok: Boolean(parsed.ok),
+      code: parsed.code,
+      output: parsed.output ?? raw,
+    };
+  } catch {
+    return {
+      ok: false,
+      output: raw || `mkbootpool request failed (${response.status})`,
+    };
+  }
+};
+
+export const submitInternalBootReboot = () => {
+  const form = document.createElement('form');
+  form.method = 'POST';
+  form.action = '/webGui/include/Boot.php';
+  form.className = 'hidden';
+
+  const cmd = document.createElement('input');
+  cmd.type = 'hidden';
+  cmd.name = 'cmd';
+  cmd.value = 'reboot';
+  form.appendChild(cmd);
+
+  document.body.appendChild(form);
+  form.submit();
+};
diff --git a/web/src/components/Onboarding/stepRegistry.ts b/web/src/components/Onboarding/stepRegistry.ts
index 07daee9e2c..ebc82a6040 100644
--- a/web/src/components/Onboarding/stepRegistry.ts
+++ b/web/src/components/Onboarding/stepRegistry.ts
@@ -1,6 +1,7 @@
 import type { Component } from 'vue';
 
 import OnboardingCoreSettingsStep from '~/components/Onboarding/steps/OnboardingCoreSettingsStep.vue';
+import OnboardingInternalBootStep from '~/components/Onboarding/steps/OnboardingInternalBootStep.vue';
 import OnboardingLicenseStep from '~/components/Onboarding/steps/OnboardingLicenseStep.vue';
 import OnboardingNextStepsStep from '~/components/Onboarding/steps/OnboardingNextStepsStep.vue';
 import OnboardingOverviewStep from '~/components/Onboarding/steps/OnboardingOverviewStep.vue';
@@ -10,6 +11,7 @@ import OnboardingSummaryStep from '~/components/Onboarding/steps/OnboardingSumma
 export const stepComponents: Record<string, Component> = {
   OVERVIEW: OnboardingOverviewStep,
   CONFIGURE_SETTINGS: OnboardingCoreSettingsStep,
+  INTERNAL_BOOT: OnboardingInternalBootStep,
   ADD_PLUGINS: OnboardingPluginsStep,
   ACTIVATE_LICENSE: OnboardingLicenseStep,
   SUMMARY: OnboardingSummaryStep,
@@ -33,6 +35,11 @@ export const stepMetadata: Record<string, StepMetadataEntry> = {
     descriptionKey: 'onboarding.coreSettings.description',
     icon: 'i-heroicons-cog-6-tooth',
   },
+  INTERNAL_BOOT: {
+    titleKey: 'Internal Boot',
+    descriptionKey: 'Configure bootable pool',
+    icon: 'i-heroicons-circle-stack',
+  },
   ADD_PLUGINS: {
     titleKey: 'onboarding.pluginsStep.installEssentialPlugins',
     descriptionKey: 'onboarding.pluginsStep.addHelpfulPlugins',
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
new file mode 100644
index 0000000000..de85a6f6f4
--- /dev/null
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -0,0 +1,499 @@
+<script lang="ts" setup>
+import { computed, onMounted, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { ChevronLeftIcon, CircleStackIcon } from '@heroicons/vue/24/outline';
+import { ChevronRightIcon, ExclamationTriangleIcon } from '@heroicons/vue/24/solid';
+import { BrandButton } from '@unraid/ui';
+import {
+  fetchInternalBootTemplateData,
+  type InternalBootTemplateData,
+} from '@/components/Onboarding/composables/internalBoot';
+import {
+  type OnboardingInternalBootSelection,
+  useOnboardingDraftStore,
+} from '@/components/Onboarding/store/onboardingDraft';
+
+export interface Props {
+  onComplete: () => void;
+  onSkip?: () => void;
+  onBack?: () => void;
+  showSkip?: boolean;
+  showBack?: boolean;
+  isSavingStep?: boolean;
+}
+
+const props = defineProps<Props>();
+const { t } = useI18n();
+const draftStore = useOnboardingDraftStore();
+
+const isLoading = ref(true);
+const loadError = ref<string | null>(null);
+const formError = ref<string | null>(null);
+const templateData = ref<InternalBootTemplateData | null>(null);
+
+const poolName = ref('cache');
+const slotCount = ref(1);
+const selectedDevices = ref<string[]>(['']);
+const bootSizePreset = ref<string>('');
+const customBootSizeGb = ref('');
+const updateBios = ref(true);
+
+const isBusy = computed(() => Boolean(props.isSavingStep) || isLoading.value);
+const isBootPoolUiAvailable = computed(() => Boolean(templateData.value?.isBootPoolUiAvailable));
+const isBootPoolEligible = computed(() => Boolean(templateData.value?.isBootPoolEligible));
+const deviceOptions = computed(() => templateData.value?.deviceOptions ?? []);
+const slotOptions = computed(() => templateData.value?.slotOptions ?? [1, 2]);
+
+const canConfigure = computed(
+  () => isBootPoolUiAvailable.value && isBootPoolEligible.value && deviceOptions.value.length > 0
+);
+
+const loadStatusMessage = computed(() => {
+  if (loadError.value) {
+    return loadError.value;
+  }
+  if (!isBootPoolUiAvailable.value) {
+    return 'Internal boot setup is only available while the array is stopped.';
+  }
+  if (!isBootPoolEligible.value) {
+    return 'This server is not currently eligible for internal boot setup.';
+  }
+  if (deviceOptions.value.length === 0) {
+    return 'No eligible devices were detected for internal boot setup.';
+  }
+  return '';
+});
+
+const deviceSizeById = computed(() => {
+  const entries = new Map<string, number>();
+  for (const option of deviceOptions.value) {
+    if (option.sizeMiB !== null) {
+      entries.set(option.value, option.sizeMiB);
+    }
+  }
+  return entries;
+});
+
+const selectedSlotDevices = computed(() =>
+  selectedDevices.value.slice(0, slotCount.value).filter((value) => value.length > 0)
+);
+
+const smallestSelectedDeviceMiB = computed(() => {
+  let minValue: number | null = null;
+  for (const device of selectedSlotDevices.value) {
+    const size = deviceSizeById.value.get(device);
+    if (!size || size <= 0) {
+      continue;
+    }
+    minValue = minValue === null ? size : Math.min(minValue, size);
+  }
+  return minValue;
+});
+
+const maxBootSizeMiB = computed(() => {
+  if (smallestSelectedDeviceMiB.value === null) {
+    return null;
+  }
+  return Math.floor(smallestSelectedDeviceMiB.value / 2);
+});
+
+const maxCustomBootSizeGb = computed(() => {
+  if (maxBootSizeMiB.value === null) {
+    return null;
+  }
+  return Math.max(1, Math.floor(maxBootSizeMiB.value / 1024));
+});
+
+const visiblePresetOptions = computed(() => {
+  const presets = templateData.value?.bootSizePresetsMiB ?? [];
+  const maxSizeMiB = maxBootSizeMiB.value;
+  const filtered = presets.filter((value) => {
+    if (value === 0) {
+      return true;
+    }
+    if (maxSizeMiB === null) {
+      return true;
+    }
+    return value <= maxSizeMiB;
+  });
+
+  return filtered.map((value) => ({
+    value: String(value),
+    label: value === 0 ? 'Whole drive' : `${Math.round(value / 1024)} GB`,
+  }));
+});
+
+const bootSizeMiB = computed(() => {
+  if (bootSizePreset.value === 'custom') {
+    const sizeGb = Number.parseInt(customBootSizeGb.value, 10);
+    if (!Number.isFinite(sizeGb)) {
+      return null;
+    }
+    return sizeGb * 1024;
+  }
+
+  const presetValue = Number.parseInt(bootSizePreset.value, 10);
+  if (!Number.isFinite(presetValue)) {
+    return null;
+  }
+  return presetValue;
+});
+
+const bootSizeHelpText = computed(() => {
+  if (maxCustomBootSizeGb.value === null) {
+    return 'Minimum is 4 GB.';
+  }
+  return `Minimum is 4 GB; maximum is ${maxCustomBootSizeGb.value} GB (50% of the smallest selected drive).`;
+});
+
+const normalizeSelectedDevices = (count: number) => {
+  const nextDevices = selectedDevices.value.slice(0, count);
+  while (nextDevices.length < count) {
+    nextDevices.push('');
+  }
+  selectedDevices.value = nextDevices;
+};
+
+const applyBootSizeSelection = (valueMiB: number) => {
+  const presetMatch = visiblePresetOptions.value.find((option) => Number.parseInt(option.value, 10) === valueMiB);
+  if (presetMatch) {
+    bootSizePreset.value = presetMatch.value;
+    customBootSizeGb.value = '';
+    return;
+  }
+
+  bootSizePreset.value = 'custom';
+  const sizeGb = Math.max(4, Math.round(valueMiB / 1024));
+  customBootSizeGb.value = String(sizeGb);
+};
+
+watch(
+  slotCount,
+  (value) => {
+    normalizeSelectedDevices(value);
+  },
+  { immediate: true }
+);
+
+watch(
+  [visiblePresetOptions, maxCustomBootSizeGb],
+  () => {
+    if (bootSizePreset.value !== 'custom') {
+      const exists = visiblePresetOptions.value.some((option) => option.value === bootSizePreset.value);
+      if (!exists) {
+        const firstVisible = visiblePresetOptions.value[0];
+        if (firstVisible) {
+          bootSizePreset.value = firstVisible.value;
+        } else {
+          bootSizePreset.value = 'custom';
+        }
+      }
+    }
+
+    if (bootSizePreset.value === 'custom') {
+      const parsed = Number.parseInt(customBootSizeGb.value, 10);
+      if (!Number.isFinite(parsed)) {
+        return;
+      }
+      if (parsed < 4) {
+        customBootSizeGb.value = '4';
+      }
+      if (maxCustomBootSizeGb.value !== null && parsed > maxCustomBootSizeGb.value) {
+        customBootSizeGb.value = String(maxCustomBootSizeGb.value);
+      }
+    }
+  },
+  { immediate: true }
+);
+
+watch([poolName, slotCount, selectedDevices, bootSizePreset, customBootSizeGb, updateBios], () => {
+  if (formError.value) {
+    formError.value = null;
+  }
+});
+
+const isDeviceDisabled = (deviceId: string, index: number) => {
+  return selectedDevices.value.some((selected, selectedIndex) => selectedIndex !== index && selected === deviceId);
+};
+
+const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
+  const normalizedPoolName = poolName.value.trim();
+  if (!normalizedPoolName) {
+    formError.value = 'Pool name is required.';
+    return null;
+  }
+
+  const poolNamePattern = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
+  if (!poolNamePattern.test(normalizedPoolName)) {
+    formError.value =
+      'Pool name must start with a lowercase letter and contain only lowercase letters, numbers, and ~ . _ -.';
+    return null;
+  }
+
+  if (slotCount.value < 1 || slotCount.value > 2) {
+    formError.value = 'Select 1 or 2 slots.';
+    return null;
+  }
+
+  const devices = selectedDevices.value.slice(0, slotCount.value);
+  if (devices.length !== slotCount.value || devices.some((device) => !device)) {
+    formError.value = 'Select a device for each slot.';
+    return null;
+  }
+
+  const uniqueDevices = new Set(devices);
+  if (uniqueDevices.size !== devices.length) {
+    formError.value = 'Each selected device must be unique.';
+    return null;
+  }
+
+  const selectedBootSizeMiB = bootSizeMiB.value;
+  if (selectedBootSizeMiB === null || !Number.isFinite(selectedBootSizeMiB)) {
+    formError.value = 'Select a valid boot reserved size.';
+    return null;
+  }
+  if (selectedBootSizeMiB < 4096) {
+    formError.value = 'Boot reserved size must be at least 4 GB.';
+    return null;
+  }
+  if (maxBootSizeMiB.value !== null && selectedBootSizeMiB > maxBootSizeMiB.value) {
+    formError.value = 'Boot reserved size cannot exceed 50% of the smallest selected drive.';
+    return null;
+  }
+
+  return {
+    poolName: normalizedPoolName,
+    slotCount: slotCount.value,
+    devices,
+    bootSizeMiB: selectedBootSizeMiB,
+    updateBios: updateBios.value,
+  };
+};
+
+const initializeForm = (data: InternalBootTemplateData) => {
+  const draftSelection = draftStore.internalBootSelection;
+  const firstSlot = data.slotOptions[0] ?? 1;
+  const defaultSlot = Math.max(1, Math.min(2, firstSlot));
+
+  poolName.value = draftSelection?.poolName || data.poolNameDefault || 'cache';
+  slotCount.value = draftSelection?.slotCount ?? defaultSlot;
+  selectedDevices.value =
+    draftSelection?.devices.slice(0, slotCount.value) ?? Array.from({ length: slotCount.value }, () => '');
+  normalizeSelectedDevices(slotCount.value);
+
+  updateBios.value = draftSelection?.updateBios ?? data.defaultUpdateBios;
+  applyBootSizeSelection(draftSelection?.bootSizeMiB ?? data.defaultBootSizeMiB);
+};
+
+onMounted(async () => {
+  isLoading.value = true;
+  loadError.value = null;
+
+  try {
+    const data = await fetchInternalBootTemplateData();
+    templateData.value = data;
+    initializeForm(data);
+  } catch (error) {
+    loadError.value = error instanceof Error ? error.message : 'Unable to load internal boot options.';
+  } finally {
+    isLoading.value = false;
+  }
+});
+
+const handleBack = () => {
+  props.onBack?.();
+};
+
+const handleSkip = () => {
+  draftStore.skipInternalBoot();
+  if (props.onSkip) {
+    props.onSkip();
+  } else {
+    props.onComplete();
+  }
+};
+
+const handlePrimaryAction = () => {
+  if (!canConfigure.value) {
+    draftStore.skipInternalBoot();
+    props.onComplete();
+    return;
+  }
+
+  const selection = buildValidatedSelection();
+  if (!selection) {
+    return;
+  }
+
+  draftStore.setInternalBootSelection(selection);
+  props.onComplete();
+};
+
+const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Continue'));
+</script>
+
+<template>
+  <div class="mx-auto w-full max-w-4xl px-4 pb-4 md:px-8">
+    <div class="bg-elevated border-muted rounded-xl border p-6 text-left shadow-sm md:p-10">
+      <div class="mb-8 flex flex-col justify-between gap-4 md:flex-row md:items-start">
+        <div class="space-y-2">
+          <div class="flex items-center gap-3">
+            <CircleStackIcon class="text-primary h-8 w-8" />
+            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">Internal Boot</h2>
+          </div>
+          <p class="text-muted text-lg">
+            Configure an internal bootable pool now, or skip and set it up later from the webgui.
+          </p>
+        </div>
+      </div>
+
+      <blockquote class="my-8 border-s-4 border-yellow-500 bg-yellow-100 p-4">
+        <div class="flex items-start gap-2">
+          <ExclamationTriangleIcon class="mt-0.5 h-6 w-6 flex-shrink-0 text-yellow-700" />
+          <p class="text-sm leading-relaxed text-yellow-900">
+            All selected devices will be formatted.
+          </p>
+        </div>
+      </blockquote>
+
+      <div v-if="isLoading" class="text-muted rounded-lg border border-dashed p-4 text-sm">
+        Loading internal boot options...
+      </div>
+
+      <div
+        v-else-if="!canConfigure"
+        class="rounded-lg border border-yellow-200 bg-yellow-50 p-4 text-sm text-yellow-900 dark:border-yellow-800 dark:bg-yellow-900/10 dark:text-yellow-200"
+      >
+        {{ loadStatusMessage }}
+      </div>
+
+      <div v-else class="space-y-5">
+        <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
+          <label class="space-y-2">
+            <span class="text-muted text-sm font-medium">Pool name</span>
+            <input
+              v-model="poolName"
+              type="text"
+              maxlength="40"
+              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
+              :disabled="isBusy"
+            />
+          </label>
+
+          <label class="space-y-2">
+            <span class="text-muted text-sm font-medium">Slots</span>
+            <select
+              v-model.number="slotCount"
+              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
+              :disabled="isBusy"
+            >
+              <option v-for="option in slotOptions" :key="option" :value="option">{{ option }}</option>
+            </select>
+          </label>
+        </div>
+
+        <div class="space-y-3">
+          <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Devices</h3>
+          <div v-for="(selectedDevice, index) in selectedDevices" :key="index" class="space-y-2">
+            <label class="text-muted text-sm font-medium">Device {{ index + 1 }}</label>
+            <select
+              v-model="selectedDevices[index]"
+              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
+              :disabled="isBusy"
+            >
+              <option value="">Select device</option>
+              <option
+                v-for="option in deviceOptions"
+                :key="option.value"
+                :value="option.value"
+                :disabled="isDeviceDisabled(option.value, index)"
+              >
+                {{ option.label }}
+              </option>
+            </select>
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
+          <label class="space-y-2">
+            <span class="text-muted text-sm font-medium">Boot reserved size</span>
+            <select
+              v-model="bootSizePreset"
+              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
+              :disabled="isBusy"
+            >
+              <option v-for="option in visiblePresetOptions" :key="option.value" :value="option.value">
+                {{ option.label }}
+              </option>
+              <option value="custom">User defined</option>
+            </select>
+          </label>
+
+          <label class="space-y-2">
+            <span class="text-muted text-sm font-medium">Custom size (GB)</span>
+            <input
+              v-model="customBootSizeGb"
+              type="number"
+              min="4"
+              :max="maxCustomBootSizeGb ?? undefined"
+              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
+              :disabled="isBusy || bootSizePreset !== 'custom'"
+            />
+          </label>
+        </div>
+
+        <p class="text-muted text-xs">{{ bootSizeHelpText }}</p>
+
+        <label class="flex items-center gap-3 text-sm">
+          <input v-model="updateBios" type="checkbox" class="h-4 w-4" :disabled="isBusy" />
+          <span class="text-highlighted font-medium">Update BIOS boot order</span>
+        </label>
+        <p class="text-muted text-xs">
+          Some systems may need manual intervention to change boot order in the BIOS.
+        </p>
+      </div>
+
+      <div
+        v-if="formError"
+        class="mt-6 rounded-lg border border-red-200 bg-red-50 p-4 text-sm font-medium text-red-700 dark:border-red-800 dark:bg-red-900/10 dark:text-red-300"
+      >
+        {{ formError }}
+      </div>
+
+      <div
+        class="border-muted mt-8 flex flex-col-reverse items-center justify-between gap-6 border-t pt-8 sm:flex-row"
+      >
+        <button
+          v-if="showBack"
+          @click="handleBack"
+          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors sm:w-auto sm:justify-start"
+          :disabled="isBusy"
+        >
+          <ChevronLeftIcon class="h-5 w-5 transition-transform group-hover:-translate-x-0.5" />
+          {{ t('common.back') }}
+        </button>
+        <div v-else class="hidden w-1 sm:block" />
+
+        <div class="flex w-full flex-col items-center gap-4 sm:w-auto sm:flex-row">
+          <button
+            v-if="showSkip"
+            @click="handleSkip"
+            class="text-muted hover:text-highlighted text-sm font-medium transition-colors sm:mr-2"
+            :disabled="isBusy"
+          >
+            {{ t('common.skipForNow', 'Skip for now') }}
+          </button>
+          <BrandButton
+            :text="primaryButtonText"
+            class="!bg-primary hover:!bg-primary/90 w-full min-w-[160px] font-bold tracking-wide !text-white uppercase shadow-md transition-all hover:shadow-lg sm:w-auto"
+            :disabled="isBusy"
+            :loading="isBusy"
+            @click="handlePrimaryAction"
+            :icon-right="ChevronRightIcon"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/web/src/components/Onboarding/store/onboardingDraft.ts b/web/src/components/Onboarding/store/onboardingDraft.ts
index dcee6df950..009323efff 100644
--- a/web/src/components/Onboarding/store/onboardingDraft.ts
+++ b/web/src/components/Onboarding/store/onboardingDraft.ts
@@ -1,6 +1,14 @@
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 
+export interface OnboardingInternalBootSelection {
+  poolName: string;
+  slotCount: number;
+  devices: string[];
+  bootSizeMiB: number;
+  updateBios: boolean;
+}
+
 const normalizePersistedPlugins = (value: unknown): string[] => {
   if (Array.isArray(value)) {
     return value.filter((item): item is string => typeof item === 'string');
@@ -13,6 +21,39 @@ const normalizePersistedPlugins = (value: unknown): string[] => {
   return [];
 };
 
+const normalizePersistedInternalBootSelection = (
+  value: unknown
+): OnboardingInternalBootSelection | null => {
+  if (!value || typeof value !== 'object') {
+    return null;
+  }
+
+  const candidate = value as {
+    poolName?: unknown;
+    slotCount?: unknown;
+    devices?: unknown;
+    bootSizeMiB?: unknown;
+    updateBios?: unknown;
+  };
+
+  const poolName = typeof candidate.poolName === 'string' ? candidate.poolName : '';
+  const parsedSlotCount = Number(candidate.slotCount);
+  const slotCount = Number.isFinite(parsedSlotCount) ? Math.max(1, Math.min(2, parsedSlotCount)) : 1;
+  const devices = Array.isArray(candidate.devices)
+    ? candidate.devices.filter((item): item is string => typeof item === 'string')
+    : [];
+  const parsedBootSize = Number(candidate.bootSizeMiB);
+  const bootSizeMiB = Number.isFinite(parsedBootSize) && parsedBootSize > 0 ? parsedBootSize : 16384;
+
+  return {
+    poolName,
+    slotCount,
+    devices,
+    bootSizeMiB,
+    updateBios: Boolean(candidate.updateBios),
+  };
+};
+
 export const useOnboardingDraftStore = defineStore(
   'onboardingDraft',
   () => {
@@ -29,6 +70,12 @@ export const useOnboardingDraftStore = defineStore(
     const selectedPlugins = ref<Set<string>>(new Set());
     const pluginSelectionInitialized = ref(false);
 
+    // Internal boot
+    const internalBootSelection = ref<OnboardingInternalBootSelection | null>(null);
+    const internalBootInitialized = ref(false);
+    const internalBootSkipped = ref(false);
+    const internalBootApplySucceeded = ref(false);
+
     // Navigation
     const currentStepIndex = ref(0);
 
@@ -55,6 +102,30 @@ export const useOnboardingDraftStore = defineStore(
       pluginSelectionInitialized.value = true;
     }
 
+    function setInternalBootSelection(selection: OnboardingInternalBootSelection) {
+      internalBootSelection.value = {
+        poolName: selection.poolName,
+        slotCount: selection.slotCount,
+        devices: [...selection.devices],
+        bootSizeMiB: selection.bootSizeMiB,
+        updateBios: selection.updateBios,
+      };
+      internalBootInitialized.value = true;
+      internalBootSkipped.value = false;
+      internalBootApplySucceeded.value = false;
+    }
+
+    function skipInternalBoot() {
+      internalBootSelection.value = null;
+      internalBootInitialized.value = true;
+      internalBootSkipped.value = true;
+      internalBootApplySucceeded.value = false;
+    }
+
+    function setInternalBootApplySucceeded(value: boolean) {
+      internalBootApplySucceeded.value = value;
+    }
+
     function setStepIndex(index: number) {
       currentStepIndex.value = index;
     }
@@ -69,9 +140,16 @@ export const useOnboardingDraftStore = defineStore(
       coreSettingsInitialized,
       selectedPlugins,
       pluginSelectionInitialized,
+      internalBootSelection,
+      internalBootInitialized,
+      internalBootSkipped,
+      internalBootApplySucceeded,
       currentStepIndex,
       setCoreSettings,
       setPlugins,
+      setInternalBootSelection,
+      skipInternalBoot,
+      setInternalBootApplySucceeded,
       setStepIndex,
     };
   },
@@ -85,6 +163,9 @@ export const useOnboardingDraftStore = defineStore(
         },
         deserialize: (value) => {
           const parsed = JSON.parse(value) as Record<string, unknown>;
+          const normalizedInternalBootSelection = normalizePersistedInternalBootSelection(
+            parsed.internalBootSelection
+          );
           const hasLegacyCoreDraft =
             (typeof parsed.serverName === 'string' && parsed.serverName.length > 0) ||
             (typeof parsed.serverDescription === 'string' && parsed.serverDescription.length > 0) ||
@@ -99,6 +180,10 @@ export const useOnboardingDraftStore = defineStore(
           return {
             ...parsed,
             selectedPlugins: new Set(normalizePersistedPlugins(parsed.selectedPlugins)),
+            internalBootSelection: normalizedInternalBootSelection,
+            internalBootInitialized: Boolean(parsed.internalBootInitialized),
+            internalBootSkipped: Boolean(parsed.internalBootSkipped),
+            internalBootApplySucceeded: Boolean(parsed.internalBootApplySucceeded),
             coreSettingsInitialized: Boolean(parsed.coreSettingsInitialized || hasLegacyCoreDraft),
             pluginSelectionInitialized: hadLegacyPluginShape
               ? false

From 1ceb91aef0bb54e3314089119de305ec5008702f Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 12:01:18 -0500
Subject: [PATCH 02/53] feat(onboarding): apply internal boot setup from
 summary

- Purpose: execute internal boot configuration during onboarding confirm/apply and surface reboot follow-up.

- Before: summary only applied core settings/plugins/ssh; internal boot selections were not applied.

- Problem: users could choose internal boot but onboarding would not run mkbootpool or reflect reboot needs.

- Change: summary now calls mkbootpool endpoint without reboot, logs command output, and treats failures as warnings in best-effort flow.

- Implementation: added internal boot summary card, included internal boot in apply-change detection, and switched final CTA to reboot when internal boot apply succeeds.
---
 .../steps/OnboardingNextStepsStep.vue         |  20 ++-
 .../steps/OnboardingSummaryStep.vue           | 115 +++++++++++++++++-
 2 files changed, 130 insertions(+), 5 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
index 998d6d2276..78f886f88e 100644
--- a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
@@ -16,7 +16,9 @@ import { CheckCircleIcon, EnvelopeIcon } from '@heroicons/vue/24/solid';
 import { BrandButton } from '@unraid/ui';
 // Use ?raw to import SVG content string
 import UnraidIconSvg from '@/assets/partners/simple-icons-unraid.svg?raw';
+import { submitInternalBootReboot } from '@/components/Onboarding/composables/internalBoot';
 import { useActivationCodeDataStore } from '@/components/Onboarding/store/activationCodeData';
+import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
 
 export interface Props {
   onComplete: () => void;
@@ -27,6 +29,7 @@ export interface Props {
 const props = defineProps<Props>();
 const { t } = useI18n();
 const store = useActivationCodeDataStore();
+const draftStore = useOnboardingDraftStore();
 
 const partnerInfo = computed(() => store.partnerInfo);
 const activationCode = computed(() => store.activationCode);
@@ -45,6 +48,10 @@ const hasExtraLinks = computed(() => (partnerInfo.value?.partner?.extraLinks?.le
 // Check if we have any content to show in the "Learn about your server" section
 // Only show if there are LINKS (docs or extra links) - system specs alone isn't enough
 const hasAnyPartnerContent = computed(() => hasCoreDocsLinks.value || hasExtraLinks.value);
+const showRebootButton = computed(() => draftStore.internalBootApplySucceeded);
+const primaryButtonText = computed(() =>
+  showRebootButton.value ? 'Reboot' : t('onboarding.nextSteps.continueToDashboard')
+);
 
 const basicsItems = [
   { label: t('onboarding.nextSteps.basics.shares'), url: 'https://docs.unraid.net/go/shares/' },
@@ -72,6 +79,15 @@ const handleMouseMove = (e: MouseEvent) => {
   el.style.setProperty('--x', `${x}px`);
   el.style.setProperty('--y', `${y}px`);
 };
+
+const handlePrimaryAction = () => {
+  if (showRebootButton.value) {
+    submitInternalBootReboot();
+    return;
+  }
+
+  props.onComplete();
+};
 </script>
 
 <template>
@@ -339,9 +355,9 @@ const handleMouseMove = (e: MouseEvent) => {
         <div v-else class="hidden w-1 sm:block" />
 
         <BrandButton
-          :text="t('onboarding.nextSteps.continueToDashboard')"
+          :text="primaryButtonText"
           class="!bg-primary hover:!bg-primary/90 w-full min-w-[200px] !text-white shadow-md transition-all hover:shadow-lg sm:w-auto"
-          @click="props.onComplete"
+          @click="handlePrimaryAction"
           :icon-right="CheckCircleIcon"
         />
       </div>
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index b1c5fb267e..b9cc2f4df3 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -7,6 +7,7 @@ import { useMutation, useQuery } from '@vue/apollo-composable';
 import {
   ChevronLeftIcon,
   ClipboardDocumentCheckIcon,
+  CircleStackIcon,
   CubeIcon,
   GlobeAltIcon,
   LanguageIcon,
@@ -24,6 +25,7 @@ import {
 } from '@heroicons/vue/24/solid';
 import { BrandButton, Dialog } from '@unraid/ui';
 import OnboardingConsole from '@/components/Onboarding/components/OnboardingConsole.vue';
+import { submitInternalBootCreation } from '@/components/Onboarding/composables/internalBoot';
 import usePluginInstaller, {
   INSTALL_OPERATION_TIMEOUT_CODE,
 } from '@/components/Onboarding/composables/usePluginInstaller';
@@ -119,6 +121,37 @@ const displayLanguage = computed(() => {
   return draftStore.selectedLanguage || coreSettingsResult.value?.display?.locale || 'en_US';
 });
 
+const internalBootSelection = computed(() => {
+  if (draftStore.internalBootSkipped) {
+    return null;
+  }
+  return draftStore.internalBootSelection;
+});
+
+const hasInternalBootSelection = computed(() => Boolean(internalBootSelection.value));
+
+const formatBootSize = (bootSizeMiB: number) => {
+  if (bootSizeMiB === 0) {
+    return 'Whole drive';
+  }
+  return `${Math.round(bootSizeMiB / 1024)} GB`;
+};
+
+const internalBootSummary = computed(() => {
+  const selection = internalBootSelection.value;
+  if (!selection) {
+    return null;
+  }
+
+  return {
+    poolName: selection.poolName,
+    slotCount: selection.slotCount,
+    devices: selection.devices,
+    bootReservedSize: formatBootSize(selection.bootSizeMiB),
+    updateBios: selection.updateBios,
+  };
+});
+
 // Processing State
 const isProcessing = ref(false);
 const error = ref<string | null>(null);
@@ -288,7 +321,7 @@ const hasCoreSettingChanges = computed(() => {
 });
 
 const hasAnyChangesToApply = computed(
-  () => hasCoreSettingChanges.value || pluginIdsToInstall.value.length > 0
+  () => hasCoreSettingChanges.value || pluginIdsToInstall.value.length > 0 || hasInternalBootSelection.value
 );
 const isApplyDataReady = computed(() =>
   Boolean(coreSettingsResult.value?.server && coreSettingsResult.value?.vars)
@@ -387,6 +420,7 @@ const handleComplete = async () => {
   logs.value = []; // Clear logs
 
   addLog('Starting configuration...', 'info');
+  draftStore.setInternalBootApplySucceeded(false);
   if (showApplyReadinessWarning.value) {
     addLog('Baseline settings unavailable. Continuing in best-effort mode.', 'info');
   }
@@ -619,7 +653,41 @@ const handleComplete = async () => {
       }
     }
 
-    // 3. SSH (Run separately and optimistically)
+    // 3. Internal boot setup
+    if (internalBootSelection.value) {
+      const selection = internalBootSelection.value;
+      addLog('Configuring internal boot pool...', 'info');
+      try {
+        const result = await submitInternalBootCreation(
+          {
+            poolName: selection.poolName,
+            devices: selection.devices,
+            bootSizeMiB: selection.bootSizeMiB,
+            updateBios: selection.updateBios,
+          },
+          { reboot: false }
+        );
+
+        if (result.ok) {
+          draftStore.setInternalBootApplySucceeded(true);
+          addLog('Internal boot pool configured.', 'success');
+          if (result.output.trim().length > 0) {
+            addLog(`Internal boot output:\n${result.output}`, 'info');
+          }
+        } else {
+          hadNonOptimisticFailures = true;
+          hadWarnings = true;
+          addLog(`Internal boot setup returned an error: ${result.output}`, 'error');
+        }
+      } catch (e: unknown) {
+        hadNonOptimisticFailures = true;
+        hadWarnings = true;
+        const errorMessage = e instanceof Error ? e.message : 'Unknown error';
+        addLog(`Internal boot setup failed: ${errorMessage}`, 'error');
+      }
+    }
+
+    // 4. SSH (Run separately and optimistically)
     if (shouldApplySsh) {
       addLog(`Updating SSH Settings...`, 'info');
       try {
@@ -646,7 +714,7 @@ const handleComplete = async () => {
       }
     }
 
-    // 4. Mark Complete
+    // 5. Mark Complete
     addLog('Finalizing setup...', 'info');
 
     try {
@@ -844,6 +912,47 @@ const handleBack = () => {
             </div>
           </div>
         </div>
+
+        <div v-if="internalBootSummary" class="border-muted bg-bg/50 rounded-lg border p-5">
+          <div class="mb-4 flex items-center gap-2">
+            <CircleStackIcon class="text-primary h-5 w-5" />
+            <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Internal Boot</h3>
+          </div>
+          <div class="space-y-3">
+            <div class="flex items-center justify-between text-sm">
+              <span class="text-muted">Pool</span>
+              <span class="text-highlighted font-medium">{{ internalBootSummary.poolName }}</span>
+            </div>
+            <div class="flex items-center justify-between text-sm">
+              <span class="text-muted">Slots</span>
+              <span class="text-highlighted font-medium">{{ internalBootSummary.slotCount }}</span>
+            </div>
+            <div class="flex items-center justify-between text-sm">
+              <span class="text-muted">Boot Reserved</span>
+              <span class="text-highlighted font-medium">{{
+                internalBootSummary.bootReservedSize
+              }}</span>
+            </div>
+            <div class="flex items-center justify-between text-sm">
+              <span class="text-muted">Update BIOS</span>
+              <span class="text-highlighted font-medium">{{
+                internalBootSummary.updateBios ? 'Yes' : 'No'
+              }}</span>
+            </div>
+            <div>
+              <p class="text-muted mb-1 text-sm">Devices</p>
+              <ul class="space-y-1">
+                <li
+                  v-for="device in internalBootSummary.devices"
+                  :key="device"
+                  class="text-highlighted text-sm font-medium"
+                >
+                  {{ device }}
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
       </div>
 
       <!-- Plugins Summary -->

From f3b108477460b6498ec9c4942dc997813a9f703b Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 12:01:26 -0500
Subject: [PATCH 03/53] test(onboarding): cover internal boot step and apply
 path

- Purpose: validate onboarding step routing and summary apply behavior after internal boot integration.

- Before: tests assumed old step indexes and had no assertions for internal boot visibility or mkbootpool execution.

- Problem: regressions in partner-step visibility and internal boot apply flow would be hard to detect.

- Change: updated modal tests for INTERNAL_BOOT presence/hiding and adjusted activation-step index expectations.

- Implementation: extended summary tests to mock internal boot submission, verify no-reboot payload, success flag behavior, and warning path on failures.
---
 .../Onboarding/OnboardingModal.test.ts        | 25 +++++-
 .../Onboarding/OnboardingSummaryStep.test.ts  | 78 ++++++++++++++++++-
 2 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index 811375b70a..4f1348ee96 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -40,6 +40,7 @@ const {
     isVersionDrift: { value: false },
     completedAtVersion: { value: null },
     canDisplayOnboardingModal: { value: true },
+    isPartnerBuild: { value: false },
     refetchOnboarding: vi.fn().mockResolvedValue(undefined),
   },
   onboardingDraftStore: {
@@ -97,6 +98,7 @@ vi.mock('~/components/Onboarding/stepRegistry', () => ({
   stepComponents: {
     OVERVIEW: { template: '<div data-testid="overview-step" />' },
     CONFIGURE_SETTINGS: { template: '<div data-testid="settings-step" />' },
+    INTERNAL_BOOT: { template: '<div data-testid="internal-boot-step" />' },
     ADD_PLUGINS: { template: '<div data-testid="plugins-step" />' },
     ACTIVATE_LICENSE: { template: '<div data-testid="license-step" />' },
     SUMMARY: { template: '<div data-testid="summary-step" />' },
@@ -149,6 +151,7 @@ describe('OnboardingModal.vue', () => {
     upgradeOnboardingStore.isVersionDrift.value = false;
     upgradeOnboardingStore.completedAtVersion.value = null;
     upgradeOnboardingStore.canDisplayOnboardingModal.value = true;
+    upgradeOnboardingStore.isPartnerBuild.value = false;
     onboardingDraftStore.currentStepIndex.value = 0;
 
     Object.defineProperty(window, 'location', {
@@ -235,7 +238,7 @@ describe('OnboardingModal.vue', () => {
 
   it('shows activation step for ENOKEYFILE2', () => {
     activationCodeDataStore.registrationState.value = 'ENOKEYFILE2';
-    onboardingDraftStore.currentStepIndex.value = 3;
+    onboardingDraftStore.currentStepIndex.value = 4;
 
     const wrapper = mountComponent();
 
@@ -244,7 +247,7 @@ describe('OnboardingModal.vue', () => {
 
   it('omits activation step for non-activation registration states', () => {
     activationCodeDataStore.registrationState.value = 'BASIC';
-    onboardingDraftStore.currentStepIndex.value = 3;
+    onboardingDraftStore.currentStepIndex.value = 4;
 
     const wrapper = mountComponent();
 
@@ -252,6 +255,24 @@ describe('OnboardingModal.vue', () => {
     expect(wrapper.find('[data-testid="summary-step"]').exists()).toBe(true);
   });
 
+  it('shows internal boot step for regular builds', () => {
+    onboardingDraftStore.currentStepIndex.value = 2;
+
+    const wrapper = mountComponent();
+
+    expect(wrapper.find('[data-testid="internal-boot-step"]').exists()).toBe(true);
+  });
+
+  it('hides internal boot step for partner builds', () => {
+    upgradeOnboardingStore.isPartnerBuild.value = true;
+    onboardingDraftStore.currentStepIndex.value = 2;
+
+    const wrapper = mountComponent();
+
+    expect(wrapper.find('[data-testid="internal-boot-step"]').exists()).toBe(false);
+    expect(wrapper.find('[data-testid="plugins-step"]').exists()).toBe(true);
+  });
+
   it('opens exit confirmation when close button is clicked', async () => {
     const wrapper = mountComponent();
 
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index ec963ed304..8598972f30 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -19,6 +19,7 @@ import { createTestI18n } from '../../utils/i18n';
 
 const {
   draftStore,
+  setInternalBootApplySucceededMock,
   registrationStateRef,
   isFreshInstallRef,
   activationCodeRef,
@@ -37,6 +38,7 @@ const {
   completeOnboardingMock,
   installLanguageMock,
   installPluginMock,
+  submitInternalBootCreationMock,
   useMutationMock,
   useQueryMock,
 } = vi.hoisted(() => ({
@@ -48,7 +50,19 @@ const {
     selectedLanguage: 'en_US',
     useSsh: false,
     selectedPlugins: new Set<string>(),
+    internalBootSelection: null as {
+      poolName: string;
+      slotCount: number;
+      devices: string[];
+      bootSizeMiB: number;
+      updateBios: boolean;
+    } | null,
+    internalBootSkipped: false,
+    internalBootApplySucceeded: false,
   },
+  setInternalBootApplySucceededMock: vi.fn((value: boolean) => {
+    draftStore.internalBootApplySucceeded = value;
+  }),
   registrationStateRef: { value: 'ENOKEYFILE' },
   isFreshInstallRef: { value: true },
   activationCodeRef: { value: null as unknown },
@@ -78,6 +92,7 @@ const {
   completeOnboardingMock: vi.fn().mockResolvedValue({}),
   installLanguageMock: vi.fn(),
   installPluginMock: vi.fn(),
+  submitInternalBootCreationMock: vi.fn(),
   useMutationMock: vi.fn(),
   useQueryMock: vi.fn(),
 }));
@@ -124,7 +139,10 @@ vi.mock('@/components/Onboarding/components/OnboardingConsole.vue', () => ({
 }));
 
 vi.mock('~/components/Onboarding/store/onboardingDraft', () => ({
-  useOnboardingDraftStore: () => draftStore,
+  useOnboardingDraftStore: () => ({
+    ...draftStore,
+    setInternalBootApplySucceeded: setInternalBootApplySucceededMock,
+  }),
 }));
 
 vi.mock('~/components/Onboarding/store/activationCodeData', () => ({
@@ -155,6 +173,10 @@ vi.mock('@/components/Onboarding/composables/usePluginInstaller', () => ({
   }),
 }));
 
+vi.mock('@/components/Onboarding/composables/internalBoot', () => ({
+  submitInternalBootCreation: submitInternalBootCreationMock,
+}));
+
 vi.mock('@vue/apollo-composable', async () => {
   const actual =
     await vi.importActual<typeof import('@vue/apollo-composable')>('@vue/apollo-composable');
@@ -243,6 +265,9 @@ describe('OnboardingSummaryStep', () => {
     draftStore.selectedLanguage = 'en_US';
     draftStore.useSsh = false;
     draftStore.selectedPlugins = new Set();
+    draftStore.internalBootSelection = null;
+    draftStore.internalBootSkipped = false;
+    draftStore.internalBootApplySucceeded = false;
 
     registrationStateRef.value = 'ENOKEYFILE';
     isFreshInstallRef.value = true;
@@ -281,6 +306,10 @@ describe('OnboardingSummaryStep', () => {
       status: PluginInstallStatus.SUCCEEDED,
       output: [],
     });
+    submitInternalBootCreationMock.mockResolvedValue({
+      ok: true,
+      output: 'ok',
+    });
     refetchInstalledPluginsMock.mockResolvedValue(undefined);
     refetchOnboardingMock.mockResolvedValue(undefined);
   });
@@ -917,4 +946,51 @@ describe('OnboardingSummaryStep', () => {
     );
     expect(wrapper.text()).toContain('Setup Saved in Best-Effort Mode');
   });
+
+  it('applies internal boot configuration without reboot and records success', async () => {
+    draftStore.internalBootSelection = {
+      poolName: 'cache',
+      slotCount: 2,
+      devices: ['diskA', 'diskB'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    };
+    draftStore.internalBootSkipped = false;
+
+    const { wrapper } = mountComponent();
+    await clickApply(wrapper);
+
+    expect(submitInternalBootCreationMock).toHaveBeenCalledWith(
+      {
+        poolName: 'cache',
+        devices: ['diskA', 'diskB'],
+        bootSizeMiB: 16384,
+        updateBios: true,
+      },
+      { reboot: false }
+    );
+    expect(setInternalBootApplySucceededMock).toHaveBeenCalledWith(true);
+    expect(wrapper.text()).toContain('Internal boot pool configured.');
+  });
+
+  it('continues with warnings when internal boot setup returns an error', async () => {
+    draftStore.internalBootSelection = {
+      poolName: 'cache',
+      slotCount: 1,
+      devices: ['diskA'],
+      bootSizeMiB: 16384,
+      updateBios: false,
+    };
+    submitInternalBootCreationMock.mockResolvedValue({
+      ok: false,
+      output: 'mkbootpool failed',
+    });
+
+    const { wrapper } = mountComponent();
+    await clickApply(wrapper);
+
+    expect(setInternalBootApplySucceededMock).not.toHaveBeenCalledWith(true);
+    expect(wrapper.text()).toContain('Internal boot setup returned an error: mkbootpool failed');
+    expect(wrapper.text()).toContain('Setup Applied with Warnings');
+  });
 });

From 3b24591a90e632c69fcb704d35f1455c856a0b9a Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 12:47:12 -0500
Subject: [PATCH 04/53] fix(onboarding): make onboarding checks pass cleanly

- Purpose: resolve remaining type-check/test/lint failures after internal-boot onboarding integration.

- Before: web type-check failed on an unused loop variable, onboarding modal test used an outdated step index, and prettier check failed on touched onboarding files.

- Problem: CI gates for type-check/test/lint were not green for the onboarding changes.

- Change: adjusted internal-boot device loop indexing, corrected activation-step test index for ENOKEYFILE1, and applied prettier formatting updates.

- Implementation: updated onboarding step/template/test files and refreshed generated component typings for new onboarding step registration.
---
 .../Onboarding/OnboardingModal.test.ts        |  2 +-
 web/components.d.ts                           |  1 +
 .../components/Onboarding/OnboardingModal.vue |  9 ++++-
 .../Onboarding/composables/internalBoot.ts    | 12 +++---
 .../steps/OnboardingInternalBootStep.vue      | 40 ++++++++++---------
 .../steps/OnboardingSummaryStep.vue           |  5 ++-
 6 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index 4f1348ee96..d057c79a19 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -229,7 +229,7 @@ describe('OnboardingModal.vue', () => {
 
   it('shows activation step for ENOKEYFILE1', () => {
     activationCodeDataStore.registrationState.value = 'ENOKEYFILE1';
-    onboardingDraftStore.currentStepIndex.value = 3;
+    onboardingDraftStore.currentStepIndex.value = 4;
 
     const wrapper = mountComponent();
 
diff --git a/web/components.d.ts b/web/components.d.ts
index 7f77c5583f..c45128297d 100644
--- a/web/components.d.ts
+++ b/web/components.d.ts
@@ -98,6 +98,7 @@ declare module 'vue' {
     'OnboardingAdminPanel.standalone': typeof import('./src/components/Onboarding/standalone/OnboardingAdminPanel.standalone.vue')['default']
     OnboardingConsole: typeof import('./src/components/Onboarding/components/OnboardingConsole.vue')['default']
     OnboardingCoreSettingsStep: typeof import('./src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue')['default']
+    OnboardingInternalBootStep: typeof import('./src/components/Onboarding/steps/OnboardingInternalBootStep.vue')['default']
     OnboardingLicenseStep: typeof import('./src/components/Onboarding/steps/OnboardingLicenseStep.vue')['default']
     OnboardingModal: typeof import('./src/components/Onboarding/OnboardingModal.vue')['default']
     OnboardingNextStepsStep: typeof import('./src/components/Onboarding/steps/OnboardingNextStepsStep.vue')['default']
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 47333eca11..1b81cb3eab 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -31,8 +31,13 @@ const { activationRequired, hasActivationCode, registrationState } = storeToRefs
   useActivationCodeDataStore()
 );
 const onboardingStore = useUpgradeOnboardingStore();
-const { shouldShowOnboarding, isVersionDrift, completedAtVersion, canDisplayOnboardingModal, isPartnerBuild } =
-  storeToRefs(onboardingStore);
+const {
+  shouldShowOnboarding,
+  isVersionDrift,
+  completedAtVersion,
+  canDisplayOnboardingModal,
+  isPartnerBuild,
+} = storeToRefs(onboardingStore);
 const { refetchOnboarding } = onboardingStore;
 const purchaseStore = usePurchaseStore();
 const { keyfile } = storeToRefs(useServerStore());
diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index 24d14a981b..c48a602ce7 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -72,9 +72,7 @@ const parseTemplateData = (html: string): InternalBootTemplateData => {
     .map((option) => parsePositiveInteger(option.getAttribute('value')))
     .filter((value): value is number => value !== null);
 
-  const deviceOptions = Array.from(
-    templateRoot.querySelectorAll('#bootPoolDevicesSource select option')
-  )
+  const deviceOptions = Array.from(templateRoot.querySelectorAll('#bootPoolDevicesSource select option'))
     .map((option) => {
       const value = option.getAttribute('value')?.trim() ?? '';
       if (!value) {
@@ -97,16 +95,16 @@ const parseTemplateData = (html: string): InternalBootTemplateData => {
   const defaultBootSizeMiB =
     parsePositiveInteger(
       templateRoot.querySelector('input[name="poolBootSize"]')?.getAttribute('value')
-    ) ?? bootSizePresetsMiB[0] ?? DEFAULT_BOOT_SIZE_MIB;
+    ) ??
+    bootSizePresetsMiB[0] ??
+    DEFAULT_BOOT_SIZE_MIB;
 
   const poolNameDefault =
     templateRoot.querySelector<HTMLInputElement>('input[name="poolName"]')?.value?.trim() || 'cache';
   const defaultUpdateBios = Boolean(
     templateRoot.querySelector<HTMLInputElement>('input[name="poolUpdateBios"]')?.checked
   );
-  const isBootPoolEligible = Boolean(
-    documentNode.querySelector('input[onclick="addBootPoolPopup()"]')
-  );
+  const isBootPoolEligible = Boolean(documentNode.querySelector('input[onclick="addBootPoolPopup()"]'));
 
   return {
     isBootPoolUiAvailable: true,
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index de85a6f6f4..270705d73d 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -5,14 +5,11 @@ import { useI18n } from 'vue-i18n';
 import { ChevronLeftIcon, CircleStackIcon } from '@heroicons/vue/24/outline';
 import { ChevronRightIcon, ExclamationTriangleIcon } from '@heroicons/vue/24/solid';
 import { BrandButton } from '@unraid/ui';
-import {
-  fetchInternalBootTemplateData,
-  type InternalBootTemplateData,
-} from '@/components/Onboarding/composables/internalBoot';
-import {
-  type OnboardingInternalBootSelection,
-  useOnboardingDraftStore,
-} from '@/components/Onboarding/store/onboardingDraft';
+import { fetchInternalBootTemplateData } from '@/components/Onboarding/composables/internalBoot';
+import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
+
+import type { InternalBootTemplateData } from '@/components/Onboarding/composables/internalBoot';
+import type { OnboardingInternalBootSelection } from '@/components/Onboarding/store/onboardingDraft';
 
 export interface Props {
   onComplete: () => void;
@@ -156,7 +153,9 @@ const normalizeSelectedDevices = (count: number) => {
 };
 
 const applyBootSizeSelection = (valueMiB: number) => {
-  const presetMatch = visiblePresetOptions.value.find((option) => Number.parseInt(option.value, 10) === valueMiB);
+  const presetMatch = visiblePresetOptions.value.find(
+    (option) => Number.parseInt(option.value, 10) === valueMiB
+  );
   if (presetMatch) {
     bootSizePreset.value = presetMatch.value;
     customBootSizeGb.value = '';
@@ -214,7 +213,9 @@ watch([poolName, slotCount, selectedDevices, bootSizePreset, customBootSizeGb, u
 });
 
 const isDeviceDisabled = (deviceId: string, index: number) => {
-  return selectedDevices.value.some((selected, selectedIndex) => selectedIndex !== index && selected === deviceId);
+  return selectedDevices.value.some(
+    (selected, selectedIndex) => selectedIndex !== index && selected === deviceId
+  );
 };
 
 const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
@@ -279,7 +280,8 @@ const initializeForm = (data: InternalBootTemplateData) => {
   poolName.value = draftSelection?.poolName || data.poolNameDefault || 'cache';
   slotCount.value = draftSelection?.slotCount ?? defaultSlot;
   selectedDevices.value =
-    draftSelection?.devices.slice(0, slotCount.value) ?? Array.from({ length: slotCount.value }, () => '');
+    draftSelection?.devices.slice(0, slotCount.value) ??
+    Array.from({ length: slotCount.value }, () => '');
   normalizeSelectedDevices(slotCount.value);
 
   updateBios.value = draftSelection?.updateBios ?? data.defaultUpdateBios;
@@ -340,7 +342,9 @@ const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Co
         <div class="space-y-2">
           <div class="flex items-center gap-3">
             <CircleStackIcon class="text-primary h-8 w-8" />
-            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">Internal Boot</h2>
+            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">
+              Internal Boot
+            </h2>
           </div>
           <p class="text-muted text-lg">
             Configure an internal bootable pool now, or skip and set it up later from the webgui.
@@ -351,9 +355,7 @@ const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Co
       <blockquote class="my-8 border-s-4 border-yellow-500 bg-yellow-100 p-4">
         <div class="flex items-start gap-2">
           <ExclamationTriangleIcon class="mt-0.5 h-6 w-6 flex-shrink-0 text-yellow-700" />
-          <p class="text-sm leading-relaxed text-yellow-900">
-            All selected devices will be formatted.
-          </p>
+          <p class="text-sm leading-relaxed text-yellow-900">All selected devices will be formatted.</p>
         </div>
       </blockquote>
 
@@ -395,10 +397,10 @@ const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Co
 
         <div class="space-y-3">
           <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Devices</h3>
-          <div v-for="(selectedDevice, index) in selectedDevices" :key="index" class="space-y-2">
-            <label class="text-muted text-sm font-medium">Device {{ index + 1 }}</label>
+          <div v-for="index in slotCount" :key="index" class="space-y-2">
+            <label class="text-muted text-sm font-medium">Device {{ index }}</label>
             <select
-              v-model="selectedDevices[index]"
+              v-model="selectedDevices[index - 1]"
               class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
               :disabled="isBusy"
             >
@@ -407,7 +409,7 @@ const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Co
                 v-for="option in deviceOptions"
                 :key="option.value"
                 :value="option.value"
-                :disabled="isDeviceDisabled(option.value, index)"
+                :disabled="isDeviceDisabled(option.value, index - 1)"
               >
                 {{ option.label }}
               </option>
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index b9cc2f4df3..51c89b67c3 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -6,8 +6,8 @@ import { useMutation, useQuery } from '@vue/apollo-composable';
 
 import {
   ChevronLeftIcon,
-  ClipboardDocumentCheckIcon,
   CircleStackIcon,
+  ClipboardDocumentCheckIcon,
   CubeIcon,
   GlobeAltIcon,
   LanguageIcon,
@@ -321,7 +321,8 @@ const hasCoreSettingChanges = computed(() => {
 });
 
 const hasAnyChangesToApply = computed(
-  () => hasCoreSettingChanges.value || pluginIdsToInstall.value.length > 0 || hasInternalBootSelection.value
+  () =>
+    hasCoreSettingChanges.value || pluginIdsToInstall.value.length > 0 || hasInternalBootSelection.value
 );
 const isApplyDataReady = computed(() =>
   Boolean(coreSettingsResult.value?.server && coreSettingsResult.value?.vars)

From bbb8fa754f9dd3ad40a3bbbe1bf1ebbddb742a7b Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 13:52:18 -0500
Subject: [PATCH 05/53] fix(onboarding): gate internal boot step by array state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Purpose: use existing GraphQL array state in onboarding to decide whether internal boot setup can run.
- Before: onboarding inferred array stoppage from  template presence, which could misreport when the page response was unexpected (redirect/empty shell).
- Problem: users could see the 'array must be stopped' message even when  because the HTML parse path failed independently of true array state.
- Change: added  query and wired  to require  for configurability.
- Behavior now: array-state gating comes from GraphQL; legacy  parsing is retained only for webgui-specific internal-boot data (eligibility button/device options/presets/defaults).
- UX: status messaging now distinguishes array-not-stopped, array-state lookup failure, and inability to load webgui internal-boot template data.
- How it works:  drives , while template fetch/parse still initializes boot-pool form options.
- Validation: ran
> unraid-monorepo@4.29.2 codegen /Users/ajitmehrotra/Projects/onboarding-internal-boot
> pnpm -r codegen

Scope: 8 of 9 workspace projects
web codegen$ graphql-codegen --config codegen.ts -r dotenv/config
web codegen: ❯ Parse Configuration
web codegen: ✔ Parse Configuration
web codegen: ❯ Generate outputs
web codegen: ❯ Generate to src/composables/gql/
web codegen: ❯ Load GraphQL schemas
web codegen: ✔ Load GraphQL schemas
web codegen: ❯ Load GraphQL documents
web codegen: ✔ Load GraphQL documents
web codegen: ❯ Generate
web codegen: ✔ Generate
web codegen: ✔ Generate to src/composables/gql/
web codegen: ✔ Generate outputs
web codegen: Done
packages/unraid-api-plugin-connect codegen$ MOTHERSHIP_GRAPHQL_LINK='https://staging.mothership.unraid.net/ws' graphql-codegen --config codegen.ts
packages/unraid-api-plugin-connect codegen: [STARTED] Parse Configuration
packages/unraid-api-plugin-connect codegen: [COMPLETED] Parse Configuration
packages/unraid-api-plugin-connect codegen: [STARTED] Generate outputs
packages/unraid-api-plugin-connect codegen: [STARTED] Generate to src/graphql/generated/client/
packages/unraid-api-plugin-connect codegen: [STARTED] Load GraphQL schemas
packages/unraid-api-plugin-connect codegen: [COMPLETED] Load GraphQL schemas
packages/unraid-api-plugin-connect codegen: [STARTED] Load GraphQL documents
packages/unraid-api-plugin-connect codegen: [COMPLETED] Load GraphQL documents
packages/unraid-api-plugin-connect codegen: [STARTED] Generate
packages/unraid-api-plugin-connect codegen: [COMPLETED] Generate
packages/unraid-api-plugin-connect codegen: [COMPLETED] Generate to src/graphql/generated/client/
packages/unraid-api-plugin-connect codegen: [COMPLETED] Generate outputs
packages/unraid-api-plugin-connect codegen: Done
api codegen$ graphql-codegen --config codegen.ts
api codegen: [STARTED] Parse Configuration
api codegen: [COMPLETED] Parse Configuration
api codegen: [STARTED] Generate outputs
api codegen: [STARTED] Generate to src/unraid-api/cli/generated/
api codegen: [STARTED] Load GraphQL schemas
api codegen: [COMPLETED] Load GraphQL schemas
api codegen: [STARTED] Load GraphQL documents
api codegen: [COMPLETED] Load GraphQL documents
api codegen: [STARTED] Generate
api codegen: [COMPLETED] Generate
api codegen: [COMPLETED] Generate to src/unraid-api/cli/generated/
api codegen: [COMPLETED] Generate outputs
api codegen: Done,
> unraid-monorepo@4.29.2 type-check /Users/ajitmehrotra/Projects/onboarding-internal-boot
> pnpm -r type-check

Scope: 8 of 9 workspace projects
unraid-ui type-check$ vue-tsc --noEmit
web type-check$ vue-tsc --noEmit
unraid-ui type-check: Done
web type-check: Done
api type-check$ tsc --noEmit
api type-check: Done,
> unraid-monorepo@4.29.2 test /Users/ajitmehrotra/Projects/onboarding-internal-boot
> pnpm -r test

Scope: 8 of 9 workspace projects
packages/unraid-api-plugin-health test$ echo "Error: no test specified" && exit 0
packages/unraid-shared test$ vitest run
plugin test$ vitest && pnpm run test:extractor && pnpm run test:shell-detection
unraid-ui test$ vitest
packages/unraid-api-plugin-health test: Error: no test specified
packages/unraid-api-plugin-health test: Done
web test$ vitest run
unraid-ui test:  RUN  v3.2.4 /Users/ajitmehrotra/Projects/onboarding-internal-boot/unraid-ui
packages/unraid-shared test:  RUN  v3.2.4 /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared
web test:  RUN  v3.2.4 /Users/ajitmehrotra/Projects/onboarding-internal-boot/web
plugin test:  RUN  v3.2.4 /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test
packages/unraid-shared test: Server listening on Unix socket: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/test-ws-unix-1772218335390.sock
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect to Unix socket using ws+unix:// protocol
packages/unraid-shared test: Connecting to: ws+unix:///var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/test-ws-unix-1772218335390.sock:/
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect to Unix socket using ws+unix:// protocol
packages/unraid-shared test: Server: New WebSocket connection on path: /
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect to Unix socket using ws+unix:// protocol
packages/unraid-shared test: Client: Connected successfully!
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect to Unix socket using ws+unix:// protocol
packages/unraid-shared test: Server received: Test message
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect with /graphql path like SocketConfigService
packages/unraid-shared test: Testing SocketConfigService format: ws+unix:///var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/test-ws-unix-1772218335390.sock:/graphql
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect with /graphql path like SocketConfigService
packages/unraid-shared test: Server: New WebSocket connection on path: /graphql
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should connect with /graphql path like SocketConfigService
packages/unraid-shared test: Client: Connected to /graphql path
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Server: Client disconnected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Server: New WebSocket connection on path: /client-0
packages/unraid-shared test:  ✓ src/util/permissions.spec.ts (21 tests) 9ms
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Client 0 connected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Server: Client disconnected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Server: New WebSocket connection on path: /client-1
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Client 1 connected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Server: New WebSocket connection on path: /client-2
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should work with multiple concurrent connections
packages/unraid-shared test: Client 2 connected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should verify the exact implementation used in BaseInternalClientService
packages/unraid-shared test: Server: Client disconnected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should verify the exact implementation used in BaseInternalClientService
packages/unraid-shared test: Server: Client disconnected
packages/unraid-shared test: stdout | src/services/ws-unix-socket-test.spec.ts > WebSocket Unix Socket - Actual Connection Test > should verify the exact implementation used in BaseInternalClientService
packages/unraid-shared test: Server: Client disconnected
packages/unraid-shared test:  ✓ src/util/__tests__/key-order.test.ts (2 tests) 79ms
packages/unraid-shared test:  ✓ src/util/__tests__/permissions.test.ts (25 tests) 13ms
packages/unraid-shared test:  ✓ src/util/__tests__/processing.test.ts (18 tests) 231ms
packages/unraid-shared test:  ✓ src/services/ws-unix-socket-test.spec.ts (5 tests) 465ms
packages/unraid-shared test:    ✓ WebSocket Unix Socket - Actual Connection Test > should verify the exact implementation used in BaseInternalClientService  336ms
packages/unraid-shared test: stderr | src/util/permissions-scopes.spec.ts > convertScopesToPermissions > should handle invalid scope formats gracefully
packages/unraid-shared test: Invalid scope format (missing colon): INVALID_SCOPE
packages/unraid-shared test: Invalid scope format: :action
packages/unraid-shared test: Invalid scope format: RESOURCE:
packages/unraid-shared test: Unknown resource in scope: UNKNOWN:read:any
packages/unraid-shared test:  ✓ src/util/permissions-scopes.spec.ts (5 tests) 12ms
unraid-ui test:  ✓ src/lib/utils.test.ts (8 tests) 8ms
packages/unraid-shared test:  ✓ src/util/__tests__/create-ttl-memoized-loader.test.ts (4 tests) 2ms
packages/unraid-shared test:  ✓ src/services/internal-graphql-client-usage.spec.ts (17 tests) 22ms
packages/unraid-shared test:  ✓ src/use-permissions.directive.spec.ts (24 tests) 4ms
plugin test:  ✓ builder/utils/manifest-validator.test.ts (16 tests) 144ms
plugin test: stderr | builder/__tests__/cli/setup-txz-environment.spec.ts > setupTxzEnvironment > should parse and return provided environment arguments
plugin test: skipValidation is true, skipping validation
plugin test:  ✓ builder/__tests__/cli/setup-txz-environment.spec.ts (4 tests) 5ms
packages/unraid-shared test:  ✓ src/util/__tests__/config-definition.test.ts (7 tests) 9ms
unraid-ui test: stderr | src/composables/useTeleport.test.ts > useTeleport > should return teleportTarget ref with correct value
unraid-ui test: [Vue warn]: onMounted is called when there is no active component instance to be associated with. Lifecycle injection APIs can only be used during execution of setup(). If you are using async setup(), make sure to register lifecycle hooks before the first await statement.
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
unraid-ui test:  ✓ src/composables/useTeleport.test.ts (6 tests) 127ms
packages/unraid-shared test:  ✓ src/services/socket-config.service.spec.ts (31 tests) 7ms
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > validatePluginEnv > validates required fields
plugin test: Reading txz file from: ./test.txz
plugin test: Mock readFile called with: ./test.txz undefined
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > validatePluginEnv > handles tag option in non-CI mode
plugin test: Reading txz file from: ./test.txz
plugin test: Mock readFile called with: ./test.txz undefined
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > validatePluginEnv > reads release notes when release-notes-path is provided
plugin test: Mock readFile called with: valid-release-notes.txt utf8
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > validatePluginEnv > reads release notes when release-notes-path is provided
plugin test: Reading txz file from: ./test.txz
plugin test: Mock readFile called with: ./test.txz undefined
plugin test: stderr | builder/__tests__/cli/setup-plugin-environment.spec.ts > validatePluginEnv > handles tag option in non-CI mode
plugin test: Tag is set, will generate a TAGGED build
plugin test: stdout | builder/utils/changelog.test.ts > getStagingChangelogFromGit > should generate changelog header with version
plugin test: Non-fatal error: Failed to get changelog from git: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at catchProcessError (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:42:13)
plugin test:     at processTicksAndRejections (node:internal/process/task_queues:103:5)
plugin test:     at outputStream (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:83:17)
plugin test:     at ConventionalGitClient.getTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/GitClient.ts:152:16)
plugin test:     at ConventionalGitClient.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/ConventionalGitClient.ts:100:16)
plugin test:     at ConventionalChangelog.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:240:22)
plugin test:     at ConventionalChangelog.write (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:591:24)
plugin test:     at getStagingChangelogFromGit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.ts:154:22)
plugin test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.test.ts:18:20
plugin test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > sets up environment from CLI arguments
plugin test: Plugin version: 2026.02.27.1852
plugin test: Options: {
plugin test:   ci: false,
plugin test:   apiVersion: '4.29.2\n' +
plugin test:     '+fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n',
plugin test:   baseUrl: 'https://example.com',
plugin test:   pluginVersion: '2024.05.05.1232',
plugin test:   txzPath: './test.txz'
plugin test: }
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > sets up environment from CLI arguments
plugin test: Reading txz file from: ./test.txz
plugin test: Mock readFile called with: ./test.txz undefined
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > sets up environment from CLI arguments
plugin test: Plugin environment setup successfully: {
plugin test:   ci: false,
plugin test:   apiVersion: '4.29.2\n' +
plugin test:     '+fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n',
plugin test:   baseUrl: 'https://example.com',
plugin test:   tag: '',
plugin test:   buildNumber: 1,
plugin test:   txzPath: './test.txz',
plugin test:   pluginVersion: '2024.05.05.1232',
plugin test:   releaseNotes: 'FAST_TEST_CHANGELOG',
plugin test:   txzSha256: '6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72'
plugin test: }
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: stdout | builder/utils/changelog.test.ts > getStagingChangelogFromGit > should generate changelog with tag parameter
plugin test: Non-fatal error: Failed to get changelog from git: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at catchProcessError (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:42:13)
plugin test:     at outputStream (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:83:17)
plugin test:     at ConventionalGitClient.getTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/GitClient.ts:152:16)
plugin test:     at ConventionalGitClient.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/ConventionalGitClient.ts:100:16)
plugin test:     at ConventionalChangelog.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:240:22)
plugin test:     at ConventionalChangelog.write (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:591:24)
plugin test:     at getStagingChangelogFromGit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.ts:154:22)
plugin test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.test.ts:33:20
plugin test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > throws when required options are missing
plugin test: Plugin version: 2026.02.27.1852
plugin test: Options: {
plugin test:   ci: false,
plugin test:   apiVersion: '4.29.2\n' +
plugin test:     '+fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n',
plugin test:   baseUrl: 'http://localhost:5858',
plugin test:   pluginVersion: '2026.02.27.1852'
plugin test: }
plugin test: TXZ path not found at: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/deploy/dynamix.unraid.net-4.29.2
plugin test: +fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: -x86_64-1.txz
plugin test: Attempting to find TXZ using apiVersion: 4.29.2
plugin test: +fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: Could not find TXZ at: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/deploy/dynamix.unraid.net-4.29.2
plugin test: +fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: -x86_64-1.txz
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > handles optional CLI arguments
plugin test: Plugin version: 2026.02.27.1852
plugin test: Options: {
plugin test:   ci: true,
plugin test:   apiVersion: '4.29.2\n' +
plugin test:     '+fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n',
plugin test:   baseUrl: 'https://example.com',
plugin test:   pluginVersion: '2024.05.05.1232',
plugin test:   txzPath: './test.txz',
plugin test:   tag: 'PR1203'
plugin test: }
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > handles optional CLI arguments
plugin test: Reading txz file from: ./test.txz
plugin test: Mock readFile called with: ./test.txz undefined
plugin test: stdout | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > handles optional CLI arguments
plugin test: Plugin environment setup successfully: {
plugin test:   ci: true,
plugin test:   apiVersion: '4.29.2\n' +
plugin test:     '+fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n',
plugin test:   baseUrl: 'https://example.com',
plugin test:   tag: 'PR1203',
plugin test:   buildNumber: 1,
plugin test:   txzPath: './test.txz',
plugin test:   pluginVersion: '2024.05.05.1232',
plugin test:   releaseNotes: 'FAST_TEST_CHANGELOG',
plugin test:   txzSha256: '6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72'
plugin test: }
plugin test: stderr | builder/__tests__/cli/setup-plugin-environment.spec.ts > setupPluginEnv > handles optional CLI arguments
plugin test: Tag is set, will generate a TAGGED build
plugin test:  ✓ builder/__tests__/cli/setup-plugin-environment.spec.ts (8 tests) 277ms
plugin test: stdout | builder/utils/changelog.test.ts > getStagingChangelogFromGit > should handle error gracefully and return tag
plugin test: Non-fatal error: Failed to get changelog from git: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at catchProcessError (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:42:13)
plugin test:     at processTicksAndRejections (node:internal/process/task_queues:103:5)
plugin test:     at outputStream (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:83:17)
plugin test:     at ConventionalGitClient.getTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/GitClient.ts:152:16)
plugin test:     at ConventionalGitClient.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/ConventionalGitClient.ts:100:16)
plugin test:     at ConventionalChangelog.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:240:22)
plugin test:     at ConventionalChangelog.write (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:591:24)
plugin test:     at getStagingChangelogFromGit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.ts:154:22)
plugin test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.test.ts:64:20
plugin test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
plugin test: stdout | builder/utils/changelog.test.ts > getStagingChangelogFromGit > should use conventional-changelog v7 API correctly
plugin test: Non-fatal error: Failed to get changelog from git: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at catchProcessError (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:42:13)
plugin test:     at processTicksAndRejections (node:internal/process/task_queues:103:5)
plugin test:     at outputStream (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:83:17)
plugin test:     at ConventionalGitClient.getTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/GitClient.ts:152:16)
plugin test:     at ConventionalGitClient.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/ConventionalGitClient.ts:100:16)
plugin test:     at ConventionalChangelog.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:240:22)
plugin test:     at ConventionalChangelog.write (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:591:24)
plugin test:     at getStagingChangelogFromGit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.ts:154:22)
plugin test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.test.ts:81:7
plugin test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test:  ✓ src/jsonforms/__tests__/settings.test.ts (3 tests) 3ms
unraid-ui test:  ✓ src/components/common/button/Button.test.ts (4 tests) 23ms
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336665/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:159:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336665/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336677/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
unraid-ui test:  Test Files  3 passed (3)
unraid-ui test:       Tests  18 passed (18)
unraid-ui test:    Start at  13:52:14
unraid-ui test:    Duration  1.86s (transform 605ms, setup 0ms, collect 2.04s, tests 159ms, environment 1.67s, prepare 230ms)
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336685/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336698/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:174:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM    WARN [ConfigFileHandler:test-config.json] Migration failed. Using defaults.
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM    WARN [ConfigFileHandler:test-config.json] Error: Migration failed
packages/unraid-shared test:     at TestConfigDefinition.migrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:109:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:65:54)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:174:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Invalid version: must be >= 1
packages/unraid-shared test:     at TestConfigFilePersister.validate (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:80:13)
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:93:34)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at TestConfigFilePersister.loadOrMigrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:223:20)
packages/unraid-shared test:     at TestConfigFilePersister.onModuleInit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:159:5)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:178:5
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336685/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Invalid maxRetries: must be >= 0
packages/unraid-shared test:     at TestConfigDefinition.validate (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:94:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:57:36)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:204:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336701/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336721/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] SyntaxError: Expected property name or '}' in JSON at position 2 (line 1 column 3)
packages/unraid-shared test:     at JSON.parse (<anonymous>)
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:92:25)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:218:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336726/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
plugin test: stdout | builder/utils/changelog.test.ts > getStagingChangelogFromGit > should validate changelog structure
plugin test: Non-fatal error: Failed to get changelog from git: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at catchProcessError (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:42:13)
plugin test:     at outputStream (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:83:17)
plugin test:     at ConventionalGitClient.getTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/GitClient.ts:152:16)
plugin test:     at ConventionalGitClient.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/ConventionalGitClient.ts:100:16)
plugin test:     at ConventionalChangelog.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:240:22)
plugin test:     at ConventionalChangelog.write (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:591:24)
plugin test:     at getStagingChangelogFromGit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.ts:154:22)
plugin test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.test.ts:95:20
plugin test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336737/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:279:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM    WARN [ConfigFileHandler:test-config.json] Migration failed. Using defaults.
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM    WARN [ConfigFileHandler:test-config.json] Error: Special validation failure: migration + defaults combo invalid
packages/unraid-shared test:     at SpecialMigrationDefinition.validate (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:266:19)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:66:52)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:279:22
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336745/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336754/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336754/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at TestConfigFilePersister.loadOrMigrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:223:20)
packages/unraid-shared test:     at TestConfigFilePersister.onModuleInit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:159:5)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:295:5
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336754/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336757/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336754/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   ERROR [ConfigFileHandler:test-config.json] Error: Validation failed
packages/unraid-shared test:     at TestConfigDefinition.validate (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:78:13)
packages/unraid-shared test:     at ConfigFileHandler.writeConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:105:38)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:376:41
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:155:11
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:26
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:1897:20
packages/unraid-shared test:     at new Promise (<anonymous>)
packages/unraid-shared test:     at runWithTimeout (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:1863:10)
packages/unraid-shared test:     at runTest (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:1574:12)
packages/unraid-shared test:     at runSuite (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:1729:8)
packages/unraid-shared test: Cannot write invalid config
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
unraid-ui test: Done
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336770/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM    WARN [ConfigFilePersister:test-config.json] Cannot persist undefined config
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336772/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336777/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at ConfigFileHandler.updateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:146:29)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:406:23
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336777/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336777/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   ERROR [ConfigFileHandler:test-config.json] Failed to update config
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   ERROR [ConfigFileHandler:test-config.json] Error: Invalid version: must be >= 1
packages/unraid-shared test:     at TestConfigDefinition.validate (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:85:13)
packages/unraid-shared test:     at ConfigFileHandler.updateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:147:47)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:423:23
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /invalid/readonly/path/test-config.json
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   ERROR [ConfigFileHandler:test-config.json] [Error: ENOENT: no such file or directory, open '/invalid/readonly/path/test-config.json.tmp-2218336795ee3d5e'] {
packages/unraid-shared test:   errno: -2,
packages/unraid-shared test:   code: 'ENOENT',
packages/unraid-shared test:   syscall: 'open',
packages/unraid-shared test:   path: '/invalid/readonly/path/test-config.json.tmp-2218336795ee3d5e'
packages/unraid-shared test: }
packages/unraid-shared test: Error writing config to '/invalid/readonly/path/test-config.json'
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336802/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/__tests__/config-file-handler.test.ts:453:20
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336802/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
plugin test: stdout | builder/utils/changelog.test.ts > getStagingChangelogFromGit > should include actual commits when using gitRawCommitsOpts with tag
plugin test: Non-fatal error: Failed to get changelog from git: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at catchProcessError (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:42:13)
plugin test:     at processTicksAndRejections (node:internal/process/task_queues:103:5)
plugin test:     at outputStream (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@simple-libs+child-process-utils@1.0.1/node_modules/@simple-libs/child-process-utils/src/index.ts:83:17)
plugin test:     at ConventionalGitClient.getTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/GitClient.ts:152:16)
plugin test:     at ConventionalGitClient.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@conventional-changelog+git-client@2.5.1_conventional-commits-filter@5.0.0_conventional-commits-parser@6.2.0/node_modules/@conventional-changelog/git-client/src/ConventionalGitClient.ts:100:16)
plugin test:     at ConventionalChangelog.getSemverTags (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:240:22)
plugin test:     at ConventionalChangelog.write (file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/conventional-changelog@7.1.1_conventional-commits-filter@5.0.0/node_modules/conventional-changelog/src/ConventionalChangelog.ts:591:24)
plugin test:     at getStagingChangelogFromGit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.ts:154:22)
plugin test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/builder/utils/changelog.test.ts:115:20
plugin test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336823/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44435  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-handler-test-1772218336802/test-config.json
packages/unraid-shared test:  ✓ src/util/__tests__/config-file-handler.test.ts (17 tests) 183ms
web test:  ✓ __test__/components/ThemeSwitcher.test.ts (10 tests) 76ms
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336904/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336904/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at TestConfigFilePersister.loadOrMigrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:223:20)
packages/unraid-shared test:     at TestConfigFilePersister.onModuleInit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:159:5)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:391:5
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336904/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336914/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336914/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at TestConfigFilePersister.loadOrMigrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:223:20)
packages/unraid-shared test:     at TestConfigFilePersister.onModuleInit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:159:5)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:399:5
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336914/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /invalid/path/that/does/not/exist/test-config.json
plugin test: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:  ✓ builder/utils/changelog.test.ts (6 tests) 760ms
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   ERROR [ConfigFileHandler:test-config.json] [Error: ENOENT: no such file or directory, open '/invalid/path/that/does/not/exist/test-config.json.tmp-2218336925b875bc'] {
packages/unraid-shared test:   errno: -2,
packages/unraid-shared test:   code: 'ENOENT',
packages/unraid-shared test:   syscall: 'open',
packages/unraid-shared test:   path: '/invalid/path/that/does/not/exist/test-config.json.tmp-2218336925b875bc'
packages/unraid-shared test: }
packages/unraid-shared test: Error writing config to '/invalid/path/that/does/not/exist/test-config.json'
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
plugin test: ⎯⎯⎯⎯⎯⎯ Unhandled Errors ⎯⎯⎯⎯⎯⎯
plugin test: Vitest caught 3 unhandled errors during the test run.
plugin test: This might cause false positive tests. Resolve unhandled errors to make sure your tests are not affected.
plugin test: ⎯⎯⎯⎯ Unhandled Rejection ⎯⎯⎯⎯⎯
plugin test: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at AsyncLocalStorage.run (node:internal/async_local_storage/async_context_frame:63:14)
plugin test:     exit code: 128 (Invalid exit argument)
plugin test:  ❯ AsyncLocalStorage.run node:internal/async_local_storage/async_context_frame:63:14
plugin test:  ❯ EventEmitter.end ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:585:26
plugin test:  ❯ EventEmitter.emit node:events:520:35
plugin test:  ❯ invoke ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/vendor-core.cjs:1111:12
plugin test:  ❯ exec ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/vendor-core.cjs:1195:21
plugin test:  ❯ _ProcessPromise.run ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:539:47
plugin test:  ❯ Proxy.set ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:465:28
plugin test:  ❯ ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:459:60
plugin test:  ❯ AsyncLocalStorage.run node:internal/async_local_storage/async_context_frame:63:14
plugin test:  ❯ within ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:451:18
plugin test:  ❯ Proxy.<anonymous> ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:459:16
plugin test: ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
plugin test: Serialized Error: { _dto: { code: 128, signal: null, error: undefined, duration: 21, store: { stdout: [], stderr: [ '<Buffer(97) ...>' ], stdall: [ '<Buffer(97) ...>' ] }, from: 'AsyncLocalStorage.run (node:internal/async_local_storage/async_context_frame:63:14)' }, stdout: '', stderr: 'fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n', stdall: 'fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n', exitCode: 128, signal: null, duration: 21, json: 'Function<json>', buffer: 'Function<buffer>', blob: 'Function<blob>', text: 'Function<text>', lines: 'Function<lines>' }
plugin test: This error originated in "builder/__tests__/cli/setup-plugin-environment.spec.ts" test file. It doesn't mean the error was thrown inside the file itself, but while it was running.
plugin test: ⎯⎯⎯⎯ Unhandled Rejection ⎯⎯⎯⎯⎯
plugin test: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at AsyncLocalStorage.run (node:internal/async_local_storage/async_context_frame:63:14)
plugin test:     exit code: 128 (Invalid exit argument)
plugin test:  ❯ AsyncLocalStorage.run node:internal/async_local_storage/async_context_frame:63:14
plugin test:  ❯ EventEmitter.end ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:585:26
plugin test:  ❯ EventEmitter.emit node:events:520:35
plugin test:  ❯ invoke ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/vendor-core.cjs:1111:12
plugin test:  ❯ exec ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/vendor-core.cjs:1195:21
plugin test:  ❯ _ProcessPromise.run ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:539:47
plugin test:  ❯ Proxy.set ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:465:28
plugin test:  ❯ ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:459:60
plugin test:  ❯ AsyncLocalStorage.run node:internal/async_local_storage/async_context_frame:63:14
plugin test:  ❯ within ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:451:18
plugin test:  ❯ Proxy.<anonymous> ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:459:16
plugin test: ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
plugin test: Serialized Error: { _dto: { code: 128, signal: null, error: undefined, duration: 26, store: { stdout: [], stderr: [ '<Buffer(97) ...>' ], stdall: [ '<Buffer(97) ...>' ] }, from: 'AsyncLocalStorage.run (node:internal/async_local_storage/async_context_frame:63:14)' }, stdout: '', stderr: 'fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n', stdall: 'fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n', exitCode: 128, signal: null, duration: 26, json: 'Function<json>', buffer: 'Function<buffer>', blob: 'Function<blob>', text: 'Function<text>', lines: 'Function<lines>' }
plugin test: This error originated in "builder/__tests__/cli/setup-plugin-environment.spec.ts" test file. It doesn't mean the error was thrown inside the file itself, but while it was running.
plugin test: ⎯⎯⎯⎯ Unhandled Rejection ⎯⎯⎯⎯⎯
plugin test: Error: fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git
plugin test:     at AsyncLocalStorage.run (node:internal/async_local_storage/async_context_frame:63:14)
plugin test:     exit code: 128 (Invalid exit argument)
plugin test:  ❯ AsyncLocalStorage.run node:internal/async_local_storage/async_context_frame:63:14
plugin test:  ❯ EventEmitter.end ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:585:26
plugin test:  ❯ EventEmitter.emit node:events:520:35
plugin test:  ❯ invoke ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/vendor-core.cjs:1111:12
plugin test:  ❯ exec ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/vendor-core.cjs:1195:21
plugin test:  ❯ _ProcessPromise.run ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:539:47
plugin test:  ❯ Proxy.set ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:465:28
plugin test:  ❯ ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:459:60
plugin test:  ❯ AsyncLocalStorage.run node:internal/async_local_storage/async_context_frame:63:14
plugin test:  ❯ within ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:451:18
plugin test:  ❯ Proxy.<anonymous> ../node_modules/.pnpm/zx@8.8.1/node_modules/zx/build/core.cjs:459:16
plugin test: ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
plugin test: Serialized Error: { _dto: { code: 128, signal: null, error: undefined, duration: 21, store: { stdout: [], stderr: [ '<Buffer(97) ...>' ], stdall: [ '<Buffer(97) ...>' ] }, from: 'AsyncLocalStorage.run (node:internal/async_local_storage/async_context_frame:63:14)' }, stdout: '', stderr: 'fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n', stdall: 'fatal: invalid gitfile format: /Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin/.git\n', exitCode: 128, signal: null, duration: 21, json: 'Function<json>', buffer: 'Function<buffer>', blob: 'Function<blob>', text: 'Function<text>', lines: 'Function<lines>' }
plugin test: This error originated in "builder/__tests__/cli/setup-plugin-environment.spec.ts" test file. It doesn't mean the error was thrown inside the file itself, but while it was running.
plugin test: ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
plugin test:  Test Files  4 passed (4)
plugin test:       Tests  34 passed (34)
plugin test:      Errors  3 errors
plugin test:    Start at  13:52:15
plugin test:    Duration  1.65s (transform 228ms, setup 0ms, collect 980ms, tests 1.19s, environment 0ms, prepare 719ms)
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336952/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336952/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at TestConfigFilePersister.loadOrMigrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:223:20)
packages/unraid-shared test:     at TestConfigFilePersister.onModuleInit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:159:5)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:420:5
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336952/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFilePersister:test-config.json] Config path: /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336964/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error: Config file does not exist at '/var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336964/test-config.json'
packages/unraid-shared test:     at ConfigFileHandler.readConfigFile (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:89:13)
packages/unraid-shared test:     at ConfigFileHandler.loadConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/util/config-file-handler.ts:56:26)
packages/unraid-shared test:     at TestConfigFilePersister.loadOrMigrateConfig (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:223:20)
packages/unraid-shared test:     at TestConfigFilePersister.onModuleInit (/Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/config-file.ts:159:5)
packages/unraid-shared test:     at /Users/ajitmehrotra/Projects/onboarding-internal-boot/packages/unraid-shared/src/services/__tests__/config-file.test.ts:449:5
packages/unraid-shared test:     at file:///Users/ajitmehrotra/Projects/onboarding-internal-boot/node_modules/.pnpm/@vitest+runner@3.2.4/node_modules/@vitest/runner/dist/chunk-hooks.js:752:20
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM   DEBUG [ConfigFileHandler:test-config.json] Error loading config. Attempting to migrate...
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Existing config unreadable, proceeding with write
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336964/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:16 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
plugin test: Failed
/Users/ajitmehrotra/Projects/onboarding-internal-boot/plugin:
 ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL  @unraid/connect-plugin@4.29.2 test: `vitest && pnpm run test:extractor && pnpm run test:shell-detection`
Exit status 1
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:17 PM VERBOSE [ConfigFileHandler:test-config.json] Writing config to /var/folders/95/f6tc2xdd2t703__z22w4lxzh0000gn/T/config-test-1772218336964/test-config.json
packages/unraid-shared test: [Nest] 44433  - 02/27/2026, 1:52:17 PM VERBOSE [ConfigFileHandler:test-config.json] Config is unchanged, skipping write
packages/unraid-shared test:  ✓ src/services/__tests__/config-file.test.ts (18 tests) 366ms
web test: stdout | __test__/components/Wrapper/mount-engine.test.ts > mount-engine > mountUnifiedApp > should create and mount a unified app with shared context
web test: [UnifiedMount] Mounted 1 components
packages/unraid-shared test:  Test Files  14 passed (14)
packages/unraid-shared test:       Tests  197 passed (197)
packages/unraid-shared test:    Start at  13:52:14
packages/unraid-shared test:    Duration  2.05s (transform 1.20s, setup 0ms, collect 8.11s, tests 1.40s, environment 2ms, prepare 1.29s)
 ELIFECYCLE  Test failed. See above for more details., and
> unraid-monorepo@4.29.2 lint /Users/ajitmehrotra/Projects/onboarding-internal-boot
> pnpm -r lint

Scope: 8 of 9 workspace projects
unraid-ui lint$ eslint src
web lint$ pnpm lint:eslint && pnpm lint:prettier
web lint: > @unraid/web@4.29.2 lint:eslint /Users/ajitmehrotra/Projects/onboarding-internal-boot/web
web lint: > eslint --cache
web lint: /Users/ajitmehrotra/Projects/onboarding-internal-boot/web/src/composables/gql/index.ts
web lint:   2:23  error  Newline required at end of file but not found  eol-last
web lint: ✖ 1 problem (1 error, 0 warnings)
web lint:   1 error and 0 warnings potentially fixable with the `--fix` option.
web lint:  ELIFECYCLE  Command failed with exit code 1.
web lint: Failed
/Users/ajitmehrotra/Projects/onboarding-internal-boot/web:
 ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL  @unraid/web@4.29.2 lint: `pnpm lint:eslint && pnpm lint:prettier`
Exit status 1
 ELIFECYCLE  Command failed with exit code 1. in  successfully.
---
 .../Onboarding/graphql/getArrayState.query.ts |  9 ++++++
 .../steps/OnboardingInternalBootStep.vue      | 31 ++++++++++++++++---
 web/src/composables/gql/gql.ts                |  6 ++++
 web/src/composables/gql/graphql.ts            |  6 ++++
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 web/src/components/Onboarding/graphql/getArrayState.query.ts

diff --git a/web/src/components/Onboarding/graphql/getArrayState.query.ts b/web/src/components/Onboarding/graphql/getArrayState.query.ts
new file mode 100644
index 0000000000..44586fde24
--- /dev/null
+++ b/web/src/components/Onboarding/graphql/getArrayState.query.ts
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag';
+
+export const GET_ARRAY_STATE_QUERY = gql`
+  query GetArrayState {
+    array {
+      state
+    }
+  }
+`;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 270705d73d..ffe8414c07 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useQuery } from '@vue/apollo-composable';
 
 import { ChevronLeftIcon, CircleStackIcon } from '@heroicons/vue/24/outline';
 import { ChevronRightIcon, ExclamationTriangleIcon } from '@heroicons/vue/24/solid';
 import { BrandButton } from '@unraid/ui';
 import { fetchInternalBootTemplateData } from '@/components/Onboarding/composables/internalBoot';
+import { GET_ARRAY_STATE_QUERY } from '@/components/Onboarding/graphql/getArrayState.query';
 import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
 
 import type { InternalBootTemplateData } from '@/components/Onboarding/composables/internalBoot';
@@ -23,8 +25,15 @@ export interface Props {
 const props = defineProps<Props>();
 const { t } = useI18n();
 const draftStore = useOnboardingDraftStore();
+const {
+  result: arrayStateResult,
+  loading: arrayStateLoading,
+  error: arrayStateError,
+} = useQuery(GET_ARRAY_STATE_QUERY, null, {
+  fetchPolicy: 'cache-first',
+});
 
-const isLoading = ref(true);
+const isTemplateLoading = ref(true);
 const loadError = ref<string | null>(null);
 const formError = ref<string | null>(null);
 const templateData = ref<InternalBootTemplateData | null>(null);
@@ -36,23 +45,35 @@ const bootSizePreset = ref<string>('');
 const customBootSizeGb = ref('');
 const updateBios = ref(true);
 
+const isLoading = computed(() => Boolean(arrayStateLoading.value) || isTemplateLoading.value);
 const isBusy = computed(() => Boolean(props.isSavingStep) || isLoading.value);
+const isArrayStopped = computed(() => arrayStateResult.value?.array?.state === 'STOPPED');
 const isBootPoolUiAvailable = computed(() => Boolean(templateData.value?.isBootPoolUiAvailable));
 const isBootPoolEligible = computed(() => Boolean(templateData.value?.isBootPoolEligible));
 const deviceOptions = computed(() => templateData.value?.deviceOptions ?? []);
 const slotOptions = computed(() => templateData.value?.slotOptions ?? [1, 2]);
 
 const canConfigure = computed(
-  () => isBootPoolUiAvailable.value && isBootPoolEligible.value && deviceOptions.value.length > 0
+  () =>
+    isArrayStopped.value &&
+    isBootPoolUiAvailable.value &&
+    isBootPoolEligible.value &&
+    deviceOptions.value.length > 0
 );
 
 const loadStatusMessage = computed(() => {
   if (loadError.value) {
     return loadError.value;
   }
-  if (!isBootPoolUiAvailable.value) {
+  if (arrayStateError.value) {
+    return 'Unable to determine current array state.';
+  }
+  if (!isArrayStopped.value) {
     return 'Internal boot setup is only available while the array is stopped.';
   }
+  if (!isBootPoolUiAvailable.value) {
+    return 'Unable to load internal boot options from the webgui pool page.';
+  }
   if (!isBootPoolEligible.value) {
     return 'This server is not currently eligible for internal boot setup.';
   }
@@ -289,7 +310,7 @@ const initializeForm = (data: InternalBootTemplateData) => {
 };
 
 onMounted(async () => {
-  isLoading.value = true;
+  isTemplateLoading.value = true;
   loadError.value = null;
 
   try {
@@ -299,7 +320,7 @@ onMounted(async () => {
   } catch (error) {
     loadError.value = error instanceof Error ? error.message : 'Unable to load internal boot options.';
   } finally {
-    isLoading.value = false;
+    isTemplateLoading.value = false;
   }
 });
 
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 15ff8fef2f..65facfa433 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -72,6 +72,7 @@ type Documents = {
     "\n  mutation UpdateServerIdentity($name: String!, $comment: String, $sysModel: String) {\n    updateServerIdentity(name: $name, comment: $comment, sysModel: $sysModel) {\n      id\n      name\n      comment\n    }\n  }\n": typeof types.UpdateServerIdentityDocument,
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
+    "\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n": typeof types.GetArrayStateDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
@@ -154,6 +155,7 @@ const documents: Documents = {
     "\n  mutation UpdateServerIdentity($name: String!, $comment: String, $sysModel: String) {\n    updateServerIdentity(name: $name, comment: $comment, sysModel: $sysModel) {\n      id\n      name\n      comment\n    }\n  }\n": types.UpdateServerIdentityDocument,
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
+    "\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n": types.GetArrayStateDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
@@ -424,6 +426,10 @@ export function graphql(source: "\n  mutation SetLocale($locale: String!) {\n
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n"): (typeof documents)["\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 78dc30bfb0..6941ac94a7 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3852,6 +3852,11 @@ export type UpdateSshSettingsMutationVariables = Exact<{
 
 export type UpdateSshSettingsMutation = { __typename?: 'Mutation', updateSshSettings: { __typename?: 'Vars', id: string, useSsh?: boolean | null, portssh?: number | null } };
 
+export type GetArrayStateQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type GetArrayStateQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState } };
+
 export type GetCoreSettingsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -4039,6 +4044,7 @@ export const CompleteOnboardingDocument = {"kind":"Document","definitions":[{"ki
 export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateServerIdentity"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"comment"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"sysModel"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateServerIdentity"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"comment"},"value":{"kind":"Variable","name":{"kind":"Name","value":"comment"}}},{"kind":"Argument","name":{"kind":"Name","value":"sysModel"},"value":{"kind":"Variable","name":{"kind":"Name","value":"sysModel"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]} as unknown as DocumentNode<UpdateServerIdentityMutation, UpdateServerIdentityMutationVariables>;
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
+export const GetArrayStateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetArrayState"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}}]}}]}}]} as unknown as DocumentNode<GetArrayStateQuery, GetArrayStateQueryVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;

From 73bfd110d025a92134d9a0c2e001298fb2799fd7 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 14:02:34 -0500
Subject: [PATCH 06/53] refactor(onboarding): replace pool page parsing with
 graphql context

Purpose: remove fragile dependency on /Main/PoolDevices HTML parsing for internal-boot onboarding setup data.

Before: onboarding fetched and parsed the legacy PoolDevices page to infer array availability, eligibility, and candidate devices.

Problem: in this app context the PoolDevices page can be unavailable/redirected, causing parsing to fail and blocking setup even when server state is valid.

Change: introduced GetInternalBootContext GraphQL query (array, vars.fsState, disks) and derived onboarding options directly from API state.

Behavior now: array-stopped checks come from GraphQL state, candidate devices come from unassigned non-USB disks, and pool/boot-size defaults are computed locally.

Simplification: removed template HTML parsing logic from internalBoot composable; it now focuses on mkbootpool submission and reboot post only.

Compatibility: mkbootpool.php and Boot.php invocation paths remain unchanged for apply/reboot behavior.

Validation: ran pnpm codegen, pnpm type-check, pnpm test, and pnpm lint in web successfully.
---
 .../Onboarding/composables/internalBoot.ts    | 116 -----------
 .../Onboarding/graphql/getArrayState.query.ts |   9 -
 .../graphql/getInternalBootContext.query.ts   |  31 +++
 .../steps/OnboardingInternalBootStep.vue      | 196 +++++++++++++++---
 web/src/composables/gql/gql.ts                |   8 +-
 web/src/composables/gql/graphql.ts            |  10 +-
 6 files changed, 205 insertions(+), 165 deletions(-)
 delete mode 100644 web/src/components/Onboarding/graphql/getArrayState.query.ts
 create mode 100644 web/src/components/Onboarding/graphql/getInternalBootContext.query.ts

diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index c48a602ce7..929bdea25b 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -1,20 +1,3 @@
-export interface InternalBootDeviceOption {
-  value: string;
-  label: string;
-  sizeMiB: number | null;
-}
-
-export interface InternalBootTemplateData {
-  isBootPoolUiAvailable: boolean;
-  isBootPoolEligible: boolean;
-  poolNameDefault: string;
-  slotOptions: number[];
-  deviceOptions: InternalBootDeviceOption[];
-  bootSizePresetsMiB: number[];
-  defaultBootSizeMiB: number;
-  defaultUpdateBios: boolean;
-}
-
 export interface InternalBootSelection {
   poolName: string;
   devices: string[];
@@ -32,105 +15,6 @@ export interface InternalBootSubmitResult {
   output: string;
 }
 
-const DEFAULT_BOOT_SIZE_MIB = 16384;
-
-const parseInteger = (value: string | null | undefined): number | null => {
-  if (!value) {
-    return null;
-  }
-  const parsed = Number.parseInt(value, 10);
-  return Number.isFinite(parsed) ? parsed : null;
-};
-
-const parsePositiveInteger = (value: string | null | undefined): number | null => {
-  const parsed = parseInteger(value);
-  if (parsed === null || parsed <= 0) {
-    return null;
-  }
-  return parsed;
-};
-
-const parseTemplateData = (html: string): InternalBootTemplateData => {
-  const parser = new DOMParser();
-  const documentNode = parser.parseFromString(html, 'text/html');
-  const templateRoot = documentNode.querySelector('#templatePopupBootPool');
-
-  if (!templateRoot) {
-    return {
-      isBootPoolUiAvailable: false,
-      isBootPoolEligible: false,
-      poolNameDefault: 'cache',
-      slotOptions: [1, 2],
-      deviceOptions: [],
-      bootSizePresetsMiB: [16384, 32768, 65536, 131072],
-      defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
-      defaultUpdateBios: true,
-    };
-  }
-
-  const slotOptions = Array.from(templateRoot.querySelectorAll('select[name="poolSlots"] option'))
-    .map((option) => parsePositiveInteger(option.getAttribute('value')))
-    .filter((value): value is number => value !== null);
-
-  const deviceOptions = Array.from(templateRoot.querySelectorAll('#bootPoolDevicesSource select option'))
-    .map((option) => {
-      const value = option.getAttribute('value')?.trim() ?? '';
-      if (!value) {
-        return null;
-      }
-      return {
-        value,
-        label: option.textContent?.trim() ?? value,
-        sizeMiB: parsePositiveInteger(option.getAttribute('data-size-mib')),
-      };
-    })
-    .filter((option): option is InternalBootDeviceOption => option !== null);
-
-  const bootSizePresetsMiB = Array.from(
-    templateRoot.querySelectorAll('select[name="poolBootSizePreset"] option')
-  )
-    .map((option) => parseInteger(option.getAttribute('value')))
-    .filter((value): value is number => value !== null && value >= 0);
-
-  const defaultBootSizeMiB =
-    parsePositiveInteger(
-      templateRoot.querySelector('input[name="poolBootSize"]')?.getAttribute('value')
-    ) ??
-    bootSizePresetsMiB[0] ??
-    DEFAULT_BOOT_SIZE_MIB;
-
-  const poolNameDefault =
-    templateRoot.querySelector<HTMLInputElement>('input[name="poolName"]')?.value?.trim() || 'cache';
-  const defaultUpdateBios = Boolean(
-    templateRoot.querySelector<HTMLInputElement>('input[name="poolUpdateBios"]')?.checked
-  );
-  const isBootPoolEligible = Boolean(documentNode.querySelector('input[onclick="addBootPoolPopup()"]'));
-
-  return {
-    isBootPoolUiAvailable: true,
-    isBootPoolEligible,
-    poolNameDefault,
-    slotOptions: slotOptions.length > 0 ? slotOptions : [1, 2],
-    deviceOptions,
-    bootSizePresetsMiB:
-      bootSizePresetsMiB.length > 0 ? bootSizePresetsMiB : [16384, 32768, 65536, 131072],
-    defaultBootSizeMiB,
-    defaultUpdateBios,
-  };
-};
-
-export const fetchInternalBootTemplateData = async (): Promise<InternalBootTemplateData> => {
-  const response = await fetch('/Main/PoolDevices', {
-    credentials: 'same-origin',
-  });
-  if (!response.ok) {
-    throw new Error(`Failed to load pool devices page (${response.status})`);
-  }
-
-  const html = await response.text();
-  return parseTemplateData(html);
-};
-
 const buildInternalBootArgs = (
   selection: InternalBootSelection,
   options: SubmitInternalBootOptions
diff --git a/web/src/components/Onboarding/graphql/getArrayState.query.ts b/web/src/components/Onboarding/graphql/getArrayState.query.ts
deleted file mode 100644
index 44586fde24..0000000000
--- a/web/src/components/Onboarding/graphql/getArrayState.query.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import gql from 'graphql-tag';
-
-export const GET_ARRAY_STATE_QUERY = gql`
-  query GetArrayState {
-    array {
-      state
-    }
-  }
-`;
diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
new file mode 100644
index 0000000000..cadac221ff
--- /dev/null
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -0,0 +1,31 @@
+import gql from 'graphql-tag';
+
+export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
+  query GetInternalBootContext {
+    array {
+      state
+      boot {
+        device
+      }
+      parities {
+        device
+      }
+      disks {
+        device
+      }
+      caches {
+        device
+      }
+    }
+    vars {
+      fsState
+    }
+    disks {
+      id
+      device
+      serialNum
+      size
+      interfaceType
+    }
+  }
+`;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index ffe8414c07..f83672716c 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -1,16 +1,14 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuery } from '@vue/apollo-composable';
 
 import { ChevronLeftIcon, CircleStackIcon } from '@heroicons/vue/24/outline';
 import { ChevronRightIcon, ExclamationTriangleIcon } from '@heroicons/vue/24/solid';
 import { BrandButton } from '@unraid/ui';
-import { fetchInternalBootTemplateData } from '@/components/Onboarding/composables/internalBoot';
-import { GET_ARRAY_STATE_QUERY } from '@/components/Onboarding/graphql/getArrayState.query';
+import { GET_INTERNAL_BOOT_CONTEXT_QUERY } from '@/components/Onboarding/graphql/getInternalBootContext.query';
 import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
 
-import type { InternalBootTemplateData } from '@/components/Onboarding/composables/internalBoot';
 import type { OnboardingInternalBootSelection } from '@/components/Onboarding/store/onboardingDraft';
 
 export interface Props {
@@ -25,18 +23,79 @@ export interface Props {
 const props = defineProps<Props>();
 const { t } = useI18n();
 const draftStore = useOnboardingDraftStore();
+
+interface InternalBootDeviceOption {
+  value: string;
+  label: string;
+  sizeMiB: number | null;
+}
+
+interface InternalBootTemplateData {
+  isBootPoolUiAvailable: boolean;
+  isBootPoolEligible: boolean;
+  poolNameDefault: string;
+  slotOptions: number[];
+  deviceOptions: InternalBootDeviceOption[];
+  bootSizePresetsMiB: number[];
+  defaultBootSizeMiB: number;
+  defaultUpdateBios: boolean;
+}
+
+interface InternalBootContext {
+  array: {
+    state: string;
+    boot?: { device?: string | null } | null;
+    parities: { device?: string | null }[];
+    disks: { device?: string | null }[];
+    caches: { device?: string | null }[];
+  };
+  vars?: { fsState?: string | null } | null;
+  disks: {
+    id: string;
+    device: string;
+    serialNum: string;
+    size: number;
+    interfaceType: string;
+  }[];
+}
+
+const DEFAULT_BOOT_SIZE_MIB = 16384;
+const BOOT_SIZE_PRESETS_MIB = [16384, 32768, 65536, 131072];
+
+const formatBytes = (bytes: number) => {
+  if (!Number.isFinite(bytes) || bytes <= 0) {
+    return 'Unknown';
+  }
+
+  const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+  let value = bytes;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex += 1;
+  }
+
+  const precision = value >= 100 || unitIndex === 0 ? 0 : 1;
+  return `${value.toFixed(precision)} ${units[unitIndex]}`;
+};
+
+const toSizeMiB = (bytes: number): number | null => {
+  if (!Number.isFinite(bytes) || bytes <= 0) {
+    return null;
+  }
+  return Math.floor(bytes / 1024 / 1024);
+};
+
 const {
-  result: arrayStateResult,
-  loading: arrayStateLoading,
-  error: arrayStateError,
-} = useQuery(GET_ARRAY_STATE_QUERY, null, {
+  result: contextResult,
+  loading: contextLoading,
+  error: contextError,
+} = useQuery(GET_INTERNAL_BOOT_CONTEXT_QUERY, null, {
   fetchPolicy: 'cache-first',
 });
 
-const isTemplateLoading = ref(true);
-const loadError = ref<string | null>(null);
 const formError = ref<string | null>(null);
-const templateData = ref<InternalBootTemplateData | null>(null);
+const hasInitializedForm = ref(false);
 
 const poolName = ref('cache');
 const slotCount = ref(1);
@@ -45,9 +104,74 @@ const bootSizePreset = ref<string>('');
 const customBootSizeGb = ref('');
 const updateBios = ref(true);
 
-const isLoading = computed(() => Boolean(arrayStateLoading.value) || isTemplateLoading.value);
+const templateData = computed<InternalBootTemplateData | null>(() => {
+  const data = contextResult.value as InternalBootContext | null;
+  if (!data) {
+    return null;
+  }
+
+  const assignedDevices = new Set<string>();
+  const assignedDiskGroups = [
+    data.array.boot ? [data.array.boot] : [],
+    data.array.parities,
+    data.array.disks,
+    data.array.caches,
+  ];
+
+  for (const group of assignedDiskGroups) {
+    for (const disk of group) {
+      const device = disk.device?.trim();
+      if (device) {
+        assignedDevices.add(device);
+      }
+    }
+  }
+
+  const deviceOptions = data.disks
+    .filter((disk) => {
+      const device = disk.device?.trim();
+      if (!device) {
+        return false;
+      }
+      if (assignedDevices.has(device)) {
+        return false;
+      }
+      return disk.interfaceType !== 'USB';
+    })
+    .map<InternalBootDeviceOption>((disk) => {
+      const device = disk.device.trim();
+      const serial = disk.serialNum?.trim() || disk.id.trim() || device;
+      const sizeMiB = toSizeMiB(disk.size);
+      const sizeLabel = formatBytes(disk.size);
+      return {
+        value: serial,
+        label: `${serial} - ${sizeLabel} (${device})`,
+        sizeMiB,
+      };
+    });
+
+  const hasExistingCachePool = data.array.caches.length > 0;
+
+  return {
+    isBootPoolUiAvailable: true,
+    isBootPoolEligible: deviceOptions.length > 0,
+    poolNameDefault: hasExistingCachePool ? '' : 'cache',
+    slotOptions: [1, 2],
+    deviceOptions,
+    bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
+    defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
+    defaultUpdateBios: true,
+  };
+});
+
+const isLoading = computed(() => Boolean(contextLoading.value));
 const isBusy = computed(() => Boolean(props.isSavingStep) || isLoading.value);
-const isArrayStopped = computed(() => arrayStateResult.value?.array?.state === 'STOPPED');
+const isArrayStopped = computed(() => {
+  if (contextResult.value?.array.state) {
+    return contextResult.value.array.state === 'STOPPED';
+  }
+  return contextResult.value?.vars?.fsState === 'Stopped';
+});
 const isBootPoolUiAvailable = computed(() => Boolean(templateData.value?.isBootPoolUiAvailable));
 const isBootPoolEligible = computed(() => Boolean(templateData.value?.isBootPoolEligible));
 const deviceOptions = computed(() => templateData.value?.deviceOptions ?? []);
@@ -62,17 +186,14 @@ const canConfigure = computed(
 );
 
 const loadStatusMessage = computed(() => {
-  if (loadError.value) {
-    return loadError.value;
-  }
-  if (arrayStateError.value) {
-    return 'Unable to determine current array state.';
+  if (contextError.value) {
+    return 'Unable to load internal boot options from API.';
   }
   if (!isArrayStopped.value) {
     return 'Internal boot setup is only available while the array is stopped.';
   }
   if (!isBootPoolUiAvailable.value) {
-    return 'Unable to load internal boot options from the webgui pool page.';
+    return 'Unable to load internal boot options.';
   }
   if (!isBootPoolEligible.value) {
     return 'This server is not currently eligible for internal boot setup.';
@@ -309,20 +430,33 @@ const initializeForm = (data: InternalBootTemplateData) => {
   applyBootSizeSelection(draftSelection?.bootSizeMiB ?? data.defaultBootSizeMiB);
 };
 
-onMounted(async () => {
-  isTemplateLoading.value = true;
-  loadError.value = null;
-
-  try {
-    const data = await fetchInternalBootTemplateData();
-    templateData.value = data;
+watch(
+  templateData,
+  (data) => {
+    if (!data || hasInitializedForm.value) {
+      return;
+    }
     initializeForm(data);
-  } catch (error) {
-    loadError.value = error instanceof Error ? error.message : 'Unable to load internal boot options.';
-  } finally {
-    isTemplateLoading.value = false;
+    hasInitializedForm.value = true;
+  },
+  { immediate: true }
+);
+
+watch(
+  () => draftStore.internalBootSelection,
+  (selection) => {
+    if (!selection || isLoading.value) {
+      return;
+    }
+
+    poolName.value = selection.poolName;
+    slotCount.value = selection.slotCount;
+    selectedDevices.value = [...selection.devices];
+    normalizeSelectedDevices(slotCount.value);
+    updateBios.value = selection.updateBios;
+    applyBootSizeSelection(selection.bootSizeMiB);
   }
-});
+);
 
 const handleBack = () => {
   props.onBack?.();
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 65facfa433..dddae3afc0 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -72,8 +72,8 @@ type Documents = {
     "\n  mutation UpdateServerIdentity($name: String!, $comment: String, $sysModel: String) {\n    updateServerIdentity(name: $name, comment: $comment, sysModel: $sysModel) {\n      id\n      name\n      comment\n    }\n  }\n": typeof types.UpdateServerIdentityDocument,
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
-    "\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n": typeof types.GetArrayStateDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": typeof types.InstalledUnraidPluginsDocument,
@@ -155,8 +155,8 @@ const documents: Documents = {
     "\n  mutation UpdateServerIdentity($name: String!, $comment: String, $sysModel: String) {\n    updateServerIdentity(name: $name, comment: $comment, sysModel: $sysModel) {\n      id\n      name\n      comment\n    }\n  }\n": types.UpdateServerIdentityDocument,
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
-    "\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n": types.GetArrayStateDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": types.InstalledUnraidPluginsDocument,
@@ -429,11 +429,11 @@ export function graphql(source: "\n  mutation UpdateSshSettings($enabled: Boolea
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n"): (typeof documents)["\n  query GetArrayState {\n    array {\n      state\n    }\n  }\n"];
+export function graphql(source: "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n"): (typeof documents)["\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n"): (typeof documents)["\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 6941ac94a7..ac37cf1972 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3852,15 +3852,15 @@ export type UpdateSshSettingsMutationVariables = Exact<{
 
 export type UpdateSshSettingsMutation = { __typename?: 'Mutation', updateSshSettings: { __typename?: 'Vars', id: string, useSsh?: boolean | null, portssh?: number | null } };
 
-export type GetArrayStateQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetCoreSettingsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetArrayStateQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState } };
+export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __typename?: 'Customization', activationCode?: { __typename?: 'ActivationCode', system?: { __typename?: 'SystemConfig', serverName?: string | null, comment?: string | null } | null } | null } | null, vars: { __typename?: 'Vars', name?: string | null, sysModel?: string | null, useSsh?: boolean | null, localTld?: string | null }, server?: { __typename?: 'Server', name: string, comment?: string | null } | null, display: { __typename?: 'InfoDisplay', theme: ThemeName, locale?: string | null }, systemTime: { __typename?: 'SystemTime', timeZone: string }, info: { __typename?: 'Info', primaryNetwork?: { __typename?: 'InfoNetworkInterface', ipAddress?: string | null } | null } };
 
-export type GetCoreSettingsQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __typename?: 'Customization', activationCode?: { __typename?: 'ActivationCode', system?: { __typename?: 'SystemConfig', serverName?: string | null, comment?: string | null } | null } | null } | null, vars: { __typename?: 'Vars', name?: string | null, sysModel?: string | null, useSsh?: boolean | null, localTld?: string | null }, server?: { __typename?: 'Server', name: string, comment?: string | null } | null, display: { __typename?: 'InfoDisplay', theme: ThemeName, locale?: string | null }, systemTime: { __typename?: 'SystemTime', timeZone: string }, info: { __typename?: 'Info', primaryNetwork?: { __typename?: 'InfoNetworkInterface', ipAddress?: string | null } | null } };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null }, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType }> };
 
 export type InstallLanguageMutationVariables = Exact<{
   input: InstallPluginInput;
@@ -4044,8 +4044,8 @@ export const CompleteOnboardingDocument = {"kind":"Document","definitions":[{"ki
 export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateServerIdentity"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"comment"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"sysModel"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateServerIdentity"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"comment"},"value":{"kind":"Variable","name":{"kind":"Name","value":"comment"}}},{"kind":"Argument","name":{"kind":"Name","value":"sysModel"},"value":{"kind":"Variable","name":{"kind":"Name","value":"sysModel"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]} as unknown as DocumentNode<UpdateServerIdentityMutation, UpdateServerIdentityMutationVariables>;
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
-export const GetArrayStateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetArrayState"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}}]}}]}}]} as unknown as DocumentNode<GetArrayStateQuery, GetArrayStateQueryVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;
 export const InstalledUnraidPluginsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InstalledUnraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installedUnraidPlugins"}}]}}]} as unknown as DocumentNode<InstalledUnraidPluginsQuery, InstalledUnraidPluginsQueryVariables>;

From d2c44d6304b73ecc4a1db671e9f8503726da1f22 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 14:48:39 -0500
Subject: [PATCH 07/53] feat(api): expose boot eligibility and emhttp disk
 metadata

Purpose: provide onboarding with the same core boot-setup eligibility/device identity data used by webgui state files, without adding new HTTP endpoints.

Before: GraphQL exposed array/fs state and system disk data, but not vars.bootEligible or devs.ini-backed disk assignment identifiers/sectors.

Problem: onboarding could not reliably mirror webgui bootable-pool gating/device identity because mkbootpool expects emhttp disk IDs and webgui eligibility depends on bootEligible.

Change: added bootEligible to var parsing/core type/GraphQL Vars model and surfaced emhttp devs metadata on existing Disk type (emhttpDeviceId, sectors, sectorSize).

How it works: DisksService now reads store.emhttp.devices, matches entries by normalized device name, and projects emhttp assignment metadata alongside existing disk data.

Tests: updated var parser snapshot and extended disks service tests to assert emhttp metadata mapping and config access.

Validation: pnpm --filter ./api type-check, pnpm --filter ./api lint, and targeted vitest for var parser + disks service passed.
---
 api/generated-schema.graphql                  | 12 ++-
 .../__test__/store/state-parsers/var.test.ts  |  1 +
 api/src/core/types/states/var.ts              |  2 +
 api/src/store/state-parsers/var.ts            |  2 +
 .../graph/resolvers/disks/disks.model.ts      | 24 +++++
 .../resolvers/disks/disks.service.spec.ts     | 35 ++++++++
 .../graph/resolvers/disks/disks.service.ts    | 90 ++++++++++++++++++-
 .../graph/resolvers/vars/vars.model.ts        |  3 +
 8 files changed, 166 insertions(+), 3 deletions(-)

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index cf57e381c2..8c57e0ae0c 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -338,6 +338,15 @@ type Disk implements Node {
   """The serial number of the disk"""
   serialNum: String!
 
+  """Device identifier from emhttp devs.ini used by disk assignment commands"""
+  emhttpDeviceId: String
+
+  """Sector count from emhttp devs.ini for this device"""
+  sectors: Float
+
+  """Sector size in bytes from emhttp devs.ini for this device"""
+  sectorSize: Float
+
   """The interface type of the disk"""
   interfaceType: DiskInterfaceType!
 
@@ -580,6 +589,7 @@ type Vars implements Node {
   cacheNumDevices: Int
   cacheSbNumDisks: Int
   fsState: String
+  bootEligible: Boolean
 
   """Human friendly string of array events happening"""
   fsProgress: String
@@ -3526,4 +3536,4 @@ type Subscription {
   systemMetricsTemperature: TemperatureMetrics
   upsUpdates: UPSDevice!
   pluginInstallUpdates(operationId: ID!): PluginInstallEvent!
-}
\ No newline at end of file
+}
diff --git a/api/src/__test__/store/state-parsers/var.test.ts b/api/src/__test__/store/state-parsers/var.test.ts
index 1fb4700dd7..9b70869387 100644
--- a/api/src/__test__/store/state-parsers/var.test.ts
+++ b/api/src/__test__/store/state-parsers/var.test.ts
@@ -18,6 +18,7 @@ test('Returns parsed state file', async () => {
     expect(parse(stateFile)).toMatchInlineSnapshot(`
       {
         "bindMgt": false,
+        "bootEligible": false,
         "cacheNumDevices": NaN,
         "cacheSbNumDisks": NaN,
         "comment": "Dev Server",
diff --git a/api/src/core/types/states/var.ts b/api/src/core/types/states/var.ts
index a994dcc4c0..db411b5f80 100644
--- a/api/src/core/types/states/var.ts
+++ b/api/src/core/types/states/var.ts
@@ -39,6 +39,8 @@ export type Var = {
     fsProgress: string;
     /** Current state of the array. */
     fsState: string;
+    /** Whether this system is eligible to create a bootable pool. */
+    bootEligible: boolean;
     fsUnmountableMask: string;
     fuseDirectio: string;
     fuseDirectioDefault: string;
diff --git a/api/src/store/state-parsers/var.ts b/api/src/store/state-parsers/var.ts
index d3b9b888f9..295c2bd776 100644
--- a/api/src/store/state-parsers/var.ts
+++ b/api/src/store/state-parsers/var.ts
@@ -44,6 +44,7 @@ export type VarIni = {
     fsNumUnmountable: string;
     fsProgress: string;
     fsState: string;
+    bootEligible: string;
     fsUnmountableMask: string;
     fuseDirectio: string;
     fuseDirectioDefault: string;
@@ -195,6 +196,7 @@ export const parse: StateFileToIniParserMap['var'] = (iniFile) => {
         fsCopyPrcnt: toNumber(iniFile.fsCopyPrcnt),
         fsNumMounted: toNumber(iniFile.fsNumMounted),
         fsNumUnmountable: toNumber(iniFile.fsNumUnmountable),
+        bootEligible: iniBooleanToJsBoolean(iniFile.bootEligible, false),
         hideDotFiles: iniBooleanToJsBoolean(iniFile.hideDotFiles, false),
         localMaster: iniBooleanToJsBoolean(iniFile.localMaster, false),
         maxArraysz: toNumber(iniFile.maxArraysz),
diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.model.ts b/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
index 0a7b276754..0942acf05b 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
@@ -123,6 +123,30 @@ export class Disk extends Node {
     @IsString()
     serialNum!: string;
 
+    @Field(() => String, {
+        nullable: true,
+        description: 'Device identifier from emhttp devs.ini used by disk assignment commands',
+    })
+    @IsOptional()
+    @IsString()
+    emhttpDeviceId?: string;
+
+    @Field(() => Number, {
+        nullable: true,
+        description: 'Sector count from emhttp devs.ini for this device',
+    })
+    @IsOptional()
+    @IsNumber()
+    sectors?: number;
+
+    @Field(() => Number, {
+        nullable: true,
+        description: 'Sector size in bytes from emhttp devs.ini for this device',
+    })
+    @IsOptional()
+    @IsNumber()
+    sectorSize?: number;
+
     @Field(() => DiskInterfaceType, { description: 'The interface type of the disk' })
     @IsEnum(DiskInterfaceType)
     interfaceType!: DiskInterfaceType;
diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts b/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
index f1ee5109c9..775ed60b76 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
@@ -122,6 +122,27 @@ describe('DisksService', () => {
         },
     ];
 
+    const mockEmhttpDevices = [
+        {
+            id: 'S4ENNF0N123456',
+            device: 'sda',
+            sectors: 1000215216,
+            sector_size: 512,
+        },
+        {
+            id: 'WD-WCC7K7YL9876',
+            device: 'sdb',
+            sectors: 7814037168,
+            sector_size: 512,
+        },
+        {
+            id: 'WD-SPUNDOWN123',
+            device: 'sdd',
+            sectors: 7814037168,
+            sector_size: 512,
+        },
+    ];
+
     const mockDiskLayoutData: Systeminformation.DiskLayoutData[] = [
         {
             device: '/dev/sda',
@@ -309,6 +330,9 @@ describe('DisksService', () => {
                 if (key === 'store.emhttp.disks') {
                     return mockArrayDisks;
                 }
+                if (key === 'store.emhttp.devices') {
+                    return mockEmhttpDevices;
+                }
                 return defaultValue;
             }),
         };
@@ -353,6 +377,7 @@ describe('DisksService', () => {
             expect(mockDiskLayout).toHaveBeenCalledTimes(1);
             expect(mockBlockDevices).toHaveBeenCalledTimes(1);
             expect(configService.get).toHaveBeenCalledWith('store.emhttp.disks', []);
+            expect(configService.get).toHaveBeenCalledWith('store.emhttp.devices', []);
             expect(mockBatchProcess).toHaveBeenCalledTimes(1);
 
             expect(disks).toHaveLength(mockDiskLayoutData.length);
@@ -370,6 +395,9 @@ describe('DisksService', () => {
             expect(spinningDisk).toBeDefined();
             expect(spinningDisk?.isSpinning).toBe(true); // From state
             expect(spinningDisk?.interfaceType).toBe(DiskInterfaceType.SATA);
+            expect(spinningDisk?.emhttpDeviceId).toBe('WD-WCC7K7YL9876');
+            expect(spinningDisk?.sectors).toBe(7814037168);
+            expect(spinningDisk?.sectorSize).toBe(512);
 
             // Check spun down disk
             const spunDownDisk = disks.find((d) => d.id === 'WD-SPUNDOWN123');
@@ -389,6 +417,9 @@ describe('DisksService', () => {
                 if (key === 'store.emhttp.disks') {
                     return [];
                 }
+                if (key === 'store.emhttp.devices') {
+                    return [];
+                }
                 return defaultValue;
             });
 
@@ -413,6 +444,9 @@ describe('DisksService', () => {
                 if (key === 'store.emhttp.disks') {
                     return disksWithSpaces;
                 }
+                if (key === 'store.emhttp.devices') {
+                    return mockEmhttpDevices;
+                }
                 return defaultValue;
             });
 
@@ -453,6 +487,7 @@ describe('DisksService', () => {
 
             // Verify we're accessing the state through ConfigService
             expect(configService.get).toHaveBeenCalledWith('store.emhttp.disks', []);
+            expect(configService.get).toHaveBeenCalledWith('store.emhttp.devices', []);
         });
 
         it('should handle empty disk layout or block devices', async () => {
diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
index 1401be9eeb..03bbc11f7c 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
@@ -41,10 +41,88 @@ const SmartDataSchema = z.object({
         .optional()
         .nullable(),
 });
+interface EmhttpDevice {
+    id?: string;
+    device?: string;
+    sectors?: number;
+    sectorSize?: number;
+}
+
+interface EmhttpDeviceRecord {
+    id?: unknown;
+    device?: unknown;
+    sectors?: unknown;
+    sector_size?: unknown;
+}
+
+const parseNumeric = (value: unknown): number | undefined => {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value;
+    }
+
+    if (typeof value === 'string' && value.trim().length > 0) {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+
+    return undefined;
+};
+
+const normalizeDeviceName = (value: string | undefined): string => {
+    if (!value) {
+        return '';
+    }
+    return value.startsWith('/dev/') ? value.slice('/dev/'.length) : value;
+};
 
 @Injectable()
 export class DisksService {
     constructor(private readonly configService: ConfigService) {}
+
+    private getEmhttpDevices(): EmhttpDevice[] {
+        const rawDevices = this.configService.get<unknown[]>('store.emhttp.devices', []);
+        const emhttpDevices: EmhttpDevice[] = [];
+
+        for (const raw of rawDevices) {
+            if (!raw || typeof raw !== 'object') {
+                continue;
+            }
+
+            const record = raw as EmhttpDeviceRecord;
+            const id = typeof record.id === 'string' ? record.id.trim() : '';
+            const device = typeof record.device === 'string' ? record.device.trim() : '';
+            const sectors = parseNumeric(record.sectors);
+            const sectorSize = parseNumeric(record.sector_size);
+
+            if (!id || !device) {
+                continue;
+            }
+
+            emhttpDevices.push({
+                id,
+                device: normalizeDeviceName(device),
+                sectors,
+                sectorSize,
+            });
+        }
+
+        return emhttpDevices;
+    }
+
+    private findEmhttpDevice(
+        disk: Systeminformation.DiskLayoutData,
+        emhttpDevices: EmhttpDevice[]
+    ): EmhttpDevice | undefined {
+        const normalizedSystemDevice = normalizeDeviceName(disk.device);
+        if (!normalizedSystemDevice) {
+            return undefined;
+        }
+
+        return emhttpDevices.find((emhttpDevice) => emhttpDevice.device === normalizedSystemDevice);
+    }
+
     public async getTemperature(device: string): Promise<number | null> {
         try {
             const { stdout } = await execa('smartctl', ['-n', 'standby', '-A', '-j', device]);
@@ -93,7 +171,8 @@ export class DisksService {
     private async parseDisk(
         disk: Systeminformation.DiskLayoutData,
         partitionsToParse: Systeminformation.BlockDevicesData[],
-        arrayDisks: ArrayDisk[]
+        arrayDisks: ArrayDisk[],
+        emhttpDevices: EmhttpDevice[]
     ): Promise<Omit<Disk, 'temperature'>> {
         const partitions = partitionsToParse
             // Only get partitions from this disk
@@ -158,10 +237,16 @@ export class DisksService {
         }
 
         const arrayDisk = arrayDisks.find((d) => d.id.trim() === disk.serialNum.trim());
+        const emhttpDevice = this.findEmhttpDevice(disk, emhttpDevices);
+        const sectors = emhttpDevice?.sectors;
+        const sectorSize = emhttpDevice?.sectorSize;
 
         return {
             ...disk,
             id: disk.serialNum, // Ensure id is set
+            emhttpDeviceId: emhttpDevice?.id,
+            sectors,
+            sectorSize,
             smartStatus:
                 DiskSmartStatus[disk.smartStatus?.toUpperCase() as keyof typeof DiskSmartStatus] ??
                 DiskSmartStatus.UNKNOWN,
@@ -179,8 +264,9 @@ export class DisksService {
             devices.filter((device) => device.type === 'part')
         );
         const arrayDisks = this.configService.get<ArrayDisk[]>('store.emhttp.disks', []);
+        const emhttpDevices = this.getEmhttpDevices();
         const { data } = await batchProcess(await diskLayout(), async (disk) =>
-            this.parseDisk(disk, partitions, arrayDisks)
+            this.parseDisk(disk, partitions, arrayDisks, emhttpDevices)
         );
         return data;
     }
diff --git a/api/src/unraid-api/graph/resolvers/vars/vars.model.ts b/api/src/unraid-api/graph/resolvers/vars/vars.model.ts
index 53dee9337c..65a44b4bd6 100644
--- a/api/src/unraid-api/graph/resolvers/vars/vars.model.ts
+++ b/api/src/unraid-api/graph/resolvers/vars/vars.model.ts
@@ -428,6 +428,9 @@ export class Vars extends Node {
     @Field({ nullable: true })
     fsState?: string;
 
+    @Field({ nullable: true })
+    bootEligible?: boolean;
+
     @Field({ nullable: true, description: 'Human friendly string of array events happening' })
     fsProgress?: string;
 

From 10b1c41d65ebdad1bf1ce8dab1423bfd5bff0580 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 14:48:59 -0500
Subject: [PATCH 08/53] refactor(onboarding): consume boot setup context from
 graphql

Purpose: switch internal-boot onboarding inputs to API-provided boot eligibility and emhttp-backed disk identity metadata.

Before: onboarding inferred eligibility and device IDs from non-webgui sources and local heuristics, which could drift from mkbootpool expectations.

Problem: when PoolDevices rendering is unavailable, onboarding still needs deterministic data for gating and for args[] disk IDs accepted by mkbootpool.

Change: internal boot context query now requests vars.bootEligible and disk emhttp metadata; step maps selectable devices using emhttpDeviceId plus sector data and uses bootEligible for eligibility messaging.

Behavior: array stopped gating uses array/vars state, eligibility uses vars.bootEligible, and boot-size math uses sectors*sectorSize (fallback to disk size).

Compatibility: mkbootpool.php submission path is unchanged; selected device values now align with emhttp disk IDs expected by cmdAssignDisk flow.

Validation: pnpm codegen, pnpm --filter @unraid/web type-check, pnpm --filter @unraid/web test, and pnpm --filter @unraid/web lint passed.
---
 .../graphql/getInternalBootContext.query.ts   |  4 ++
 .../steps/OnboardingInternalBootStep.vue      | 58 +++++++++++++++----
 web/src/composables/gql/gql.ts                |  6 +-
 web/src/composables/gql/graphql.ts            | 11 +++-
 4 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index cadac221ff..1c48770c2f 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -19,6 +19,7 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
     }
     vars {
       fsState
+      bootEligible
     }
     disks {
       id
@@ -26,6 +27,9 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
       serialNum
       size
       interfaceType
+      emhttpDeviceId
+      sectors
+      sectorSize
     }
   }
 `;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index f83672716c..cc59098a6b 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -49,13 +49,16 @@ interface InternalBootContext {
     disks: { device?: string | null }[];
     caches: { device?: string | null }[];
   };
-  vars?: { fsState?: string | null } | null;
+  vars?: { fsState?: string | null; bootEligible?: boolean | null } | null;
   disks: {
     id: string;
     device: string;
     serialNum: string;
     size: number;
     interfaceType: string;
+    emhttpDeviceId?: string | null;
+    sectors?: number | null;
+    sectorSize?: number | null;
   }[];
 }
 
@@ -86,6 +89,35 @@ const toSizeMiB = (bytes: number): number | null => {
   return Math.floor(bytes / 1024 / 1024);
 };
 
+const normalizeDeviceName = (value: string | null | undefined): string => {
+  if (!value) {
+    return '';
+  }
+  const trimmed = value.trim();
+  if (trimmed.startsWith('/dev/')) {
+    return trimmed.slice('/dev/'.length);
+  }
+  return trimmed;
+};
+
+const deriveDeviceSizeBytes = (
+  sectors: number | null | undefined,
+  sectorSize: number | null | undefined,
+  fallbackSize: number
+) => {
+  if (
+    typeof sectors === 'number' &&
+    Number.isFinite(sectors) &&
+    sectors > 0 &&
+    typeof sectorSize === 'number' &&
+    Number.isFinite(sectorSize) &&
+    sectorSize > 0
+  ) {
+    return sectors * sectorSize;
+  }
+  return fallbackSize;
+};
+
 const {
   result: contextResult,
   loading: contextLoading,
@@ -120,7 +152,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
 
   for (const group of assignedDiskGroups) {
     for (const disk of group) {
-      const device = disk.device?.trim();
+      const device = normalizeDeviceName(disk.device);
       if (device) {
         assignedDevices.add(device);
       }
@@ -129,23 +161,25 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
 
   const deviceOptions = data.disks
     .filter((disk) => {
-      const device = disk.device?.trim();
-      if (!device) {
+      const device = normalizeDeviceName(disk.device);
+      const emhttpDeviceId = disk.emhttpDeviceId?.trim();
+      if (!device || !emhttpDeviceId) {
         return false;
       }
       if (assignedDevices.has(device)) {
         return false;
       }
-      return disk.interfaceType !== 'USB';
+      return true;
     })
     .map<InternalBootDeviceOption>((disk) => {
-      const device = disk.device.trim();
-      const serial = disk.serialNum?.trim() || disk.id.trim() || device;
-      const sizeMiB = toSizeMiB(disk.size);
-      const sizeLabel = formatBytes(disk.size);
+      const device = normalizeDeviceName(disk.device);
+      const emhttpDeviceId = disk.emhttpDeviceId?.trim() || disk.id.trim() || device;
+      const sizeBytes = deriveDeviceSizeBytes(disk.sectors, disk.sectorSize, disk.size);
+      const sizeMiB = toSizeMiB(sizeBytes);
+      const sizeLabel = formatBytes(sizeBytes);
       return {
-        value: serial,
-        label: `${serial} - ${sizeLabel} (${device})`,
+        value: emhttpDeviceId,
+        label: `${emhttpDeviceId} - ${sizeLabel} (${device})`,
         sizeMiB,
       };
     });
@@ -154,7 +188,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
 
   return {
     isBootPoolUiAvailable: true,
-    isBootPoolEligible: deviceOptions.length > 0,
+    isBootPoolEligible: Boolean(data.vars?.bootEligible),
     poolNameDefault: hasExistingCachePool ? '' : 'cache',
     slotOptions: [1, 2],
     deviceOptions,
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index dddae3afc0..83aadc5fc7 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -73,7 +73,7 @@ type Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": typeof types.InstalledUnraidPluginsDocument,
@@ -156,7 +156,7 @@ const documents: Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": types.InstalledUnraidPluginsDocument,
@@ -433,7 +433,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index ac37cf1972..96075104cd 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -701,6 +701,8 @@ export type Disk = Node & {
   bytesPerSector: Scalars['Float']['output'];
   /** The device path of the disk (e.g. /dev/sdb) */
   device: Scalars['String']['output'];
+  /** Device identifier from emhttp devs.ini used by disk assignment commands */
+  emhttpDeviceId?: Maybe<Scalars['String']['output']>;
   /** The firmware revision of the disk */
   firmwareRevision: Scalars['String']['output'];
   id: Scalars['PrefixedID']['output'];
@@ -712,6 +714,10 @@ export type Disk = Node & {
   name: Scalars['String']['output'];
   /** The partitions on the disk */
   partitions: Array<DiskPartition>;
+  /** Sector size in bytes from emhttp devs.ini for this device */
+  sectorSize?: Maybe<Scalars['Float']['output']>;
+  /** Sector count from emhttp devs.ini for this device */
+  sectors?: Maybe<Scalars['Float']['output']>;
   /** The number of sectors per track */
   sectorsPerTrack: Scalars['Float']['output'];
   /** The serial number of the disk */
@@ -3175,6 +3181,7 @@ export type UserAccount = Node & {
 export type Vars = Node & {
   __typename?: 'Vars';
   bindMgt?: Maybe<Scalars['Boolean']['output']>;
+  bootEligible?: Maybe<Scalars['Boolean']['output']>;
   cacheNumDevices?: Maybe<Scalars['Int']['output']>;
   cacheSbNumDisks?: Maybe<Scalars['Int']['output']>;
   comment?: Maybe<Scalars['String']['output']>;
@@ -3860,7 +3867,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null }, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null }, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType, emhttpDeviceId?: string | null, sectors?: number | null, sectorSize?: number | null }> };
 
 export type InstallLanguageMutationVariables = Exact<{
   input: InstallPluginInput;
@@ -4045,7 +4052,7 @@ export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","name":{"kind":"Name","value":"sectors"}},{"kind":"Field","name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;
 export const InstalledUnraidPluginsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InstalledUnraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installedUnraidPlugins"}}]}}]} as unknown as DocumentNode<InstalledUnraidPluginsQuery, InstalledUnraidPluginsQueryVariables>;

From 12fecc480be1eb726268139fc9f6d521cf548161 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 15:34:52 -0500
Subject: [PATCH 09/53] feat(api): add onboarding internal boot context query

- Purpose: provide a dedicated onboarding query that mirrors webgui internal-boot context sourcing from emhttp state.

- Before: onboarding fetched mixed GraphQL fields (array/vars/disks) and derived boot device context from system disk data.

- Problem: migration parity was weaker because validation inputs and selectable boot devices were not sourced the same way as webgui.

- Change: added  GraphQL query with device options from  (devs.ini), plus pool/share/reserved-name context and boot defaults.

- Change: added resolver/service/model wiring and schema artifacts, including deterministic device sorting aligned to CacheDevices.page behavior.

- Change: added service unit tests and updated emhttp state snapshot expectations for .

- How it works: service reads emhttp var/disks/shares/devices, computes boot-pool defaults and constraints, and returns a single query payload consumed by onboarding.
---
 api/generated-schema.graphql                  |  20 ++
 api/src/__test__/store/modules/emhttp.test.ts |   1 +
 api/src/unraid-api/cli/generated/graphql.ts   |  29 +++
 .../onboarding-internal-boot.model.ts         |  46 ++++
 .../onboarding-internal-boot.resolver.ts      |  23 ++
 .../onboarding-internal-boot.service.spec.ts  |  88 ++++++++
 .../onboarding-internal-boot.service.ts       | 204 ++++++++++++++++++
 .../graph/resolvers/resolvers.module.ts       |   4 +
 8 files changed, 415 insertions(+)
 create mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts
 create mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts
 create mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
 create mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 8c57e0ae0c..507659e81e 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -3082,6 +3082,25 @@ type Connect implements Node {
   settings: ConnectSettings!
 }
 
+type OnboardingInternalBootDeviceOption {
+  value: String!
+  label: String!
+  sizeMiB: Int!
+}
+
+type OnboardingInternalBootContext {
+  fsState: String
+  bootEligible: Boolean!
+  reservedNames: [String!]!
+  shareNames: [String!]!
+  poolNames: [String!]!
+  defaultPoolName: String!
+  maxSlots: Int!
+  bootSizePresetsMiB: [Int!]!
+  defaultBootSizeMiB: Int!
+  deviceOptions: [OnboardingInternalBootDeviceOption!]!
+}
+
 type Network implements Node {
   id: PrefixedID!
   accessUrls: [AccessUrl!]
@@ -3135,6 +3154,7 @@ type Query {
   services: [Service!]!
   shares: [Share!]!
   vars: Vars!
+  onboardingInternalBoot: OnboardingInternalBootContext!
 
   """Get information about all VMs on the system"""
   vms: Vms!
diff --git a/api/src/__test__/store/modules/emhttp.test.ts b/api/src/__test__/store/modules/emhttp.test.ts
index cfea38b26f..e9e987e859 100644
--- a/api/src/__test__/store/modules/emhttp.test.ts
+++ b/api/src/__test__/store/modules/emhttp.test.ts
@@ -1001,6 +1001,7 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
     expect(varState).toMatchInlineSnapshot(`
       {
         "bindMgt": false,
+        "bootEligible": false,
         "cacheNumDevices": NaN,
         "cacheSbNumDisks": NaN,
         "comment": "Dev Server",
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index 73d88de348..817a6d9716 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -701,6 +701,8 @@ export type Disk = Node & {
   bytesPerSector: Scalars['Float']['output'];
   /** The device path of the disk (e.g. /dev/sdb) */
   device: Scalars['String']['output'];
+  /** Device identifier from emhttp devs.ini used by disk assignment commands */
+  emhttpDeviceId?: Maybe<Scalars['String']['output']>;
   /** The firmware revision of the disk */
   firmwareRevision: Scalars['String']['output'];
   id: Scalars['PrefixedID']['output'];
@@ -712,6 +714,10 @@ export type Disk = Node & {
   name: Scalars['String']['output'];
   /** The partitions on the disk */
   partitions: Array<DiskPartition>;
+  /** Sector size in bytes from emhttp devs.ini for this device */
+  sectorSize?: Maybe<Scalars['Float']['output']>;
+  /** Sector count from emhttp devs.ini for this device */
+  sectors?: Maybe<Scalars['Float']['output']>;
   /** The number of sectors per track */
   sectorsPerTrack: Scalars['Float']['output'];
   /** The serial number of the disk */
@@ -1963,6 +1969,27 @@ export type Onboarding = {
   status: OnboardingStatus;
 };
 
+export type OnboardingInternalBootContext = {
+  __typename?: 'OnboardingInternalBootContext';
+  bootEligible: Scalars['Boolean']['output'];
+  bootSizePresetsMiB: Array<Scalars['Int']['output']>;
+  defaultBootSizeMiB: Scalars['Int']['output'];
+  defaultPoolName: Scalars['String']['output'];
+  deviceOptions: Array<OnboardingInternalBootDeviceOption>;
+  fsState?: Maybe<Scalars['String']['output']>;
+  maxSlots: Scalars['Int']['output'];
+  poolNames: Array<Scalars['String']['output']>;
+  reservedNames: Array<Scalars['String']['output']>;
+  shareNames: Array<Scalars['String']['output']>;
+};
+
+export type OnboardingInternalBootDeviceOption = {
+  __typename?: 'OnboardingInternalBootDeviceOption';
+  label: Scalars['String']['output'];
+  sizeMiB: Scalars['Int']['output'];
+  value: Scalars['String']['output'];
+};
+
 /** Onboarding related mutations */
 export type OnboardingMutations = {
   __typename?: 'OnboardingMutations';
@@ -2268,6 +2295,7 @@ export type Query = {
   oidcProvider?: Maybe<OidcProvider>;
   /** Get all configured OIDC providers (admin only) */
   oidcProviders: Array<OidcProvider>;
+  onboardingInternalBoot: OnboardingInternalBootContext;
   online: Scalars['Boolean']['output'];
   owner: Owner;
   parityHistory: Array<ParityCheck>;
@@ -3175,6 +3203,7 @@ export type UserAccount = Node & {
 export type Vars = Node & {
   __typename?: 'Vars';
   bindMgt?: Maybe<Scalars['Boolean']['output']>;
+  bootEligible?: Maybe<Scalars['Boolean']['output']>;
   cacheNumDevices?: Maybe<Scalars['Int']['output']>;
   cacheSbNumDisks?: Maybe<Scalars['Int']['output']>;
   comment?: Maybe<Scalars['String']['output']>;
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts
new file mode 100644
index 0000000000..d98ed0dc48
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts
@@ -0,0 +1,46 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql';
+
+@ObjectType()
+export class OnboardingInternalBootDeviceOption {
+    @Field(() => String)
+    value!: string;
+
+    @Field(() => String)
+    label!: string;
+
+    @Field(() => Int)
+    sizeMiB!: number;
+}
+
+@ObjectType()
+export class OnboardingInternalBootContext {
+    @Field(() => String, { nullable: true })
+    fsState?: string | null;
+
+    @Field(() => Boolean)
+    bootEligible!: boolean;
+
+    @Field(() => [String])
+    reservedNames!: string[];
+
+    @Field(() => [String])
+    shareNames!: string[];
+
+    @Field(() => [String])
+    poolNames!: string[];
+
+    @Field(() => String)
+    defaultPoolName!: string;
+
+    @Field(() => Int)
+    maxSlots!: number;
+
+    @Field(() => [Int])
+    bootSizePresetsMiB!: number[];
+
+    @Field(() => Int)
+    defaultBootSizeMiB!: number;
+
+    @Field(() => [OnboardingInternalBootDeviceOption])
+    deviceOptions!: OnboardingInternalBootDeviceOption[];
+}
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts
new file mode 100644
index 0000000000..bf88075cd6
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts
@@ -0,0 +1,23 @@
+import { Query, Resolver } from '@nestjs/graphql';
+
+import { AuthAction, Resource } from '@unraid/shared/graphql.model.js';
+import { UsePermissions } from '@unraid/shared/use-permissions.directive.js';
+
+import { OnboardingInternalBootContext } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.js';
+import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
+
+@Resolver(() => OnboardingInternalBootContext)
+export class OnboardingInternalBootResolver {
+    constructor(private readonly onboardingInternalBootService: OnboardingInternalBootService) {}
+
+    @Query(() => OnboardingInternalBootContext, {
+        description: 'Internal boot setup context used by onboarding',
+    })
+    @UsePermissions({
+        action: AuthAction.READ_ANY,
+        resource: Resource.WELCOME,
+    })
+    onboardingInternalBoot(): OnboardingInternalBootContext {
+        return this.onboardingInternalBootService.getContext();
+    }
+}
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
new file mode 100644
index 0000000000..3e9c0ee3df
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
@@ -0,0 +1,88 @@
+import { ConfigService } from '@nestjs/config';
+import { Test } from '@nestjs/testing';
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model.js';
+import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
+
+describe('OnboardingInternalBootService', () => {
+    let service: OnboardingInternalBootService;
+    const configGet = vi.fn();
+
+    beforeEach(async () => {
+        configGet.mockReset();
+
+        const module = await Test.createTestingModule({
+            providers: [
+                OnboardingInternalBootService,
+                {
+                    provide: ConfigService,
+                    useValue: {
+                        get: configGet,
+                    },
+                },
+            ],
+        }).compile();
+
+        service = module.get(OnboardingInternalBootService);
+    });
+
+    it('builds onboarding internal boot context from emhttp state', () => {
+        configGet.mockImplementation((key: string, fallback: unknown) => {
+            switch (key) {
+                case 'store.emhttp.var':
+                    return {
+                        fsState: 'Stopped',
+                        bootEligible: true,
+                        reservedNames: 'parity,disk1,cache',
+                    };
+                case 'store.emhttp.shares':
+                    return [{ name: 'media' }, { name: 'isos' }, { name: 'media' }];
+                case 'store.emhttp.disks':
+                    return [
+                        { type: ArrayDiskType.CACHE, name: 'cache' },
+                        { type: ArrayDiskType.CACHE, name: 'pool1' },
+                        { type: ArrayDiskType.DATA, name: 'disk1' },
+                    ];
+                case 'store.emhttp.devices':
+                    return [
+                        { id: 'MODEL_B', device: 'sdb', sectors: '20', sector_size: '1024' },
+                        { id: 'MODEL_A', device: 'sda', sectors: '20', sector_size: '1024' },
+                        { id: 'MODEL_C', device: 'sdc', sectors: '10', sector_size: '1024' },
+                    ];
+                default:
+                    return fallback;
+            }
+        });
+
+        const result = service.getContext();
+
+        expect(result.fsState).toBe('Stopped');
+        expect(result.bootEligible).toBe(true);
+        expect(result.reservedNames).toEqual(['parity', 'disk1', 'cache']);
+        expect(result.shareNames).toEqual(['media', 'isos']);
+        expect(result.poolNames).toEqual(['cache', 'pool']);
+        expect(result.defaultPoolName).toBe('');
+        expect(result.maxSlots).toBe(2);
+        expect(result.bootSizePresetsMiB).toEqual([16384, 32768, 65536, 131072]);
+        expect(result.defaultBootSizeMiB).toBe(16384);
+        expect(result.deviceOptions).toHaveLength(3);
+        expect(result.deviceOptions[0]?.value).toBe('MODEL_A');
+        expect(result.deviceOptions[1]?.value).toBe('MODEL_B');
+        expect(result.deviceOptions[2]?.value).toBe('MODEL_C');
+    });
+
+    it('uses cache as default pool name when no pools exist', () => {
+        configGet.mockImplementation((key: string, fallback: unknown) => {
+            if (key === 'store.emhttp.var') {
+                return { fsState: 'Stopped', bootEligible: false, reservedNames: '' };
+            }
+            return fallback;
+        });
+
+        const result = service.getContext();
+        expect(result.poolNames).toEqual([]);
+        expect(result.defaultPoolName).toBe('cache');
+    });
+});
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
new file mode 100644
index 0000000000..6d08feb665
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -0,0 +1,204 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model.js';
+import {
+    OnboardingInternalBootContext,
+    OnboardingInternalBootDeviceOption,
+} from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.js';
+
+type EmhttpVarRecord = {
+    fsState?: unknown;
+    bootEligible?: unknown;
+    reservedNames?: unknown;
+};
+
+type EmhttpDiskRecord = {
+    type?: unknown;
+    name?: unknown;
+};
+
+type EmhttpShareRecord = {
+    name?: unknown;
+};
+
+type EmhttpDeviceRecord = {
+    id?: unknown;
+    device?: unknown;
+    sectors?: unknown;
+    sector_size?: unknown;
+};
+
+type ParsedDevice = {
+    option: OnboardingInternalBootDeviceOption;
+    sectors: number;
+    model: string;
+    device: string;
+};
+
+const BOOT_POOL_MAX_SLOTS = 2;
+const DEFAULT_BOOT_SIZE_MIB = 16384;
+const BOOT_SIZE_PRESETS_MIB = [16384, 32768, 65536, 131072];
+
+const trimString = (value: unknown): string => (typeof value === 'string' ? value.trim() : '');
+
+const parsePositiveNumber = (value: unknown): number => {
+    if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
+        return value;
+    }
+    if (typeof value === 'string' && value.trim().length > 0) {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed) && parsed > 0) {
+            return parsed;
+        }
+    }
+    return 0;
+};
+
+const formatBytes = (bytes: number): string => {
+    if (!Number.isFinite(bytes) || bytes <= 0) {
+        return '';
+    }
+
+    const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    let value = bytes;
+    let unitIndex = 0;
+
+    while (value >= 1024 && unitIndex < units.length - 1) {
+        value /= 1024;
+        unitIndex += 1;
+    }
+
+    const precision = value >= 100 || unitIndex === 0 ? 0 : 1;
+    return `${value.toFixed(precision)} ${units[unitIndex]}`;
+};
+
+const getModel = (id: string): string => {
+    const position = id.lastIndexOf('_');
+    return position === -1 ? id : id.slice(0, position);
+};
+
+const normalizePoolName = (name: string): string => name.replace(/\d+$/, '');
+
+@Injectable()
+export class OnboardingInternalBootService {
+    constructor(private readonly configService: ConfigService) {}
+
+    private getReservedNames(varState: EmhttpVarRecord): string[] {
+        const rawReserved = trimString(varState.reservedNames);
+        if (!rawReserved) {
+            return [];
+        }
+        return rawReserved
+            .split(',')
+            .map((entry) => entry.trim())
+            .filter((entry) => entry.length > 0);
+    }
+
+    private getShareNames(): string[] {
+        const shares = this.configService.get<EmhttpShareRecord[]>('store.emhttp.shares', []);
+        const names: string[] = [];
+        const seen = new Set<string>();
+
+        for (const share of shares) {
+            const name = trimString(share?.name);
+            if (!name || seen.has(name)) {
+                continue;
+            }
+            seen.add(name);
+            names.push(name);
+        }
+
+        return names;
+    }
+
+    private getPoolNames(): string[] {
+        const disks = this.configService.get<EmhttpDiskRecord[]>('store.emhttp.disks', []);
+        const names: string[] = [];
+        const seen = new Set<string>();
+
+        for (const disk of disks) {
+            if (disk?.type !== ArrayDiskType.CACHE) {
+                continue;
+            }
+            const poolName = normalizePoolName(trimString(disk.name));
+            if (!poolName || seen.has(poolName)) {
+                continue;
+            }
+            seen.add(poolName);
+            names.push(poolName);
+        }
+
+        return names;
+    }
+
+    private parseDevices(): OnboardingInternalBootDeviceOption[] {
+        const devices = this.configService.get<EmhttpDeviceRecord[]>('store.emhttp.devices', []);
+        const parsed: ParsedDevice[] = [];
+
+        for (const item of devices) {
+            const id = trimString(item?.id);
+            const device = trimString(item?.device);
+            const sectors = parsePositiveNumber(item?.sectors);
+            const sectorSize = parsePositiveNumber(item?.sector_size);
+            const sizeBytes = sectors > 0 && sectorSize > 0 ? sectors * sectorSize : 0;
+            const sizeMiB = sizeBytes > 0 ? Math.floor(sizeBytes / 1024 / 1024) : 0;
+            const value = id || device;
+
+            if (!value) {
+                continue;
+            }
+
+            const sizeText = formatBytes(sizeBytes);
+            const labelStart = sizeText ? `${value} - ${sizeText}` : value;
+            const label = device ? `${labelStart} (${device})` : labelStart;
+
+            parsed.push({
+                option: {
+                    value,
+                    label,
+                    sizeMiB,
+                },
+                sectors,
+                model: getModel(id),
+                device,
+            });
+        }
+
+        parsed.sort((left, right) => {
+            if (left.sectors !== right.sectors) {
+                return right.sectors - left.sectors;
+            }
+
+            const modelCompare = left.model.localeCompare(right.model, undefined, {
+                sensitivity: 'base',
+                numeric: true,
+            });
+            if (modelCompare !== 0) {
+                return modelCompare;
+            }
+
+            return left.device.localeCompare(right.device);
+        });
+
+        return parsed.map((entry) => entry.option);
+    }
+
+    getContext(): OnboardingInternalBootContext {
+        const varState = this.configService.get<EmhttpVarRecord>('store.emhttp.var', {});
+        const poolNames = this.getPoolNames();
+
+        return {
+            fsState: trimString(varState.fsState) || null,
+            bootEligible: Boolean(varState.bootEligible),
+            reservedNames: this.getReservedNames(varState),
+            shareNames: this.getShareNames(),
+            poolNames,
+            defaultPoolName: poolNames.length === 0 ? 'cache' : '',
+            maxSlots: BOOT_POOL_MAX_SLOTS,
+            bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
+            defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
+            deviceOptions: this.parseDevices(),
+        };
+    }
+}
diff --git a/api/src/unraid-api/graph/resolvers/resolvers.module.ts b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
index dc689376f2..abed524c8b 100644
--- a/api/src/unraid-api/graph/resolvers/resolvers.module.ts
+++ b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
@@ -20,6 +20,8 @@ import { MetricsModule } from '@app/unraid-api/graph/resolvers/metrics/metrics.m
 import { RootMutationsResolver } from '@app/unraid-api/graph/resolvers/mutation/mutation.resolver.js';
 import { NotificationsModule } from '@app/unraid-api/graph/resolvers/notifications/notifications.module.js';
 import { NotificationsResolver } from '@app/unraid-api/graph/resolvers/notifications/notifications.resolver.js';
+import { OnboardingInternalBootResolver } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.js';
+import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
 import { OnboardingMutationsResolver } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.mutation.js';
 import { OnlineResolver } from '@app/unraid-api/graph/resolvers/online/online.resolver.js';
 import { OwnerResolver } from '@app/unraid-api/graph/resolvers/owner/owner.resolver.js';
@@ -72,6 +74,8 @@ import { MeResolver } from '@app/unraid-api/graph/user/user.resolver.js';
         FlashResolver,
         MeResolver,
         NotificationsResolver,
+        OnboardingInternalBootResolver,
+        OnboardingInternalBootService,
         OnlineResolver,
         OwnerResolver,
         OnboardingMutationsResolver,

From 953ef91aaa62a9cf1cfee3aa955d5cf3a579e78b Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 15:35:21 -0500
Subject: [PATCH 10/53] refactor(web): migrate internal boot step to onboarding
 query

- Purpose: port internal-boot onboarding UI logic to consume the dedicated API context with webgui-aligned inputs.

- Before: the step mixed array/vars/disks queries and inferred devices/constraints client-side from generic disk metadata.

- Problem: validation and selectable-device behavior could diverge from CacheDevices.page during migration.

- Change: switched query consumption to onboardingInternalBoot context and regenerated typed GraphQL documents.

- Change: added pool-name collision validation against reserved names, user shares, and existing pools to match webgui checks.

- Change: removed HTML-parsing/system-disk derivation paths; device options now come directly from API-provided devs.ini context.

- How it works: the step initializes defaults, slot limits, preset bounds, and validation rules from one query payload and persists the same draft selection flow.
---
 .../graphql/getInternalBootContext.query.ts   |  39 +--
 .../steps/OnboardingInternalBootStep.vue      | 242 +++++++-----------
 web/src/composables/gql/gql.ts                |   6 +-
 web/src/composables/gql/graphql.ts            |  26 +-
 web/src/composables/gql/index.ts              |   4 +-
 5 files changed, 141 insertions(+), 176 deletions(-)

diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index 1c48770c2f..9e53139f73 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -2,34 +2,21 @@ import gql from 'graphql-tag';
 
 export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
   query GetInternalBootContext {
-    array {
-      state
-      boot {
-        device
-      }
-      parities {
-        device
-      }
-      disks {
-        device
-      }
-      caches {
-        device
-      }
-    }
-    vars {
+    onboardingInternalBoot {
       fsState
       bootEligible
-    }
-    disks {
-      id
-      device
-      serialNum
-      size
-      interfaceType
-      emhttpDeviceId
-      sectors
-      sectorSize
+      reservedNames
+      shareNames
+      poolNames
+      defaultPoolName
+      maxSlots
+      bootSizePresetsMiB
+      defaultBootSizeMiB
+      deviceOptions {
+        value
+        label
+        sizeMiB
+      }
     }
   }
 `;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index cc59098a6b..14e630e97b 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -27,12 +27,15 @@ const draftStore = useOnboardingDraftStore();
 interface InternalBootDeviceOption {
   value: string;
   label: string;
-  sizeMiB: number | null;
+  sizeMiB: number;
 }
 
 interface InternalBootTemplateData {
-  isBootPoolUiAvailable: boolean;
+  fsState: string | null;
   isBootPoolEligible: boolean;
+  reservedNames: string[];
+  shareNames: string[];
+  poolNames: string[];
   poolNameDefault: string;
   slotOptions: number[];
   deviceOptions: InternalBootDeviceOption[];
@@ -42,82 +45,26 @@ interface InternalBootTemplateData {
 }
 
 interface InternalBootContext {
-  array: {
-    state: string;
-    boot?: { device?: string | null } | null;
-    parities: { device?: string | null }[];
-    disks: { device?: string | null }[];
-    caches: { device?: string | null }[];
-  };
-  vars?: { fsState?: string | null; bootEligible?: boolean | null } | null;
-  disks: {
-    id: string;
-    device: string;
-    serialNum: string;
-    size: number;
-    interfaceType: string;
-    emhttpDeviceId?: string | null;
-    sectors?: number | null;
-    sectorSize?: number | null;
-  }[];
+  onboardingInternalBoot?: {
+    fsState?: string | null;
+    bootEligible?: boolean | null;
+    reservedNames?: string[] | null;
+    shareNames?: string[] | null;
+    poolNames?: string[] | null;
+    defaultPoolName?: string | null;
+    maxSlots?: number | null;
+    bootSizePresetsMiB?: number[] | null;
+    defaultBootSizeMiB?: number | null;
+    deviceOptions?:
+      | {
+          value?: string | null;
+          label?: string | null;
+          sizeMiB?: number | null;
+        }[]
+      | null;
+  } | null;
 }
 
-const DEFAULT_BOOT_SIZE_MIB = 16384;
-const BOOT_SIZE_PRESETS_MIB = [16384, 32768, 65536, 131072];
-
-const formatBytes = (bytes: number) => {
-  if (!Number.isFinite(bytes) || bytes <= 0) {
-    return 'Unknown';
-  }
-
-  const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-  let value = bytes;
-  let unitIndex = 0;
-  while (value >= 1024 && unitIndex < units.length - 1) {
-    value /= 1024;
-    unitIndex += 1;
-  }
-
-  const precision = value >= 100 || unitIndex === 0 ? 0 : 1;
-  return `${value.toFixed(precision)} ${units[unitIndex]}`;
-};
-
-const toSizeMiB = (bytes: number): number | null => {
-  if (!Number.isFinite(bytes) || bytes <= 0) {
-    return null;
-  }
-  return Math.floor(bytes / 1024 / 1024);
-};
-
-const normalizeDeviceName = (value: string | null | undefined): string => {
-  if (!value) {
-    return '';
-  }
-  const trimmed = value.trim();
-  if (trimmed.startsWith('/dev/')) {
-    return trimmed.slice('/dev/'.length);
-  }
-  return trimmed;
-};
-
-const deriveDeviceSizeBytes = (
-  sectors: number | null | undefined,
-  sectorSize: number | null | undefined,
-  fallbackSize: number
-) => {
-  if (
-    typeof sectors === 'number' &&
-    Number.isFinite(sectors) &&
-    sectors > 0 &&
-    typeof sectorSize === 'number' &&
-    Number.isFinite(sectorSize) &&
-    sectorSize > 0
-  ) {
-    return sectors * sectorSize;
-  }
-  return fallbackSize;
-};
-
 const {
   result: contextResult,
   loading: contextLoading,
@@ -138,97 +85,79 @@ const updateBios = ref(true);
 
 const templateData = computed<InternalBootTemplateData | null>(() => {
   const data = contextResult.value as InternalBootContext | null;
-  if (!data) {
+  const context = data?.onboardingInternalBoot;
+  if (!context) {
     return null;
   }
 
-  const assignedDevices = new Set<string>();
-  const assignedDiskGroups = [
-    data.array.boot ? [data.array.boot] : [],
-    data.array.parities,
-    data.array.disks,
-    data.array.caches,
-  ];
+  const maxSlots =
+    typeof context.maxSlots === 'number' && Number.isFinite(context.maxSlots) && context.maxSlots > 0
+      ? Math.floor(context.maxSlots)
+      : 2;
+  const slotOptions = Array.from({ length: maxSlots }, (_, index) => index + 1);
 
-  for (const group of assignedDiskGroups) {
-    for (const disk of group) {
-      const device = normalizeDeviceName(disk.device);
-      if (device) {
-        assignedDevices.add(device);
-      }
+  const deviceOptions: InternalBootDeviceOption[] = [];
+  const seenValues = new Set<string>();
+  for (const option of context.deviceOptions ?? []) {
+    const value = option.value?.trim() || '';
+    const label = option.label?.trim() || '';
+    if (!value || !label || seenValues.has(value)) {
+      continue;
     }
+    seenValues.add(value);
+    const sizeMiB =
+      typeof option.sizeMiB === 'number' && Number.isFinite(option.sizeMiB) && option.sizeMiB > 0
+        ? Math.floor(option.sizeMiB)
+        : 0;
+    deviceOptions.push({ value, label, sizeMiB });
   }
 
-  const deviceOptions = data.disks
-    .filter((disk) => {
-      const device = normalizeDeviceName(disk.device);
-      const emhttpDeviceId = disk.emhttpDeviceId?.trim();
-      if (!device || !emhttpDeviceId) {
-        return false;
-      }
-      if (assignedDevices.has(device)) {
-        return false;
-      }
-      return true;
-    })
-    .map<InternalBootDeviceOption>((disk) => {
-      const device = normalizeDeviceName(disk.device);
-      const emhttpDeviceId = disk.emhttpDeviceId?.trim() || disk.id.trim() || device;
-      const sizeBytes = deriveDeviceSizeBytes(disk.sectors, disk.sectorSize, disk.size);
-      const sizeMiB = toSizeMiB(sizeBytes);
-      const sizeLabel = formatBytes(sizeBytes);
-      return {
-        value: emhttpDeviceId,
-        label: `${emhttpDeviceId} - ${sizeLabel} (${device})`,
-        sizeMiB,
-      };
-    });
-
-  const hasExistingCachePool = data.array.caches.length > 0;
-
   return {
-    isBootPoolUiAvailable: true,
-    isBootPoolEligible: Boolean(data.vars?.bootEligible),
-    poolNameDefault: hasExistingCachePool ? '' : 'cache',
-    slotOptions: [1, 2],
+    fsState: context.fsState ?? null,
+    isBootPoolEligible: Boolean(context.bootEligible),
+    reservedNames: context.reservedNames?.filter((name) => typeof name === 'string') ?? [],
+    shareNames: context.shareNames?.filter((name) => typeof name === 'string') ?? [],
+    poolNames: context.poolNames?.filter((name) => typeof name === 'string') ?? [],
+    poolNameDefault: context.defaultPoolName ?? '',
+    slotOptions,
     deviceOptions,
-    bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
-    defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
+    bootSizePresetsMiB:
+      context.bootSizePresetsMiB?.filter((size) => Number.isFinite(size) && size > 0) ?? [],
+    defaultBootSizeMiB:
+      typeof context.defaultBootSizeMiB === 'number' &&
+      Number.isFinite(context.defaultBootSizeMiB) &&
+      context.defaultBootSizeMiB > 0
+        ? Math.floor(context.defaultBootSizeMiB)
+        : 16384,
     defaultUpdateBios: true,
   };
 });
 
 const isLoading = computed(() => Boolean(contextLoading.value));
 const isBusy = computed(() => Boolean(props.isSavingStep) || isLoading.value);
-const isArrayStopped = computed(() => {
-  if (contextResult.value?.array.state) {
-    return contextResult.value.array.state === 'STOPPED';
-  }
-  return contextResult.value?.vars?.fsState === 'Stopped';
-});
-const isBootPoolUiAvailable = computed(() => Boolean(templateData.value?.isBootPoolUiAvailable));
+const isArrayStopped = computed(() => templateData.value?.fsState === 'Stopped');
 const isBootPoolEligible = computed(() => Boolean(templateData.value?.isBootPoolEligible));
 const deviceOptions = computed(() => templateData.value?.deviceOptions ?? []);
 const slotOptions = computed(() => templateData.value?.slotOptions ?? [1, 2]);
+const maxSlots = computed(() => slotOptions.value[slotOptions.value.length - 1] ?? 2);
+const reservedPoolNames = computed(() => new Set(templateData.value?.reservedNames ?? []));
+const shareNames = computed(() => new Set(templateData.value?.shareNames ?? []));
+const existingPoolNames = computed(() => new Set(templateData.value?.poolNames ?? []));
 
 const canConfigure = computed(
-  () =>
-    isArrayStopped.value &&
-    isBootPoolUiAvailable.value &&
-    isBootPoolEligible.value &&
-    deviceOptions.value.length > 0
+  () => isArrayStopped.value && isBootPoolEligible.value && deviceOptions.value.length > 0
 );
 
 const loadStatusMessage = computed(() => {
   if (contextError.value) {
     return 'Unable to load internal boot options from API.';
   }
+  if (!templateData.value) {
+    return 'Unable to load internal boot options.';
+  }
   if (!isArrayStopped.value) {
     return 'Internal boot setup is only available while the array is stopped.';
   }
-  if (!isBootPoolUiAvailable.value) {
-    return 'Unable to load internal boot options.';
-  }
   if (!isBootPoolEligible.value) {
     return 'This server is not currently eligible for internal boot setup.';
   }
@@ -241,7 +170,7 @@ const loadStatusMessage = computed(() => {
 const deviceSizeById = computed(() => {
   const entries = new Map<string, number>();
   for (const option of deviceOptions.value) {
-    if (option.sizeMiB !== null) {
+    if (option.sizeMiB > 0) {
       entries.set(option.value, option.sizeMiB);
     }
   }
@@ -343,6 +272,18 @@ const applyBootSizeSelection = (valueMiB: number) => {
   customBootSizeGb.value = String(sizeGb);
 };
 
+watch(
+  [slotOptions],
+  () => {
+    const minSlot = slotOptions.value[0] ?? 1;
+    const nextValue = Math.max(minSlot, Math.min(maxSlots.value, slotCount.value));
+    if (nextValue !== slotCount.value) {
+      slotCount.value = nextValue;
+    }
+  },
+  { immediate: true }
+);
+
 watch(
   slotCount,
   (value) => {
@@ -408,8 +349,23 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
-  if (slotCount.value < 1 || slotCount.value > 2) {
-    formError.value = 'Select 1 or 2 slots.';
+  if (reservedPoolNames.value.has(normalizedPoolName)) {
+    formError.value = 'Do not use reserved names.';
+    return null;
+  }
+
+  if (shareNames.value.has(normalizedPoolName)) {
+    formError.value = 'Do not use user share names.';
+    return null;
+  }
+
+  if (existingPoolNames.value.has(normalizedPoolName)) {
+    formError.value = 'Pool name already exists.';
+    return null;
+  }
+
+  if (slotCount.value < 1 || slotCount.value > maxSlots.value) {
+    formError.value = `Select between 1 and ${maxSlots.value} slots.`;
     return null;
   }
 
@@ -451,7 +407,7 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
 const initializeForm = (data: InternalBootTemplateData) => {
   const draftSelection = draftStore.internalBootSelection;
   const firstSlot = data.slotOptions[0] ?? 1;
-  const defaultSlot = Math.max(1, Math.min(2, firstSlot));
+  const defaultSlot = Math.max(1, Math.min(maxSlots.value, firstSlot));
 
   poolName.value = draftSelection?.poolName || data.poolNameDefault || 'cache';
   slotCount.value = draftSelection?.slotCount ?? defaultSlot;
@@ -484,7 +440,7 @@ watch(
     }
 
     poolName.value = selection.poolName;
-    slotCount.value = selection.slotCount;
+    slotCount.value = Math.max(1, Math.min(maxSlots.value, selection.slotCount));
     selectedDevices.value = [...selection.devices];
     normalizeSelectedDevices(slotCount.value);
     updateBios.value = selection.updateBios;
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 83aadc5fc7..e39af52349 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -73,7 +73,7 @@ type Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": typeof types.InstalledUnraidPluginsDocument,
@@ -156,7 +156,7 @@ const documents: Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": types.InstalledUnraidPluginsDocument,
@@ -433,7 +433,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 96075104cd..10f87d32ab 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -1969,6 +1969,27 @@ export type Onboarding = {
   status: OnboardingStatus;
 };
 
+export type OnboardingInternalBootContext = {
+  __typename?: 'OnboardingInternalBootContext';
+  bootEligible: Scalars['Boolean']['output'];
+  bootSizePresetsMiB: Array<Scalars['Int']['output']>;
+  defaultBootSizeMiB: Scalars['Int']['output'];
+  defaultPoolName: Scalars['String']['output'];
+  deviceOptions: Array<OnboardingInternalBootDeviceOption>;
+  fsState?: Maybe<Scalars['String']['output']>;
+  maxSlots: Scalars['Int']['output'];
+  poolNames: Array<Scalars['String']['output']>;
+  reservedNames: Array<Scalars['String']['output']>;
+  shareNames: Array<Scalars['String']['output']>;
+};
+
+export type OnboardingInternalBootDeviceOption = {
+  __typename?: 'OnboardingInternalBootDeviceOption';
+  label: Scalars['String']['output'];
+  sizeMiB: Scalars['Int']['output'];
+  value: Scalars['String']['output'];
+};
+
 /** Onboarding related mutations */
 export type OnboardingMutations = {
   __typename?: 'OnboardingMutations';
@@ -2274,6 +2295,7 @@ export type Query = {
   oidcProvider?: Maybe<OidcProvider>;
   /** Get all configured OIDC providers (admin only) */
   oidcProviders: Array<OidcProvider>;
+  onboardingInternalBoot: OnboardingInternalBootContext;
   online: Scalars['Boolean']['output'];
   owner: Owner;
   parityHistory: Array<ParityCheck>;
@@ -3867,7 +3889,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null }, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType, emhttpDeviceId?: string | null, sectors?: number | null, sectorSize?: number | null }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', onboardingInternalBoot: { __typename?: 'OnboardingInternalBootContext', fsState?: string | null, bootEligible: boolean, reservedNames: Array<string>, shareNames: Array<string>, poolNames: Array<string>, defaultPoolName: string, maxSlots: number, bootSizePresetsMiB: Array<number>, defaultBootSizeMiB: number, deviceOptions: Array<{ __typename?: 'OnboardingInternalBootDeviceOption', value: string, label: string, sizeMiB: number }> } };
 
 export type InstallLanguageMutationVariables = Exact<{
   input: InstallPluginInput;
@@ -4052,7 +4074,7 @@ export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","name":{"kind":"Name","value":"sectors"}},{"kind":"Field","name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboardingInternalBoot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}},{"kind":"Field","name":{"kind":"Name","value":"shareNames"}},{"kind":"Field","name":{"kind":"Name","value":"poolNames"}},{"kind":"Field","name":{"kind":"Name","value":"defaultPoolName"}},{"kind":"Field","name":{"kind":"Name","value":"maxSlots"}},{"kind":"Field","name":{"kind":"Name","value":"bootSizePresetsMiB"}},{"kind":"Field","name":{"kind":"Name","value":"defaultBootSizeMiB"}},{"kind":"Field","name":{"kind":"Name","value":"deviceOptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"sizeMiB"}}]}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;
 export const InstalledUnraidPluginsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InstalledUnraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installedUnraidPlugins"}}]}}]} as unknown as DocumentNode<InstalledUnraidPluginsQuery, InstalledUnraidPluginsQueryVariables>;
diff --git a/web/src/composables/gql/index.ts b/web/src/composables/gql/index.ts
index 0ea4a91cf8..c682b1e2f9 100644
--- a/web/src/composables/gql/index.ts
+++ b/web/src/composables/gql/index.ts
@@ -1,2 +1,2 @@
-export * from "./fragment-masking";
-export * from "./gql";
+export * from './fragment-masking';
+export * from './gql';

From f1cadef4b9965a54eb4a937213990395c7772922 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 15:45:51 -0500
Subject: [PATCH 11/53] refactor(api): remove onboarding internal boot context
 resolver

- Purpose: revert the custom onboarding-specific internal boot GraphQL surface and return to existing API surfaces only.
- Before: Query included  with custom resolver/service/types and schema entries generated from that path.
- Problem: this diverged from the migration goal of reusing existing API data and increased maintenance/behavior drift risk.
- Change: removed  resolver/service/model files, detached providers from , and removed schema/codegen artifacts for that field.
- How it works now: API exposes no new onboarding internal-boot query; consumers must use existing /// GraphQL fields.
---
 api/generated-schema.graphql                  |  20 --
 api/src/unraid-api/cli/generated/graphql.ts   |  22 --
 .../onboarding-internal-boot.model.ts         |  46 ----
 .../onboarding-internal-boot.resolver.ts      |  23 --
 .../onboarding-internal-boot.service.spec.ts  |  88 --------
 .../onboarding-internal-boot.service.ts       | 204 ------------------
 .../graph/resolvers/resolvers.module.ts       |   4 -
 7 files changed, 407 deletions(-)
 delete mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts
 delete mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts
 delete mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
 delete mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 507659e81e..8c57e0ae0c 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -3082,25 +3082,6 @@ type Connect implements Node {
   settings: ConnectSettings!
 }
 
-type OnboardingInternalBootDeviceOption {
-  value: String!
-  label: String!
-  sizeMiB: Int!
-}
-
-type OnboardingInternalBootContext {
-  fsState: String
-  bootEligible: Boolean!
-  reservedNames: [String!]!
-  shareNames: [String!]!
-  poolNames: [String!]!
-  defaultPoolName: String!
-  maxSlots: Int!
-  bootSizePresetsMiB: [Int!]!
-  defaultBootSizeMiB: Int!
-  deviceOptions: [OnboardingInternalBootDeviceOption!]!
-}
-
 type Network implements Node {
   id: PrefixedID!
   accessUrls: [AccessUrl!]
@@ -3154,7 +3135,6 @@ type Query {
   services: [Service!]!
   shares: [Share!]!
   vars: Vars!
-  onboardingInternalBoot: OnboardingInternalBootContext!
 
   """Get information about all VMs on the system"""
   vms: Vms!
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index 817a6d9716..a6a0c6f3fd 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -1969,27 +1969,6 @@ export type Onboarding = {
   status: OnboardingStatus;
 };
 
-export type OnboardingInternalBootContext = {
-  __typename?: 'OnboardingInternalBootContext';
-  bootEligible: Scalars['Boolean']['output'];
-  bootSizePresetsMiB: Array<Scalars['Int']['output']>;
-  defaultBootSizeMiB: Scalars['Int']['output'];
-  defaultPoolName: Scalars['String']['output'];
-  deviceOptions: Array<OnboardingInternalBootDeviceOption>;
-  fsState?: Maybe<Scalars['String']['output']>;
-  maxSlots: Scalars['Int']['output'];
-  poolNames: Array<Scalars['String']['output']>;
-  reservedNames: Array<Scalars['String']['output']>;
-  shareNames: Array<Scalars['String']['output']>;
-};
-
-export type OnboardingInternalBootDeviceOption = {
-  __typename?: 'OnboardingInternalBootDeviceOption';
-  label: Scalars['String']['output'];
-  sizeMiB: Scalars['Int']['output'];
-  value: Scalars['String']['output'];
-};
-
 /** Onboarding related mutations */
 export type OnboardingMutations = {
   __typename?: 'OnboardingMutations';
@@ -2295,7 +2274,6 @@ export type Query = {
   oidcProvider?: Maybe<OidcProvider>;
   /** Get all configured OIDC providers (admin only) */
   oidcProviders: Array<OidcProvider>;
-  onboardingInternalBoot: OnboardingInternalBootContext;
   online: Scalars['Boolean']['output'];
   owner: Owner;
   parityHistory: Array<ParityCheck>;
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts
deleted file mode 100644
index d98ed0dc48..0000000000
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Field, Int, ObjectType } from '@nestjs/graphql';
-
-@ObjectType()
-export class OnboardingInternalBootDeviceOption {
-    @Field(() => String)
-    value!: string;
-
-    @Field(() => String)
-    label!: string;
-
-    @Field(() => Int)
-    sizeMiB!: number;
-}
-
-@ObjectType()
-export class OnboardingInternalBootContext {
-    @Field(() => String, { nullable: true })
-    fsState?: string | null;
-
-    @Field(() => Boolean)
-    bootEligible!: boolean;
-
-    @Field(() => [String])
-    reservedNames!: string[];
-
-    @Field(() => [String])
-    shareNames!: string[];
-
-    @Field(() => [String])
-    poolNames!: string[];
-
-    @Field(() => String)
-    defaultPoolName!: string;
-
-    @Field(() => Int)
-    maxSlots!: number;
-
-    @Field(() => [Int])
-    bootSizePresetsMiB!: number[];
-
-    @Field(() => Int)
-    defaultBootSizeMiB!: number;
-
-    @Field(() => [OnboardingInternalBootDeviceOption])
-    deviceOptions!: OnboardingInternalBootDeviceOption[];
-}
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts
deleted file mode 100644
index bf88075cd6..0000000000
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Query, Resolver } from '@nestjs/graphql';
-
-import { AuthAction, Resource } from '@unraid/shared/graphql.model.js';
-import { UsePermissions } from '@unraid/shared/use-permissions.directive.js';
-
-import { OnboardingInternalBootContext } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.js';
-import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
-
-@Resolver(() => OnboardingInternalBootContext)
-export class OnboardingInternalBootResolver {
-    constructor(private readonly onboardingInternalBootService: OnboardingInternalBootService) {}
-
-    @Query(() => OnboardingInternalBootContext, {
-        description: 'Internal boot setup context used by onboarding',
-    })
-    @UsePermissions({
-        action: AuthAction.READ_ANY,
-        resource: Resource.WELCOME,
-    })
-    onboardingInternalBoot(): OnboardingInternalBootContext {
-        return this.onboardingInternalBootService.getContext();
-    }
-}
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
deleted file mode 100644
index 3e9c0ee3df..0000000000
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { ConfigService } from '@nestjs/config';
-import { Test } from '@nestjs/testing';
-
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model.js';
-import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
-
-describe('OnboardingInternalBootService', () => {
-    let service: OnboardingInternalBootService;
-    const configGet = vi.fn();
-
-    beforeEach(async () => {
-        configGet.mockReset();
-
-        const module = await Test.createTestingModule({
-            providers: [
-                OnboardingInternalBootService,
-                {
-                    provide: ConfigService,
-                    useValue: {
-                        get: configGet,
-                    },
-                },
-            ],
-        }).compile();
-
-        service = module.get(OnboardingInternalBootService);
-    });
-
-    it('builds onboarding internal boot context from emhttp state', () => {
-        configGet.mockImplementation((key: string, fallback: unknown) => {
-            switch (key) {
-                case 'store.emhttp.var':
-                    return {
-                        fsState: 'Stopped',
-                        bootEligible: true,
-                        reservedNames: 'parity,disk1,cache',
-                    };
-                case 'store.emhttp.shares':
-                    return [{ name: 'media' }, { name: 'isos' }, { name: 'media' }];
-                case 'store.emhttp.disks':
-                    return [
-                        { type: ArrayDiskType.CACHE, name: 'cache' },
-                        { type: ArrayDiskType.CACHE, name: 'pool1' },
-                        { type: ArrayDiskType.DATA, name: 'disk1' },
-                    ];
-                case 'store.emhttp.devices':
-                    return [
-                        { id: 'MODEL_B', device: 'sdb', sectors: '20', sector_size: '1024' },
-                        { id: 'MODEL_A', device: 'sda', sectors: '20', sector_size: '1024' },
-                        { id: 'MODEL_C', device: 'sdc', sectors: '10', sector_size: '1024' },
-                    ];
-                default:
-                    return fallback;
-            }
-        });
-
-        const result = service.getContext();
-
-        expect(result.fsState).toBe('Stopped');
-        expect(result.bootEligible).toBe(true);
-        expect(result.reservedNames).toEqual(['parity', 'disk1', 'cache']);
-        expect(result.shareNames).toEqual(['media', 'isos']);
-        expect(result.poolNames).toEqual(['cache', 'pool']);
-        expect(result.defaultPoolName).toBe('');
-        expect(result.maxSlots).toBe(2);
-        expect(result.bootSizePresetsMiB).toEqual([16384, 32768, 65536, 131072]);
-        expect(result.defaultBootSizeMiB).toBe(16384);
-        expect(result.deviceOptions).toHaveLength(3);
-        expect(result.deviceOptions[0]?.value).toBe('MODEL_A');
-        expect(result.deviceOptions[1]?.value).toBe('MODEL_B');
-        expect(result.deviceOptions[2]?.value).toBe('MODEL_C');
-    });
-
-    it('uses cache as default pool name when no pools exist', () => {
-        configGet.mockImplementation((key: string, fallback: unknown) => {
-            if (key === 'store.emhttp.var') {
-                return { fsState: 'Stopped', bootEligible: false, reservedNames: '' };
-            }
-            return fallback;
-        });
-
-        const result = service.getContext();
-        expect(result.poolNames).toEqual([]);
-        expect(result.defaultPoolName).toBe('cache');
-    });
-});
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
deleted file mode 100644
index 6d08feb665..0000000000
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-
-import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model.js';
-import {
-    OnboardingInternalBootContext,
-    OnboardingInternalBootDeviceOption,
-} from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.model.js';
-
-type EmhttpVarRecord = {
-    fsState?: unknown;
-    bootEligible?: unknown;
-    reservedNames?: unknown;
-};
-
-type EmhttpDiskRecord = {
-    type?: unknown;
-    name?: unknown;
-};
-
-type EmhttpShareRecord = {
-    name?: unknown;
-};
-
-type EmhttpDeviceRecord = {
-    id?: unknown;
-    device?: unknown;
-    sectors?: unknown;
-    sector_size?: unknown;
-};
-
-type ParsedDevice = {
-    option: OnboardingInternalBootDeviceOption;
-    sectors: number;
-    model: string;
-    device: string;
-};
-
-const BOOT_POOL_MAX_SLOTS = 2;
-const DEFAULT_BOOT_SIZE_MIB = 16384;
-const BOOT_SIZE_PRESETS_MIB = [16384, 32768, 65536, 131072];
-
-const trimString = (value: unknown): string => (typeof value === 'string' ? value.trim() : '');
-
-const parsePositiveNumber = (value: unknown): number => {
-    if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
-        return value;
-    }
-    if (typeof value === 'string' && value.trim().length > 0) {
-        const parsed = Number(value);
-        if (Number.isFinite(parsed) && parsed > 0) {
-            return parsed;
-        }
-    }
-    return 0;
-};
-
-const formatBytes = (bytes: number): string => {
-    if (!Number.isFinite(bytes) || bytes <= 0) {
-        return '';
-    }
-
-    const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-    let value = bytes;
-    let unitIndex = 0;
-
-    while (value >= 1024 && unitIndex < units.length - 1) {
-        value /= 1024;
-        unitIndex += 1;
-    }
-
-    const precision = value >= 100 || unitIndex === 0 ? 0 : 1;
-    return `${value.toFixed(precision)} ${units[unitIndex]}`;
-};
-
-const getModel = (id: string): string => {
-    const position = id.lastIndexOf('_');
-    return position === -1 ? id : id.slice(0, position);
-};
-
-const normalizePoolName = (name: string): string => name.replace(/\d+$/, '');
-
-@Injectable()
-export class OnboardingInternalBootService {
-    constructor(private readonly configService: ConfigService) {}
-
-    private getReservedNames(varState: EmhttpVarRecord): string[] {
-        const rawReserved = trimString(varState.reservedNames);
-        if (!rawReserved) {
-            return [];
-        }
-        return rawReserved
-            .split(',')
-            .map((entry) => entry.trim())
-            .filter((entry) => entry.length > 0);
-    }
-
-    private getShareNames(): string[] {
-        const shares = this.configService.get<EmhttpShareRecord[]>('store.emhttp.shares', []);
-        const names: string[] = [];
-        const seen = new Set<string>();
-
-        for (const share of shares) {
-            const name = trimString(share?.name);
-            if (!name || seen.has(name)) {
-                continue;
-            }
-            seen.add(name);
-            names.push(name);
-        }
-
-        return names;
-    }
-
-    private getPoolNames(): string[] {
-        const disks = this.configService.get<EmhttpDiskRecord[]>('store.emhttp.disks', []);
-        const names: string[] = [];
-        const seen = new Set<string>();
-
-        for (const disk of disks) {
-            if (disk?.type !== ArrayDiskType.CACHE) {
-                continue;
-            }
-            const poolName = normalizePoolName(trimString(disk.name));
-            if (!poolName || seen.has(poolName)) {
-                continue;
-            }
-            seen.add(poolName);
-            names.push(poolName);
-        }
-
-        return names;
-    }
-
-    private parseDevices(): OnboardingInternalBootDeviceOption[] {
-        const devices = this.configService.get<EmhttpDeviceRecord[]>('store.emhttp.devices', []);
-        const parsed: ParsedDevice[] = [];
-
-        for (const item of devices) {
-            const id = trimString(item?.id);
-            const device = trimString(item?.device);
-            const sectors = parsePositiveNumber(item?.sectors);
-            const sectorSize = parsePositiveNumber(item?.sector_size);
-            const sizeBytes = sectors > 0 && sectorSize > 0 ? sectors * sectorSize : 0;
-            const sizeMiB = sizeBytes > 0 ? Math.floor(sizeBytes / 1024 / 1024) : 0;
-            const value = id || device;
-
-            if (!value) {
-                continue;
-            }
-
-            const sizeText = formatBytes(sizeBytes);
-            const labelStart = sizeText ? `${value} - ${sizeText}` : value;
-            const label = device ? `${labelStart} (${device})` : labelStart;
-
-            parsed.push({
-                option: {
-                    value,
-                    label,
-                    sizeMiB,
-                },
-                sectors,
-                model: getModel(id),
-                device,
-            });
-        }
-
-        parsed.sort((left, right) => {
-            if (left.sectors !== right.sectors) {
-                return right.sectors - left.sectors;
-            }
-
-            const modelCompare = left.model.localeCompare(right.model, undefined, {
-                sensitivity: 'base',
-                numeric: true,
-            });
-            if (modelCompare !== 0) {
-                return modelCompare;
-            }
-
-            return left.device.localeCompare(right.device);
-        });
-
-        return parsed.map((entry) => entry.option);
-    }
-
-    getContext(): OnboardingInternalBootContext {
-        const varState = this.configService.get<EmhttpVarRecord>('store.emhttp.var', {});
-        const poolNames = this.getPoolNames();
-
-        return {
-            fsState: trimString(varState.fsState) || null,
-            bootEligible: Boolean(varState.bootEligible),
-            reservedNames: this.getReservedNames(varState),
-            shareNames: this.getShareNames(),
-            poolNames,
-            defaultPoolName: poolNames.length === 0 ? 'cache' : '',
-            maxSlots: BOOT_POOL_MAX_SLOTS,
-            bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
-            defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
-            deviceOptions: this.parseDevices(),
-        };
-    }
-}
diff --git a/api/src/unraid-api/graph/resolvers/resolvers.module.ts b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
index abed524c8b..dc689376f2 100644
--- a/api/src/unraid-api/graph/resolvers/resolvers.module.ts
+++ b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
@@ -20,8 +20,6 @@ import { MetricsModule } from '@app/unraid-api/graph/resolvers/metrics/metrics.m
 import { RootMutationsResolver } from '@app/unraid-api/graph/resolvers/mutation/mutation.resolver.js';
 import { NotificationsModule } from '@app/unraid-api/graph/resolvers/notifications/notifications.module.js';
 import { NotificationsResolver } from '@app/unraid-api/graph/resolvers/notifications/notifications.resolver.js';
-import { OnboardingInternalBootResolver } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.resolver.js';
-import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
 import { OnboardingMutationsResolver } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.mutation.js';
 import { OnlineResolver } from '@app/unraid-api/graph/resolvers/online/online.resolver.js';
 import { OwnerResolver } from '@app/unraid-api/graph/resolvers/owner/owner.resolver.js';
@@ -74,8 +72,6 @@ import { MeResolver } from '@app/unraid-api/graph/user/user.resolver.js';
         FlashResolver,
         MeResolver,
         NotificationsResolver,
-        OnboardingInternalBootResolver,
-        OnboardingInternalBootService,
         OnlineResolver,
         OwnerResolver,
         OnboardingMutationsResolver,

From e853cdecf6109aca0dc64b17c13b18dc22603337 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 15:46:15 -0500
Subject: [PATCH 12/53] refactor(web): use existing graphql context for
 internal boot

- Purpose: align onboarding internal-boot setup with existing API queries instead of a custom onboarding query.
- Before: onboarding step read a dedicated onboardingInternalBoot GraphQL field.
- Problem: extra query surface was unnecessary for this migration and made parity/debugging harder.
- Change: rewired onboarding internal-boot context query to existing fields (array, vars, shares, disks), updated step logic to derive options from those fields, and regenerated web GraphQL artifacts.
- How it works: onboarding now checks array state and boot eligibility from existing data, builds device options from disks, and keeps summary/apply behavior on the existing mkbootpool POST flow.
- Tracking: added docs/onboarding-internal-boot-port-differences.md to keep an explicit list of current non-1:1 differences versus webgui.
---
 ...boarding-internal-boot-port-differences.md |  29 +++
 .../graphql/getInternalBootContext.query.ts   |  43 ++-
 .../steps/OnboardingInternalBootStep.vue      | 245 ++++++++++++------
 web/src/composables/gql/gql.ts                |   6 +-
 web/src/composables/gql/graphql.ts            |  26 +-
 5 files changed, 224 insertions(+), 125 deletions(-)
 create mode 100644 docs/onboarding-internal-boot-port-differences.md

diff --git a/docs/onboarding-internal-boot-port-differences.md b/docs/onboarding-internal-boot-port-differences.md
new file mode 100644
index 0000000000..435a548579
--- /dev/null
+++ b/docs/onboarding-internal-boot-port-differences.md
@@ -0,0 +1,29 @@
+# Onboarding Internal Boot Port: Non-1:1 Differences
+
+This list tracks behavior that is intentionally or currently different from the webgui implementation in commit `edff0e5202c0efeaa613efb8dfc599453d0fe5cb`.
+
+## Current Differences
+
+- Data source for setup context:
+  - Webgui: `Main/PoolDevices`/websocket-rendered context + `devs.ini`-based behavior.
+  - Onboarding: existing GraphQL (`array`, `vars`, `shares`, `disks`).
+
+- Device option labeling:
+  - Webgui formats labels via PHP helpers.
+  - Onboarding formats labels in Vue (`<id> - <size> (<device>)`).
+
+- Pool/share name validation parity is close but not exact:
+  - Onboarding enforces regex, share-name collision, and existing cache pool-name collision.
+  - Full webgui reserved-name and collision checks are not fully mirrored yet.
+
+- Dialog auto-open via URL flag:
+  - Webgui supports `?createbootpool`.
+  - Onboarding step does not support URL-triggered auto-open.
+
+- Reboot flow:
+  - Webgui dialog path is "Activate and Reboot" in one flow.
+  - Onboarding applies `mkbootpool` without reboot in summary, then exposes reboot as a separate next-step action.
+
+- Existing internal-boot detection for step visibility:
+  - Webgui has direct page-level context for its own surfaces.
+  - Onboarding currently gates by user type and setup context, but does not yet hide the step based on "already on internal boot" detection.
diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index 9e53139f73..3495d0fc70 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -2,21 +2,38 @@ import gql from 'graphql-tag';
 
 export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
   query GetInternalBootContext {
-    onboardingInternalBoot {
+    array {
+      state
+      boot {
+        device
+      }
+      parities {
+        device
+      }
+      disks {
+        device
+      }
+      caches {
+        name
+        device
+      }
+    }
+    vars {
       fsState
       bootEligible
-      reservedNames
-      shareNames
-      poolNames
-      defaultPoolName
-      maxSlots
-      bootSizePresetsMiB
-      defaultBootSizeMiB
-      deviceOptions {
-        value
-        label
-        sizeMiB
-      }
+    }
+    shares {
+      name
+    }
+    disks {
+      id
+      device
+      serialNum
+      size
+      interfaceType
+      emhttpDeviceId
+      sectors
+      sectorSize
     }
   }
 `;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 14e630e97b..1201a385ea 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -27,44 +27,108 @@ const draftStore = useOnboardingDraftStore();
 interface InternalBootDeviceOption {
   value: string;
   label: string;
-  sizeMiB: number;
+  sizeMiB: number | null;
 }
 
 interface InternalBootTemplateData {
-  fsState: string | null;
   isBootPoolEligible: boolean;
-  reservedNames: string[];
-  shareNames: string[];
-  poolNames: string[];
   poolNameDefault: string;
   slotOptions: number[];
   deviceOptions: InternalBootDeviceOption[];
   bootSizePresetsMiB: number[];
   defaultBootSizeMiB: number;
   defaultUpdateBios: boolean;
+  shareNames: string[];
+  poolNames: string[];
 }
 
 interface InternalBootContext {
-  onboardingInternalBoot?: {
-    fsState?: string | null;
-    bootEligible?: boolean | null;
-    reservedNames?: string[] | null;
-    shareNames?: string[] | null;
-    poolNames?: string[] | null;
-    defaultPoolName?: string | null;
-    maxSlots?: number | null;
-    bootSizePresetsMiB?: number[] | null;
-    defaultBootSizeMiB?: number | null;
-    deviceOptions?:
-      | {
-          value?: string | null;
-          label?: string | null;
-          sizeMiB?: number | null;
-        }[]
-      | null;
-  } | null;
+  array: {
+    state?: string | null;
+    boot?: { device?: string | null } | null;
+    parities: { device?: string | null }[];
+    disks: { device?: string | null }[];
+    caches: { name?: string | null; device?: string | null }[];
+  };
+  vars?: { fsState?: string | null; bootEligible?: boolean | null } | null;
+  shares: { name?: string | null }[];
+  disks: {
+    id: string;
+    device: string;
+    serialNum: string;
+    size: number;
+    interfaceType: string;
+    emhttpDeviceId?: string | null;
+    sectors?: number | null;
+    sectorSize?: number | null;
+  }[];
 }
 
+const DEFAULT_BOOT_SIZE_MIB = 16384;
+const BOOT_SIZE_PRESETS_MIB = [16384, 32768, 65536, 131072];
+
+const formatBytes = (bytes: number) => {
+  if (!Number.isFinite(bytes) || bytes <= 0) {
+    return 'Unknown';
+  }
+
+  const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+  let value = bytes;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex += 1;
+  }
+
+  const precision = value >= 100 || unitIndex === 0 ? 0 : 1;
+  return `${value.toFixed(precision)} ${units[unitIndex]}`;
+};
+
+const toSizeMiB = (bytes: number): number | null => {
+  if (!Number.isFinite(bytes) || bytes <= 0) {
+    return null;
+  }
+  return Math.floor(bytes / 1024 / 1024);
+};
+
+const normalizeDeviceName = (value: string | null | undefined): string => {
+  if (!value) {
+    return '';
+  }
+  const trimmed = value.trim();
+  if (trimmed.startsWith('/dev/')) {
+    return trimmed.slice('/dev/'.length);
+  }
+  return trimmed;
+};
+
+const normalizePoolName = (value: string | null | undefined): string => {
+  if (!value) {
+    return '';
+  }
+  return value.replace(/~.*$/, '').replace(/\d+$/, '').trim();
+};
+
+const isDiskShareName = (name: string) => /^disk\d+$/i.test(name) || name.toLowerCase() === 'disk';
+
+const deriveDeviceSizeBytes = (
+  sectors: number | null | undefined,
+  sectorSize: number | null | undefined,
+  fallbackSize: number
+) => {
+  if (
+    typeof sectors === 'number' &&
+    Number.isFinite(sectors) &&
+    sectors > 0 &&
+    typeof sectorSize === 'number' &&
+    Number.isFinite(sectorSize) &&
+    sectorSize > 0
+  ) {
+    return sectors * sectorSize;
+  }
+  return fallbackSize;
+};
+
 const {
   result: contextResult,
   loading: contextLoading,
@@ -85,62 +149,93 @@ const updateBios = ref(true);
 
 const templateData = computed<InternalBootTemplateData | null>(() => {
   const data = contextResult.value as InternalBootContext | null;
-  const context = data?.onboardingInternalBoot;
-  if (!context) {
+  if (!data) {
     return null;
   }
 
-  const maxSlots =
-    typeof context.maxSlots === 'number' && Number.isFinite(context.maxSlots) && context.maxSlots > 0
-      ? Math.floor(context.maxSlots)
-      : 2;
-  const slotOptions = Array.from({ length: maxSlots }, (_, index) => index + 1);
+  const assignedDevices = new Set<string>();
+  const assignedDiskGroups = [
+    data.array.boot ? [data.array.boot] : [],
+    data.array.parities,
+    data.array.disks,
+    data.array.caches,
+  ];
+
+  for (const group of assignedDiskGroups) {
+    for (const disk of group) {
+      const device = normalizeDeviceName(disk.device);
+      if (device) {
+        assignedDevices.add(device);
+      }
+    }
+  }
+
+  const deviceOptions = data.disks
+    .filter((disk) => {
+      const device = normalizeDeviceName(disk.device);
+      if (!device) {
+        return false;
+      }
+      if (assignedDevices.has(device)) {
+        return false;
+      }
+      return true;
+    })
+    .map<InternalBootDeviceOption>((disk) => {
+      const device = normalizeDeviceName(disk.device);
+      const optionValue =
+        disk.id.trim() || disk.emhttpDeviceId?.trim() || disk.serialNum.trim() || device;
+      const sizeBytes = deriveDeviceSizeBytes(disk.sectors, disk.sectorSize, disk.size);
+      const sizeMiB = toSizeMiB(sizeBytes);
+      const sizeLabel = formatBytes(sizeBytes);
+      return {
+        value: optionValue,
+        label: `${optionValue} - ${sizeLabel} (${device})`,
+        sizeMiB,
+      };
+    });
+
+  const poolNameSet = new Set<string>();
+  for (const cacheDisk of data.array.caches) {
+    const normalized = normalizePoolName(cacheDisk.name);
+    if (normalized) {
+      poolNameSet.add(normalized);
+    }
+  }
 
-  const deviceOptions: InternalBootDeviceOption[] = [];
-  const seenValues = new Set<string>();
-  for (const option of context.deviceOptions ?? []) {
-    const value = option.value?.trim() || '';
-    const label = option.label?.trim() || '';
-    if (!value || !label || seenValues.has(value)) {
+  const shareNameSet = new Set<string>();
+  for (const share of data.shares) {
+    const name = share.name?.trim() || '';
+    if (!name || isDiskShareName(name)) {
       continue;
     }
-    seenValues.add(value);
-    const sizeMiB =
-      typeof option.sizeMiB === 'number' && Number.isFinite(option.sizeMiB) && option.sizeMiB > 0
-        ? Math.floor(option.sizeMiB)
-        : 0;
-    deviceOptions.push({ value, label, sizeMiB });
+    shareNameSet.add(name);
   }
 
   return {
-    fsState: context.fsState ?? null,
-    isBootPoolEligible: Boolean(context.bootEligible),
-    reservedNames: context.reservedNames?.filter((name) => typeof name === 'string') ?? [],
-    shareNames: context.shareNames?.filter((name) => typeof name === 'string') ?? [],
-    poolNames: context.poolNames?.filter((name) => typeof name === 'string') ?? [],
-    poolNameDefault: context.defaultPoolName ?? '',
-    slotOptions,
+    isBootPoolEligible: Boolean(data.vars?.bootEligible),
+    poolNameDefault: poolNameSet.size === 0 ? 'cache' : '',
+    slotOptions: [1, 2],
     deviceOptions,
-    bootSizePresetsMiB:
-      context.bootSizePresetsMiB?.filter((size) => Number.isFinite(size) && size > 0) ?? [],
-    defaultBootSizeMiB:
-      typeof context.defaultBootSizeMiB === 'number' &&
-      Number.isFinite(context.defaultBootSizeMiB) &&
-      context.defaultBootSizeMiB > 0
-        ? Math.floor(context.defaultBootSizeMiB)
-        : 16384,
+    bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
+    defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
     defaultUpdateBios: true,
+    shareNames: Array.from(shareNameSet),
+    poolNames: Array.from(poolNameSet),
   };
 });
 
 const isLoading = computed(() => Boolean(contextLoading.value));
 const isBusy = computed(() => Boolean(props.isSavingStep) || isLoading.value);
-const isArrayStopped = computed(() => templateData.value?.fsState === 'Stopped');
+const isArrayStopped = computed(() => {
+  if (contextResult.value?.array.state) {
+    return contextResult.value.array.state === 'STOPPED';
+  }
+  return contextResult.value?.vars?.fsState === 'Stopped';
+});
 const isBootPoolEligible = computed(() => Boolean(templateData.value?.isBootPoolEligible));
 const deviceOptions = computed(() => templateData.value?.deviceOptions ?? []);
 const slotOptions = computed(() => templateData.value?.slotOptions ?? [1, 2]);
-const maxSlots = computed(() => slotOptions.value[slotOptions.value.length - 1] ?? 2);
-const reservedPoolNames = computed(() => new Set(templateData.value?.reservedNames ?? []));
 const shareNames = computed(() => new Set(templateData.value?.shareNames ?? []));
 const existingPoolNames = computed(() => new Set(templateData.value?.poolNames ?? []));
 
@@ -152,9 +247,6 @@ const loadStatusMessage = computed(() => {
   if (contextError.value) {
     return 'Unable to load internal boot options from API.';
   }
-  if (!templateData.value) {
-    return 'Unable to load internal boot options.';
-  }
   if (!isArrayStopped.value) {
     return 'Internal boot setup is only available while the array is stopped.';
   }
@@ -170,7 +262,7 @@ const loadStatusMessage = computed(() => {
 const deviceSizeById = computed(() => {
   const entries = new Map<string, number>();
   for (const option of deviceOptions.value) {
-    if (option.sizeMiB > 0) {
+    if (option.sizeMiB !== null) {
       entries.set(option.value, option.sizeMiB);
     }
   }
@@ -272,18 +364,6 @@ const applyBootSizeSelection = (valueMiB: number) => {
   customBootSizeGb.value = String(sizeGb);
 };
 
-watch(
-  [slotOptions],
-  () => {
-    const minSlot = slotOptions.value[0] ?? 1;
-    const nextValue = Math.max(minSlot, Math.min(maxSlots.value, slotCount.value));
-    if (nextValue !== slotCount.value) {
-      slotCount.value = nextValue;
-    }
-  },
-  { immediate: true }
-);
-
 watch(
   slotCount,
   (value) => {
@@ -349,11 +429,6 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
-  if (reservedPoolNames.value.has(normalizedPoolName)) {
-    formError.value = 'Do not use reserved names.';
-    return null;
-  }
-
   if (shareNames.value.has(normalizedPoolName)) {
     formError.value = 'Do not use user share names.';
     return null;
@@ -364,8 +439,8 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
-  if (slotCount.value < 1 || slotCount.value > maxSlots.value) {
-    formError.value = `Select between 1 and ${maxSlots.value} slots.`;
+  if (slotCount.value < 1 || slotCount.value > 2) {
+    formError.value = 'Select 1 or 2 slots.';
     return null;
   }
 
@@ -407,7 +482,7 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
 const initializeForm = (data: InternalBootTemplateData) => {
   const draftSelection = draftStore.internalBootSelection;
   const firstSlot = data.slotOptions[0] ?? 1;
-  const defaultSlot = Math.max(1, Math.min(maxSlots.value, firstSlot));
+  const defaultSlot = Math.max(1, Math.min(2, firstSlot));
 
   poolName.value = draftSelection?.poolName || data.poolNameDefault || 'cache';
   slotCount.value = draftSelection?.slotCount ?? defaultSlot;
@@ -440,7 +515,7 @@ watch(
     }
 
     poolName.value = selection.poolName;
-    slotCount.value = Math.max(1, Math.min(maxSlots.value, selection.slotCount));
+    slotCount.value = selection.slotCount;
     selectedDevices.value = [...selection.devices];
     normalizeSelectedDevices(slotCount.value);
     updateBios.value = selection.updateBios;
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index e39af52349..86b7ff66cb 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -73,7 +73,7 @@ type Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": typeof types.InstalledUnraidPluginsDocument,
@@ -156,7 +156,7 @@ const documents: Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": types.InstalledUnraidPluginsDocument,
@@ -433,7 +433,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    onboardingInternalBoot {\n      fsState\n      bootEligible\n      reservedNames\n      shareNames\n      poolNames\n      defaultPoolName\n      maxSlots\n      bootSizePresetsMiB\n      defaultBootSizeMiB\n      deviceOptions {\n        value\n        label\n        sizeMiB\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 10f87d32ab..3ab607ddc7 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -1969,27 +1969,6 @@ export type Onboarding = {
   status: OnboardingStatus;
 };
 
-export type OnboardingInternalBootContext = {
-  __typename?: 'OnboardingInternalBootContext';
-  bootEligible: Scalars['Boolean']['output'];
-  bootSizePresetsMiB: Array<Scalars['Int']['output']>;
-  defaultBootSizeMiB: Scalars['Int']['output'];
-  defaultPoolName: Scalars['String']['output'];
-  deviceOptions: Array<OnboardingInternalBootDeviceOption>;
-  fsState?: Maybe<Scalars['String']['output']>;
-  maxSlots: Scalars['Int']['output'];
-  poolNames: Array<Scalars['String']['output']>;
-  reservedNames: Array<Scalars['String']['output']>;
-  shareNames: Array<Scalars['String']['output']>;
-};
-
-export type OnboardingInternalBootDeviceOption = {
-  __typename?: 'OnboardingInternalBootDeviceOption';
-  label: Scalars['String']['output'];
-  sizeMiB: Scalars['Int']['output'];
-  value: Scalars['String']['output'];
-};
-
 /** Onboarding related mutations */
 export type OnboardingMutations = {
   __typename?: 'OnboardingMutations';
@@ -2295,7 +2274,6 @@ export type Query = {
   oidcProvider?: Maybe<OidcProvider>;
   /** Get all configured OIDC providers (admin only) */
   oidcProviders: Array<OidcProvider>;
-  onboardingInternalBoot: OnboardingInternalBootContext;
   online: Scalars['Boolean']['output'];
   owner: Owner;
   parityHistory: Array<ParityCheck>;
@@ -3889,7 +3867,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', onboardingInternalBoot: { __typename?: 'OnboardingInternalBootContext', fsState?: string | null, bootEligible: boolean, reservedNames: Array<string>, shareNames: Array<string>, poolNames: Array<string>, defaultPoolName: string, maxSlots: number, bootSizePresetsMiB: Array<number>, defaultBootSizeMiB: number, deviceOptions: Array<{ __typename?: 'OnboardingInternalBootDeviceOption', value: string, label: string, sizeMiB: number }> } };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType, emhttpDeviceId?: string | null, sectors?: number | null, sectorSize?: number | null }> };
 
 export type InstallLanguageMutationVariables = Exact<{
   input: InstallPluginInput;
@@ -4074,7 +4052,7 @@ export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboardingInternalBoot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}},{"kind":"Field","name":{"kind":"Name","value":"shareNames"}},{"kind":"Field","name":{"kind":"Name","value":"poolNames"}},{"kind":"Field","name":{"kind":"Name","value":"defaultPoolName"}},{"kind":"Field","name":{"kind":"Name","value":"maxSlots"}},{"kind":"Field","name":{"kind":"Name","value":"bootSizePresetsMiB"}},{"kind":"Field","name":{"kind":"Name","value":"defaultBootSizeMiB"}},{"kind":"Field","name":{"kind":"Name","value":"deviceOptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"sizeMiB"}}]}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","name":{"kind":"Name","value":"sectors"}},{"kind":"Field","name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;
 export const InstalledUnraidPluginsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InstalledUnraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installedUnraidPlugins"}}]}}]} as unknown as DocumentNode<InstalledUnraidPluginsQuery, InstalledUnraidPluginsQueryVariables>;

From bdccaca6f09b840b9e43898453912aa80b32086f Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 16:01:24 -0500
Subject: [PATCH 13/53] feat(api): expose internal-boot vars for onboarding
 parity

- Purpose: surface the same var.ini signals webgui uses so onboarding can match visibility and validation behavior without new endpoints.
- Before: GraphQL vars did not expose enableBootTransfer or reservedNames, so web had to infer/hardcode parts of webgui logic.
- Problem: onboarding could not reliably hide the step when already booting internally and could not run reserved-name validation parity.
- Change: added enableBootTransfer and reservedNames to Vars GraphQL model, state types/parser typing, generated schema, and API generated GraphQL types.
- How it works: clients can now read vars.enableBootTransfer and vars.reservedNames directly from the existing vars query.
---
 api/generated-schema.graphql                          | 2 ++
 api/src/core/types/states/var.ts                      | 4 ++++
 api/src/store/state-parsers/var.ts                    | 2 ++
 api/src/unraid-api/cli/generated/graphql.ts           | 2 ++
 api/src/unraid-api/graph/resolvers/vars/vars.model.ts | 6 ++++++
 5 files changed, 16 insertions(+)

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 8c57e0ae0c..8e0e93f311 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -590,6 +590,8 @@ type Vars implements Node {
   cacheSbNumDisks: Int
   fsState: String
   bootEligible: Boolean
+  enableBootTransfer: String
+  reservedNames: String
 
   """Human friendly string of array events happening"""
   fsProgress: String
diff --git a/api/src/core/types/states/var.ts b/api/src/core/types/states/var.ts
index db411b5f80..2245f78c34 100644
--- a/api/src/core/types/states/var.ts
+++ b/api/src/core/types/states/var.ts
@@ -41,6 +41,10 @@ export type Var = {
     fsState: string;
     /** Whether this system is eligible to create a bootable pool. */
     bootEligible: boolean;
+    /** Whether boot transfer from flash to internal is enabled ("yes" means currently booted from flash). */
+    enableBootTransfer?: string;
+    /** Comma-separated list of reserved names from var.ini. */
+    reservedNames?: string;
     fsUnmountableMask: string;
     fuseDirectio: string;
     fuseDirectioDefault: string;
diff --git a/api/src/store/state-parsers/var.ts b/api/src/store/state-parsers/var.ts
index 295c2bd776..140569d71e 100644
--- a/api/src/store/state-parsers/var.ts
+++ b/api/src/store/state-parsers/var.ts
@@ -45,6 +45,8 @@ export type VarIni = {
     fsProgress: string;
     fsState: string;
     bootEligible: string;
+    enableBootTransfer?: string;
+    reservedNames?: string;
     fsUnmountableMask: string;
     fuseDirectio: string;
     fuseDirectioDefault: string;
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index a6a0c6f3fd..469b73e6e1 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -3194,6 +3194,7 @@ export type Vars = Node & {
   domain?: Maybe<Scalars['String']['output']>;
   domainLogin?: Maybe<Scalars['String']['output']>;
   domainShort?: Maybe<Scalars['String']['output']>;
+  enableBootTransfer?: Maybe<Scalars['String']['output']>;
   enableFruit?: Maybe<Scalars['String']['output']>;
   flashGuid?: Maybe<Scalars['String']['output']>;
   flashProduct?: Maybe<Scalars['String']['output']>;
@@ -3281,6 +3282,7 @@ export type Vars = Node & {
   /** Registration owner */
   regTo?: Maybe<Scalars['String']['output']>;
   regTy?: Maybe<RegistrationType>;
+  reservedNames?: Maybe<Scalars['String']['output']>;
   safeMode?: Maybe<Scalars['Boolean']['output']>;
   sbClean?: Maybe<Scalars['Boolean']['output']>;
   sbEvents?: Maybe<Scalars['Int']['output']>;
diff --git a/api/src/unraid-api/graph/resolvers/vars/vars.model.ts b/api/src/unraid-api/graph/resolvers/vars/vars.model.ts
index 65a44b4bd6..1097db4f15 100644
--- a/api/src/unraid-api/graph/resolvers/vars/vars.model.ts
+++ b/api/src/unraid-api/graph/resolvers/vars/vars.model.ts
@@ -431,6 +431,12 @@ export class Vars extends Node {
     @Field({ nullable: true })
     bootEligible?: boolean;
 
+    @Field({ nullable: true })
+    enableBootTransfer?: string;
+
+    @Field({ nullable: true })
+    reservedNames?: string;
+
     @Field({ nullable: true, description: 'Human friendly string of array events happening' })
     fsProgress?: string;
 

From 9e1cf0fab9acc162813bee257289b3edaa8ef274 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 16:01:48 -0500
Subject: [PATCH 14/53] feat(web): hide internal-boot step on internal installs

- Purpose: match webgui behavior for internal-boot onboarding visibility and pool-name validation.
- Before: internal-boot step still appeared when already booting internally, and validation did not include reservedNames parity checks.
- Problem: users on internal boot saw an unnecessary step and validation could diverge from CacheDevices.page constraints.
- Change: added lightweight step-visibility query in onboarding modal using vars.enableBootTransfer, expanded internal-boot context query to include vars.reservedNames/enableBootTransfer, and aligned validation ordering/checks with webgui (reserved names, shares, pools, regex).
- How it works: step is filtered out when enableBootTransfer is no; onboarding validates pool names against the same var/share/pool sources and ordering used by webgui logic.
- Tracking: updated the internal-boot port differences document to remove resolved parity gaps and keep remaining deltas explicit.
---
 ...boarding-internal-boot-port-differences.md | 10 +--
 .../Onboarding/OnboardingModal.test.ts        | 32 ++++++++++
 .../components/Onboarding/OnboardingModal.vue | 23 ++++++-
 .../graphql/getInternalBootContext.query.ts   |  2 +
 .../getInternalBootStepVisibility.query.ts    |  9 +++
 .../steps/OnboardingInternalBootStep.vue      | 63 ++++++++++++-------
 web/src/composables/gql/gql.ts                | 12 +++-
 web/src/composables/gql/graphql.ts            | 12 +++-
 8 files changed, 128 insertions(+), 35 deletions(-)
 create mode 100644 web/src/components/Onboarding/graphql/getInternalBootStepVisibility.query.ts

diff --git a/docs/onboarding-internal-boot-port-differences.md b/docs/onboarding-internal-boot-port-differences.md
index 435a548579..4aa778d171 100644
--- a/docs/onboarding-internal-boot-port-differences.md
+++ b/docs/onboarding-internal-boot-port-differences.md
@@ -12,10 +12,6 @@ This list tracks behavior that is intentionally or currently different from the
   - Webgui formats labels via PHP helpers.
   - Onboarding formats labels in Vue (`<id> - <size> (<device>)`).
 
-- Pool/share name validation parity is close but not exact:
-  - Onboarding enforces regex, share-name collision, and existing cache pool-name collision.
-  - Full webgui reserved-name and collision checks are not fully mirrored yet.
-
 - Dialog auto-open via URL flag:
   - Webgui supports `?createbootpool`.
   - Onboarding step does not support URL-triggered auto-open.
@@ -24,6 +20,6 @@ This list tracks behavior that is intentionally or currently different from the
   - Webgui dialog path is "Activate and Reboot" in one flow.
   - Onboarding applies `mkbootpool` without reboot in summary, then exposes reboot as a separate next-step action.
 
-- Existing internal-boot detection for step visibility:
-  - Webgui has direct page-level context for its own surfaces.
-  - Onboarding currently gates by user type and setup context, but does not yet hide the step based on "already on internal boot" detection.
+- Internal-boot visibility source:
+  - Onboarding hides the step using `vars.enableBootTransfer` (`no` means already internal boot).
+  - This matches `var.ini` semantics, but is still API-driven rather than websocket-rendered page context.
diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index d057c79a19..4c55e07ba5 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -8,6 +8,7 @@ import { createTestI18n } from '../../utils/i18n';
 
 const {
   mutateMock,
+  internalBootVisibilityResult,
   activationCodeModalStore,
   activationCodeDataStore,
   upgradeOnboardingStore,
@@ -18,6 +19,13 @@ const {
   cleanupOnboardingStorageMock,
 } = vi.hoisted(() => ({
   mutateMock: vi.fn().mockResolvedValue(undefined),
+  internalBootVisibilityResult: {
+    value: {
+      vars: {
+        enableBootTransfer: 'yes',
+      },
+    },
+  },
   activationCodeModalStore: {
     isVisible: { value: true },
     isTemporarilyBypassed: { value: false },
@@ -82,6 +90,11 @@ vi.mock('@heroicons/vue/24/solid', () => ({
 }));
 
 vi.mock('@vue/apollo-composable', () => ({
+  useQuery: () => ({
+    result: internalBootVisibilityResult,
+    loading: { value: false },
+    error: { value: null },
+  }),
   useMutation: () => ({
     mutate: mutateMock,
   }),
@@ -153,6 +166,11 @@ describe('OnboardingModal.vue', () => {
     upgradeOnboardingStore.canDisplayOnboardingModal.value = true;
     upgradeOnboardingStore.isPartnerBuild.value = false;
     onboardingDraftStore.currentStepIndex.value = 0;
+    internalBootVisibilityResult.value = {
+      vars: {
+        enableBootTransfer: 'yes',
+      },
+    };
 
     Object.defineProperty(window, 'location', {
       writable: true,
@@ -273,6 +291,20 @@ describe('OnboardingModal.vue', () => {
     expect(wrapper.find('[data-testid="plugins-step"]').exists()).toBe(true);
   });
 
+  it('hides internal boot step when already booting internally', () => {
+    internalBootVisibilityResult.value = {
+      vars: {
+        enableBootTransfer: 'no',
+      },
+    };
+    onboardingDraftStore.currentStepIndex.value = 2;
+
+    const wrapper = mountComponent();
+
+    expect(wrapper.find('[data-testid="internal-boot-step"]').exists()).toBe(false);
+    expect(wrapper.find('[data-testid="plugins-step"]').exists()).toBe(true);
+  });
+
   it('opens exit confirmation when close button is clicked', async () => {
     const wrapper = mountComponent();
 
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 1b81cb3eab..07487c3d73 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -2,11 +2,12 @@
 import { computed, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
-import { useMutation } from '@vue/apollo-composable';
+import { useMutation, useQuery } from '@vue/apollo-composable';
 
 import { ArrowTopRightOnSquareIcon, XMarkIcon } from '@heroicons/vue/24/solid';
 import { Dialog } from '@unraid/ui';
 import { COMPLETE_ONBOARDING_MUTATION } from '@/components/Onboarding/graphql/completeUpgradeStep.mutation';
+import { GET_INTERNAL_BOOT_STEP_VISIBILITY_QUERY } from '@/components/Onboarding/graphql/getInternalBootStepVisibility.query';
 import { DOCS_URL_ACCOUNT, DOCS_URL_LICENSING_FAQ } from '~/consts';
 
 import type { BrandButtonProps } from '@unraid/ui';
@@ -89,10 +90,28 @@ const showActivationStep = computed(() => {
   return hasCode && ACTIVATION_STEP_REGISTRATION_STATES.has(regState);
 });
 
+const { result: internalBootVisibilityResult } = useQuery(
+  GET_INTERNAL_BOOT_STEP_VISIBILITY_QUERY,
+  null,
+  {
+    fetchPolicy: 'cache-first',
+  }
+);
+
+const hideInternalBootStep = computed(() => {
+  const setting = internalBootVisibilityResult.value?.vars?.enableBootTransfer?.trim().toLowerCase();
+  return setting === 'no';
+});
+
 // Determine which steps to show based on user state
 const visibleHardcodedSteps = computed(() =>
   HARDCODED_STEPS.filter((step) => showActivationStep.value || step.id !== 'ACTIVATE_LICENSE').filter(
-    (step) => !isPartnerBuild.value || step.id !== 'INTERNAL_BOOT'
+    (step) => {
+      if (step.id !== 'INTERNAL_BOOT') {
+        return true;
+      }
+      return !isPartnerBuild.value && !hideInternalBootStep.value;
+    }
   )
 );
 const availableSteps = computed<StepId[]>(() => visibleHardcodedSteps.value.map((step) => step.id));
diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index 3495d0fc70..73a22096be 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -21,6 +21,8 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
     vars {
       fsState
       bootEligible
+      enableBootTransfer
+      reservedNames
     }
     shares {
       name
diff --git a/web/src/components/Onboarding/graphql/getInternalBootStepVisibility.query.ts b/web/src/components/Onboarding/graphql/getInternalBootStepVisibility.query.ts
new file mode 100644
index 0000000000..b826ebed99
--- /dev/null
+++ b/web/src/components/Onboarding/graphql/getInternalBootStepVisibility.query.ts
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag';
+
+export const GET_INTERNAL_BOOT_STEP_VISIBILITY_QUERY = gql`
+  query GetInternalBootStepVisibility {
+    vars {
+      enableBootTransfer
+    }
+  }
+`;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 1201a385ea..335589ea75 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -38,6 +38,7 @@ interface InternalBootTemplateData {
   bootSizePresetsMiB: number[];
   defaultBootSizeMiB: number;
   defaultUpdateBios: boolean;
+  reservedNames: string[];
   shareNames: string[];
   poolNames: string[];
 }
@@ -50,7 +51,12 @@ interface InternalBootContext {
     disks: { device?: string | null }[];
     caches: { name?: string | null; device?: string | null }[];
   };
-  vars?: { fsState?: string | null; bootEligible?: boolean | null } | null;
+  vars?: {
+    fsState?: string | null;
+    bootEligible?: boolean | null;
+    enableBootTransfer?: string | null;
+    reservedNames?: string | null;
+  } | null;
   shares: { name?: string | null }[];
   disks: {
     id: string;
@@ -102,15 +108,6 @@ const normalizeDeviceName = (value: string | null | undefined): string => {
   return trimmed;
 };
 
-const normalizePoolName = (value: string | null | undefined): string => {
-  if (!value) {
-    return '';
-  }
-  return value.replace(/~.*$/, '').replace(/\d+$/, '').trim();
-};
-
-const isDiskShareName = (name: string) => /^disk\d+$/i.test(name) || name.toLowerCase() === 'disk';
-
 const deriveDeviceSizeBytes = (
   sectors: number | null | undefined,
   sectorSize: number | null | undefined,
@@ -197,19 +194,26 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
 
   const poolNameSet = new Set<string>();
   for (const cacheDisk of data.array.caches) {
-    const normalized = normalizePoolName(cacheDisk.name);
-    if (normalized) {
-      poolNameSet.add(normalized);
+    const poolName = cacheDisk.name?.trim() || '';
+    if (poolName) {
+      poolNameSet.add(poolName);
+    }
+  }
+
+  const reservedNameSet = new Set<string>();
+  for (const reservedName of (data.vars?.reservedNames ?? '').split(',')) {
+    const name = reservedName.trim();
+    if (name) {
+      reservedNameSet.add(name);
     }
   }
 
   const shareNameSet = new Set<string>();
   for (const share of data.shares) {
     const name = share.name?.trim() || '';
-    if (!name || isDiskShareName(name)) {
-      continue;
+    if (name) {
+      shareNameSet.add(name);
     }
-    shareNameSet.add(name);
   }
 
   return {
@@ -220,6 +224,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
     bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
     defaultBootSizeMiB: DEFAULT_BOOT_SIZE_MIB,
     defaultUpdateBios: true,
+    reservedNames: Array.from(reservedNameSet),
     shareNames: Array.from(shareNameSet),
     poolNames: Array.from(poolNameSet),
   };
@@ -233,20 +238,32 @@ const isArrayStopped = computed(() => {
   }
   return contextResult.value?.vars?.fsState === 'Stopped';
 });
+const isAlreadyOnInternalBoot = computed(() => {
+  const setting = contextResult.value?.vars?.enableBootTransfer?.trim().toLowerCase();
+  return setting === 'no';
+});
 const isBootPoolEligible = computed(() => Boolean(templateData.value?.isBootPoolEligible));
 const deviceOptions = computed(() => templateData.value?.deviceOptions ?? []);
 const slotOptions = computed(() => templateData.value?.slotOptions ?? [1, 2]);
+const reservedNames = computed(() => new Set(templateData.value?.reservedNames ?? []));
 const shareNames = computed(() => new Set(templateData.value?.shareNames ?? []));
 const existingPoolNames = computed(() => new Set(templateData.value?.poolNames ?? []));
 
 const canConfigure = computed(
-  () => isArrayStopped.value && isBootPoolEligible.value && deviceOptions.value.length > 0
+  () =>
+    !isAlreadyOnInternalBoot.value &&
+    isArrayStopped.value &&
+    isBootPoolEligible.value &&
+    deviceOptions.value.length > 0
 );
 
 const loadStatusMessage = computed(() => {
   if (contextError.value) {
     return 'Unable to load internal boot options from API.';
   }
+  if (isAlreadyOnInternalBoot.value) {
+    return 'Internal boot is already configured on this server.';
+  }
   if (!isArrayStopped.value) {
     return 'Internal boot setup is only available while the array is stopped.';
   }
@@ -422,10 +439,8 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
-  const poolNamePattern = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
-  if (!poolNamePattern.test(normalizedPoolName)) {
-    formError.value =
-      'Pool name must start with a lowercase letter and contain only lowercase letters, numbers, and ~ . _ -.';
+  if (reservedNames.value.has(normalizedPoolName)) {
+    formError.value = 'Do not use reserved names.';
     return null;
   }
 
@@ -439,6 +454,12 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
+  const poolNamePattern = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
+  if (!poolNamePattern.test(normalizedPoolName)) {
+    formError.value = 'Use only lowercase with no special characters or leading/trailing digits.';
+    return null;
+  }
+
   if (slotCount.value < 1 || slotCount.value > 2) {
     formError.value = 'Select 1 or 2 slots.';
     return null;
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 86b7ff66cb..a8cefc45a0 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -73,7 +73,8 @@ type Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": typeof types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": typeof types.InstalledUnraidPluginsDocument,
@@ -156,7 +157,8 @@ const documents: Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
     "\n  query InstalledUnraidPlugins {\n    installedUnraidPlugins\n  }\n": types.InstalledUnraidPluginsDocument,
@@ -433,7 +435,11 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 3ab607ddc7..ff98f01466 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3194,6 +3194,7 @@ export type Vars = Node & {
   domain?: Maybe<Scalars['String']['output']>;
   domainLogin?: Maybe<Scalars['String']['output']>;
   domainShort?: Maybe<Scalars['String']['output']>;
+  enableBootTransfer?: Maybe<Scalars['String']['output']>;
   enableFruit?: Maybe<Scalars['String']['output']>;
   flashGuid?: Maybe<Scalars['String']['output']>;
   flashProduct?: Maybe<Scalars['String']['output']>;
@@ -3281,6 +3282,7 @@ export type Vars = Node & {
   /** Registration owner */
   regTo?: Maybe<Scalars['String']['output']>;
   regTy?: Maybe<RegistrationType>;
+  reservedNames?: Maybe<Scalars['String']['output']>;
   safeMode?: Maybe<Scalars['Boolean']['output']>;
   sbClean?: Maybe<Scalars['Boolean']['output']>;
   sbEvents?: Maybe<Scalars['Int']['output']>;
@@ -3867,7 +3869,12 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType, emhttpDeviceId?: string | null, sectors?: number | null, sectorSize?: number | null }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType, emhttpDeviceId?: string | null, sectors?: number | null, sectorSize?: number | null }> };
+
+export type GetInternalBootStepVisibilityQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type GetInternalBootStepVisibilityQuery = { __typename?: 'Query', vars: { __typename?: 'Vars', enableBootTransfer?: string | null } };
 
 export type InstallLanguageMutationVariables = Exact<{
   input: InstallPluginInput;
@@ -4052,7 +4059,8 @@ export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","name":{"kind":"Name","value":"sectors"}},{"kind":"Field","name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","name":{"kind":"Name","value":"sectors"}},{"kind":"Field","name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootStepVisibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootStepVisibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootStepVisibilityQuery, GetInternalBootStepVisibilityQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;
 export const InstalledUnraidPluginsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InstalledUnraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installedUnraidPlugins"}}]}}]} as unknown as DocumentNode<InstalledUnraidPluginsQuery, InstalledUnraidPluginsQueryVariables>;

From 7922857ee3762338e39e267c6aa5d7e7fce45fda Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 17:43:55 -0500
Subject: [PATCH 15/53] fix(web): send emhttp device ids to mkbootpool

- Purpose: make onboarding internal-boot submit the same device identifiers used by webgui.
- Before: dropdown option value preferred GraphQL disk.id, which includes server-prefixed IDs and did not match webgui mkbootpool args.
- Problem: mkbootpool requests could fail or behave unexpectedly because device args were not in emhttp devs.ini id format.
- Change: updated internal boot device option mapping to use emhttpDeviceId first, with device name fallback.
- How it works: submitted args[] now mirror webgui option values, improving compatibility with mkbootpool.php and downstream scripts.
---
 .../Onboarding/steps/OnboardingInternalBootStep.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 335589ea75..0bfc7f5abc 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -180,8 +180,8 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
     })
     .map<InternalBootDeviceOption>((disk) => {
       const device = normalizeDeviceName(disk.device);
-      const optionValue =
-        disk.id.trim() || disk.emhttpDeviceId?.trim() || disk.serialNum.trim() || device;
+      const emhttpDeviceId = disk.emhttpDeviceId?.trim() || '';
+      const optionValue = emhttpDeviceId || device;
       const sizeBytes = deriveDeviceSizeBytes(disk.sectors, disk.sectorSize, disk.size);
       const sizeMiB = toSizeMiB(sizeBytes);
       const sizeLabel = formatBytes(sizeBytes);

From d4408f8abe7a9fd0a1619392a76ace9275131fe6 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 18:49:29 -0500
Subject: [PATCH 16/53] fix(web-onboarding): harden mkbootpool response
 handling

- Purpose: make onboarding internal-boot apply robust when mkbootpool.php returns non-ideal payloads.
- Before: onboarding expected clean JSON and surfaced a generic failure when the response body was empty or noisy.
- Problem: users could see unhelpful failures even with HTTP 200, making server-side debugging difficult.
- Change: added tolerant response parsing (strict JSON first, then JSON substring fallback) and  parity with webgui ajax behavior.
- Change: when response body is empty, onboarding now attempts  and reports detailed HTTP diagnostics as fallback.
- Result: failures now return actionable output instead of opaque request-failed messages.
---
 .../Onboarding/composables/internalBoot.ts    | 77 ++++++++++++++++---
 1 file changed, 68 insertions(+), 9 deletions(-)

diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index 929bdea25b..cf88764e55 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -15,6 +15,12 @@ export interface InternalBootSubmitResult {
   output: string;
 }
 
+interface MkbootpoolResponsePayload {
+  ok?: boolean;
+  code?: number;
+  output?: string;
+}
+
 const buildInternalBootArgs = (
   selection: InternalBootSelection,
   options: SubmitInternalBootOptions
@@ -30,6 +36,46 @@ const buildInternalBootArgs = (
   return args;
 };
 
+const parseMkbootpoolPayload = (raw: string): MkbootpoolResponsePayload | null => {
+  const trimmed = raw.trim();
+  if (trimmed.length === 0) {
+    return null;
+  }
+
+  try {
+    return JSON.parse(trimmed) as MkbootpoolResponsePayload;
+  } catch {
+    const firstBrace = trimmed.indexOf('{');
+    const lastBrace = trimmed.lastIndexOf('}');
+    if (firstBrace === -1 || lastBrace <= firstBrace) {
+      return null;
+    }
+
+    try {
+      return JSON.parse(trimmed.slice(firstBrace, lastBrace + 1)) as MkbootpoolResponsePayload;
+    } catch {
+      return null;
+    }
+  }
+};
+
+const readInternalBootOutputLog = async (): Promise<string | null> => {
+  try {
+    const logResponse = await fetch('/boot/config/internal_boot/output.log', {
+      method: 'GET',
+      credentials: 'same-origin',
+      cache: 'no-store',
+    });
+    if (!logResponse.ok) {
+      return null;
+    }
+    const logBody = (await logResponse.text()).trim();
+    return logBody.length > 0 ? logBody : null;
+  } catch {
+    return null;
+  }
+};
+
 export const submitInternalBootCreation = async (
   selection: InternalBootSelection,
   options: SubmitInternalBootOptions = {}
@@ -45,29 +91,42 @@ export const submitInternalBootCreation = async (
     credentials: 'same-origin',
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+      'X-Requested-With': 'XMLHttpRequest',
     },
     body: payload.toString(),
   });
 
   const raw = await response.text();
+  const trimmedRaw = raw.trim();
+  const parsed = parseMkbootpoolPayload(raw);
 
-  try {
-    const parsed = JSON.parse(raw) as {
-      ok?: boolean;
-      code?: number;
-      output?: string;
-    };
+  if (parsed) {
+    const parsedOutput = parsed.output?.trim() ?? '';
     return {
       ok: Boolean(parsed.ok),
       code: parsed.code,
-      output: parsed.output ?? raw,
+      output: parsedOutput.length > 0 ? parsedOutput : trimmedRaw || 'No output',
     };
-  } catch {
+  }
+  if (trimmedRaw.length > 0) {
     return {
       ok: false,
-      output: raw || `mkbootpool request failed (${response.status})`,
+      output: trimmedRaw,
     };
   }
+
+  const logOutput = await readInternalBootOutputLog();
+  if (logOutput) {
+    return {
+      ok: false,
+      output: `mkbootpool returned an empty response (HTTP ${response.status}). Latest output.log:\n${logOutput}`,
+    };
+  }
+
+  return {
+    ok: false,
+    output: `mkbootpool returned an empty response (HTTP ${response.status}, redirected=${String(response.redirected)}, url=${response.url}, content-type=${response.headers.get('content-type') ?? 'unknown'})`,
+  };
 };
 
 export const submitInternalBootReboot = () => {

From dec09578f4fbdd07abad54f7415575f2a4c4c5c1 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 18:49:51 -0500
Subject: [PATCH 17/53] refactor(web-onboarding): trim internal boot disk
 payload

- Purpose: keep onboarding internal-boot context aligned with fields actually consumed by the UI.
- Before: the context query fetched extra disk fields that were not used by the onboarding step.
- Problem: unused fields increased payload and made emhttp-derived metadata origin less explicit.
- Change: removed unused disk fields from GetInternalBootContext and aliased emhttp-backed metadata to explicit names.
- Change: updated the internal-boot step to consume emhttpSectors and emhttpSectorSize while preserving emhttpDeviceId selection behavior.
- Change: regenerated GraphQL client artifacts for the updated query shape.
- Result: smaller query surface, clearer field provenance, and no behavior change in selection/size calculations.
---
 .../Onboarding/graphql/getInternalBootContext.query.ts   | 7 ++-----
 .../Onboarding/steps/OnboardingInternalBootStep.vue      | 9 +++------
 web/src/composables/gql/gql.ts                           | 6 +++---
 web/src/composables/gql/graphql.ts                       | 4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index 73a22096be..5a5fa7f4e5 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -28,14 +28,11 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
       name
     }
     disks {
-      id
       device
-      serialNum
       size
-      interfaceType
       emhttpDeviceId
-      sectors
-      sectorSize
+      emhttpSectors: sectors
+      emhttpSectorSize: sectorSize
     }
   }
 `;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 0bfc7f5abc..6b0aae5692 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -59,14 +59,11 @@ interface InternalBootContext {
   } | null;
   shares: { name?: string | null }[];
   disks: {
-    id: string;
     device: string;
-    serialNum: string;
     size: number;
-    interfaceType: string;
     emhttpDeviceId?: string | null;
-    sectors?: number | null;
-    sectorSize?: number | null;
+    emhttpSectors?: number | null;
+    emhttpSectorSize?: number | null;
   }[];
 }
 
@@ -182,7 +179,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
       const device = normalizeDeviceName(disk.device);
       const emhttpDeviceId = disk.emhttpDeviceId?.trim() || '';
       const optionValue = emhttpDeviceId || device;
-      const sizeBytes = deriveDeviceSizeBytes(disk.sectors, disk.sectorSize, disk.size);
+      const sizeBytes = deriveDeviceSizeBytes(disk.emhttpSectors, disk.emhttpSectorSize, disk.size);
       const sizeMiB = toSizeMiB(sizeBytes);
       const sizeLabel = formatBytes(sizeBytes);
       return {
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index a8cefc45a0..50ffdb0754 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -73,7 +73,7 @@ type Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": typeof types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
@@ -157,7 +157,7 @@ const documents: Documents = {
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
@@ -435,7 +435,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      id\n      device\n      serialNum\n      size\n      interfaceType\n      emhttpDeviceId\n      sectors\n      sectorSize\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index ff98f01466..8fd7f906a2 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3869,7 +3869,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', id: string, device: string, serialNum: string, size: number, interfaceType: DiskInterfaceType, emhttpDeviceId?: string | null, sectors?: number | null, sectorSize?: number | null }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null, emhttpSectors?: number | null, emhttpSectorSize?: number | null }> };
 
 export type GetInternalBootStepVisibilityQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -4059,7 +4059,7 @@ export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"serialNum"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"interfaceType"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","name":{"kind":"Name","value":"sectors"}},{"kind":"Field","name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","alias":{"kind":"Name","value":"emhttpSectors"},"name":{"kind":"Name","value":"sectors"}},{"kind":"Field","alias":{"kind":"Name","value":"emhttpSectorSize"},"name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const GetInternalBootStepVisibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootStepVisibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootStepVisibilityQuery, GetInternalBootStepVisibilityQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;

From f962f8a46493c9c3152ff3d3c2afb9009544b7cd Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 19:06:19 -0500
Subject: [PATCH 18/53] fix(web-onboarding): include csrf token in mkbootpool
 post

- Purpose: make onboarding internal-boot requests match webgui PHP post expectations.
- Before: onboarding posted args to mkbootpool.php without csrf_token and relied only on same-origin cookies.
- Problem: on systems enforcing CSRF checks, mkbootpool.php can return an empty HTTP 200 response instead of JSON output.
- Change: append csrf_token from global csrf_token into form payload and also send x-csrf-token header when available.
- Change: remove HTTP fetch fallback to /boot/config/internal_boot/output.log because that filesystem path is not generally web-served.
- Result: onboarding requests now follow existing webgui request conventions and avoid noisy 404 fallback probes.
---
 .../Onboarding/composables/internalBoot.ts    | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index cf88764e55..02d174e547 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -59,21 +59,13 @@ const parseMkbootpoolPayload = (raw: string): MkbootpoolResponsePayload | null =
   }
 };
 
-const readInternalBootOutputLog = async (): Promise<string | null> => {
-  try {
-    const logResponse = await fetch('/boot/config/internal_boot/output.log', {
-      method: 'GET',
-      credentials: 'same-origin',
-      cache: 'no-store',
-    });
-    if (!logResponse.ok) {
-      return null;
-    }
-    const logBody = (await logResponse.text()).trim();
-    return logBody.length > 0 ? logBody : null;
-  } catch {
+const readCsrfToken = (): string | null => {
+  const token = globalThis.csrf_token;
+  if (typeof token !== 'string') {
     return null;
   }
+  const trimmedToken = token.trim();
+  return trimmedToken.length > 0 ? trimmedToken : null;
 };
 
 export const submitInternalBootCreation = async (
@@ -85,6 +77,10 @@ export const submitInternalBootCreation = async (
   for (const arg of args) {
     payload.append('args[]', arg);
   }
+  const csrfToken = readCsrfToken();
+  if (csrfToken) {
+    payload.append('csrf_token', csrfToken);
+  }
 
   const response = await fetch('/plugins/dynamix/include/mkbootpool.php', {
     method: 'POST',
@@ -92,6 +88,7 @@ export const submitInternalBootCreation = async (
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
       'X-Requested-With': 'XMLHttpRequest',
+      ...(csrfToken ? { 'x-csrf-token': csrfToken } : {}),
     },
     body: payload.toString(),
   });
@@ -115,17 +112,9 @@ export const submitInternalBootCreation = async (
     };
   }
 
-  const logOutput = await readInternalBootOutputLog();
-  if (logOutput) {
-    return {
-      ok: false,
-      output: `mkbootpool returned an empty response (HTTP ${response.status}). Latest output.log:\n${logOutput}`,
-    };
-  }
-
   return {
     ok: false,
-    output: `mkbootpool returned an empty response (HTTP ${response.status}, redirected=${String(response.redirected)}, url=${response.url}, content-type=${response.headers.get('content-type') ?? 'unknown'})`,
+    output: `mkbootpool returned an empty response (HTTP ${response.status}, redirected=${String(response.redirected)}, url=${response.url}, content-type=${response.headers.get('content-type') ?? 'unknown'}). Check /boot/config/internal_boot/output.log via server shell for script output.`,
   };
 };
 

From 859e92524bb48a6d7f86864b7ab28f4b7d6c79f5 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 27 Feb 2026 19:29:51 -0500
Subject: [PATCH 19/53] fix(web-onboarding): streamline internal boot logs and
 reboot submit

- Purpose: align onboarding internal-boot logging with the rest of onboarding and make reboot submit path reliable.
- Before: successful internal-boot apply logged full script output into onboarding console, and reboot submit used a minimal form post that could land on Boot.php without executing expected reboot flow.
- Problem: extra success log noise reduced signal in onboarding logs, and reboot flow could appear inert in some contexts.
- Change: removed verbose success output logging from summary step; success now logs the same concise status style as other onboarding actions.
- Change: reboot submit now posts directly to /plugins/dynamix/include/Boot.php, targets _top, and includes csrf_token when available.
- Change: tightened empty mkbootpool-response message to concise guidance.
- Change: added composable tests for mkbootpool payload csrf inclusion and reboot form construction.
- Result: cleaner onboarding logs and a reboot action that follows webgui/php expectations more robustly.
---
 .../Onboarding/internalBoot.test.ts           | 87 +++++++++++++++++++
 .../Onboarding/composables/internalBoot.ts    | 16 +++-
 .../steps/OnboardingSummaryStep.vue           |  3 -
 3 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 web/__test__/components/Onboarding/internalBoot.test.ts

diff --git a/web/__test__/components/Onboarding/internalBoot.test.ts b/web/__test__/components/Onboarding/internalBoot.test.ts
new file mode 100644
index 0000000000..4e013fb128
--- /dev/null
+++ b/web/__test__/components/Onboarding/internalBoot.test.ts
@@ -0,0 +1,87 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  submitInternalBootCreation,
+  submitInternalBootReboot,
+} from '~/components/Onboarding/composables/internalBoot';
+
+describe('internalBoot composable', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    document.body.innerHTML = '';
+    globalThis.csrf_token = 'csrf-token-value';
+  });
+
+  it('includes csrf token and args when creating internal boot pool', async () => {
+    const fetchMock = vi.fn().mockResolvedValue({
+      text: vi.fn().mockResolvedValue(
+        JSON.stringify({
+          ok: true,
+          code: 0,
+          output: 'done',
+        })
+      ),
+      status: 200,
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    const result = await submitInternalBootCreation({
+      poolName: 'cache',
+      devices: ['disk-1'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    });
+
+    expect(result).toEqual({
+      ok: true,
+      code: 0,
+      output: 'done',
+    });
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock).toHaveBeenCalledWith(
+      '/plugins/dynamix/include/mkbootpool.php',
+      expect.objectContaining({
+        method: 'POST',
+        headers: expect.objectContaining({
+          'x-csrf-token': 'csrf-token-value',
+        }),
+      })
+    );
+
+    const options = fetchMock.mock.calls[0]?.[1];
+    expect(options).toBeDefined();
+    if (!options || typeof options !== 'object') {
+      return;
+    }
+
+    const body = (options as { body?: string }).body ?? '';
+    expect(body).toContain('args%5B%5D=cache');
+    expect(body).toContain('args%5B%5D=16384');
+    expect(body).toContain('args%5B%5D=disk-1');
+    expect(body).toContain('args%5B%5D=updatebios');
+    expect(body).toContain('args%5B%5D=update');
+    expect(body).toContain('csrf_token=csrf-token-value');
+  });
+
+  it('submits reboot form with cmd and csrf token', () => {
+    const submitSpy = vi.spyOn(HTMLFormElement.prototype, 'submit').mockImplementation(() => undefined);
+
+    submitInternalBootReboot();
+
+    expect(submitSpy).toHaveBeenCalledTimes(1);
+    const form = document.querySelector('form');
+    expect(form).toBeTruthy();
+    if (!form) {
+      return;
+    }
+
+    expect(form.method.toLowerCase()).toBe('post');
+    expect(form.target).toBe('_top');
+    expect(form.getAttribute('action')).toBe('/plugins/dynamix/include/Boot.php');
+
+    const cmd = form.querySelector('input[name="cmd"]') as HTMLInputElement | null;
+    expect(cmd?.value).toBe('reboot');
+    const csrf = form.querySelector('input[name="csrf_token"]') as HTMLInputElement | null;
+    expect(csrf?.value).toBe('csrf-token-value');
+  });
+});
diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index 02d174e547..b88572fcd2 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -114,15 +114,16 @@ export const submitInternalBootCreation = async (
 
   return {
     ok: false,
-    output: `mkbootpool returned an empty response (HTTP ${response.status}, redirected=${String(response.redirected)}, url=${response.url}, content-type=${response.headers.get('content-type') ?? 'unknown'}). Check /boot/config/internal_boot/output.log via server shell for script output.`,
+    output: `mkbootpool returned an empty response (HTTP ${response.status}). Check /boot/config/internal_boot/output.log via server shell for script output.`,
   };
 };
 
 export const submitInternalBootReboot = () => {
   const form = document.createElement('form');
   form.method = 'POST';
-  form.action = '/webGui/include/Boot.php';
-  form.className = 'hidden';
+  form.action = '/plugins/dynamix/include/Boot.php';
+  form.target = '_top';
+  form.style.display = 'none';
 
   const cmd = document.createElement('input');
   cmd.type = 'hidden';
@@ -130,6 +131,15 @@ export const submitInternalBootReboot = () => {
   cmd.value = 'reboot';
   form.appendChild(cmd);
 
+  const csrfToken = readCsrfToken();
+  if (csrfToken) {
+    const csrf = document.createElement('input');
+    csrf.type = 'hidden';
+    csrf.name = 'csrf_token';
+    csrf.value = csrfToken;
+    form.appendChild(csrf);
+  }
+
   document.body.appendChild(form);
   form.submit();
 };
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 51c89b67c3..3d3134c0b2 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -672,9 +672,6 @@ const handleComplete = async () => {
         if (result.ok) {
           draftStore.setInternalBootApplySucceeded(true);
           addLog('Internal boot pool configured.', 'success');
-          if (result.output.trim().length > 0) {
-            addLog(`Internal boot output:\n${result.output}`, 'info');
-          }
         } else {
           hadNonOptimisticFailures = true;
           hadWarnings = true;

From 0c7fd8dbdd73466bd6f0333027078cbea3ad4bef Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Tue, 3 Mar 2026 10:29:21 -0500
Subject: [PATCH 20/53] feat(onboarding): add boot mode selection to configure
 boot step

- Purpose: introduce an explicit onboarding boot mode choice so users can select USB boot or storage-drive boot before internal boot setup.
- Before: onboarding always presented internal-boot configuration as the main path and relied on skip behavior rather than an explicit boot mode.
- Problem: users could not clearly choose USB-first flow, and internal-boot controls were always visible regardless of boot preference.
- Change: added persisted bootMode state (usb/storage) to the onboarding draft store with legacy-safe normalization.
- Change: renamed step metadata/title to "Configure Boot" to match the new UX intent.
- Change: updated the step UI to show two radio options, default to USB flow, and only render internal-boot form controls when storage boot is selected.
- Behavior: Continue now advances directly for USB mode and validates/submits internal-boot config only for storage mode.
---
 web/src/components/Onboarding/stepRegistry.ts |  4 +-
 .../steps/OnboardingInternalBootStep.vue      | 84 +++++++++++++++----
 .../Onboarding/store/onboardingDraft.ts       | 36 +++++++-
 3 files changed, 107 insertions(+), 17 deletions(-)

diff --git a/web/src/components/Onboarding/stepRegistry.ts b/web/src/components/Onboarding/stepRegistry.ts
index ebc82a6040..3c575b96f6 100644
--- a/web/src/components/Onboarding/stepRegistry.ts
+++ b/web/src/components/Onboarding/stepRegistry.ts
@@ -36,8 +36,8 @@ export const stepMetadata: Record<string, StepMetadataEntry> = {
     icon: 'i-heroicons-cog-6-tooth',
   },
   INTERNAL_BOOT: {
-    titleKey: 'Internal Boot',
-    descriptionKey: 'Configure bootable pool',
+    titleKey: 'Configure Boot',
+    descriptionKey: 'Choose USB or storage drive boot',
     icon: 'i-heroicons-circle-stack',
   },
   ADD_PLUGINS: {
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 6b0aae5692..6bec972e75 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -9,7 +9,10 @@ import { BrandButton } from '@unraid/ui';
 import { GET_INTERNAL_BOOT_CONTEXT_QUERY } from '@/components/Onboarding/graphql/getInternalBootContext.query';
 import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
 
-import type { OnboardingInternalBootSelection } from '@/components/Onboarding/store/onboardingDraft';
+import type {
+  OnboardingBootMode,
+  OnboardingInternalBootSelection,
+} from '@/components/Onboarding/store/onboardingDraft';
 
 export interface Props {
   onComplete: () => void;
@@ -133,6 +136,9 @@ const {
 
 const formError = ref<string | null>(null);
 const hasInitializedForm = ref(false);
+const bootMode = ref<OnboardingBootMode>(
+  draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
+);
 
 const poolName = ref('cache');
 const slotCount = ref(1);
@@ -253,6 +259,7 @@ const canConfigure = computed(
     isBootPoolEligible.value &&
     deviceOptions.value.length > 0
 );
+const isStorageBootSelected = computed(() => bootMode.value === 'storage');
 
 const loadStatusMessage = computed(() => {
   if (contextError.value) {
@@ -417,11 +424,14 @@ watch(
   { immediate: true }
 );
 
-watch([poolName, slotCount, selectedDevices, bootSizePreset, customBootSizeGb, updateBios], () => {
-  if (formError.value) {
-    formError.value = null;
+watch(
+  [poolName, slotCount, selectedDevices, bootSizePreset, customBootSizeGb, updateBios, bootMode],
+  () => {
+    if (formError.value) {
+      formError.value = null;
+    }
   }
-});
+);
 
 const isDeviceDisabled = (deviceId: string, index: number) => {
   return selectedDevices.value.some(
@@ -541,6 +551,15 @@ watch(
   }
 );
 
+watch(
+  () => draftStore.bootMode,
+  (mode) => {
+    if (mode === 'usb' || mode === 'storage') {
+      bootMode.value = mode;
+    }
+  }
+);
+
 const handleBack = () => {
   props.onBack?.();
 };
@@ -555,12 +574,17 @@ const handleSkip = () => {
 };
 
 const handlePrimaryAction = () => {
-  if (!canConfigure.value) {
+  if (bootMode.value === 'usb') {
     draftStore.skipInternalBoot();
     props.onComplete();
     return;
   }
 
+  if (!canConfigure.value) {
+    formError.value = loadStatusMessage.value || 'Internal boot setup is not available right now.';
+    return;
+  }
+
   const selection = buildValidatedSelection();
   if (!selection) {
     return;
@@ -570,7 +594,7 @@ const handlePrimaryAction = () => {
   props.onComplete();
 };
 
-const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Continue'));
+const primaryButtonText = computed(() => 'Continue');
 </script>
 
 <template>
@@ -581,34 +605,66 @@ const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Co
           <div class="flex items-center gap-3">
             <CircleStackIcon class="text-primary h-8 w-8" />
             <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">
-              Internal Boot
+              Configure Boot
             </h2>
           </div>
           <p class="text-muted text-lg">
-            Configure an internal bootable pool now, or skip and set it up later from the webgui.
+            You can setup Unraid to boot via a USB or using a boot drive. The default is to boot via a
+            USB. You can always switch to use a storage drive instead of a USB in the Unraid Dashboard.
           </p>
         </div>
       </div>
 
-      <blockquote class="my-8 border-s-4 border-yellow-500 bg-yellow-100 p-4">
+      <div class="space-y-3">
+        <label
+          class="border-muted bg-bg/50 has-[:checked]:border-primary has-[:checked]:bg-primary/5 flex cursor-pointer items-start gap-3 rounded-lg border p-4 transition-colors"
+        >
+          <input v-model="bootMode" type="radio" value="usb" class="mt-0.5 h-4 w-4" :disabled="isBusy" />
+          <div class="space-y-1">
+            <p class="text-highlighted text-sm font-semibold">Use USB to Boot Unraid</p>
+          </div>
+        </label>
+        <label
+          class="border-muted bg-bg/50 has-[:checked]:border-primary has-[:checked]:bg-primary/5 flex cursor-pointer items-start gap-3 rounded-lg border p-4 transition-colors"
+        >
+          <input
+            v-model="bootMode"
+            type="radio"
+            value="storage"
+            class="mt-0.5 h-4 w-4"
+            :disabled="isBusy"
+          />
+          <div class="space-y-1">
+            <p class="text-highlighted text-sm font-semibold">Use Storage Drive(s) to Boot Unraid</p>
+          </div>
+        </label>
+      </div>
+
+      <blockquote
+        v-if="isStorageBootSelected"
+        class="my-8 border-s-4 border-yellow-500 bg-yellow-100 p-4"
+      >
         <div class="flex items-start gap-2">
           <ExclamationTriangleIcon class="mt-0.5 h-6 w-6 flex-shrink-0 text-yellow-700" />
           <p class="text-sm leading-relaxed text-yellow-900">All selected devices will be formatted.</p>
         </div>
       </blockquote>
 
-      <div v-if="isLoading" class="text-muted rounded-lg border border-dashed p-4 text-sm">
+      <div
+        v-if="isStorageBootSelected && isLoading"
+        class="text-muted rounded-lg border border-dashed p-4 text-sm"
+      >
         Loading internal boot options...
       </div>
 
       <div
-        v-else-if="!canConfigure"
+        v-else-if="isStorageBootSelected && !canConfigure"
         class="rounded-lg border border-yellow-200 bg-yellow-50 p-4 text-sm text-yellow-900 dark:border-yellow-800 dark:bg-yellow-900/10 dark:text-yellow-200"
       >
         {{ loadStatusMessage }}
       </div>
 
-      <div v-else class="space-y-5">
+      <div v-else-if="isStorageBootSelected" class="space-y-5">
         <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
           <label class="space-y-2">
             <span class="text-muted text-sm font-medium">Pool name</span>
@@ -695,7 +751,7 @@ const primaryButtonText = computed(() => (canConfigure.value ? 'Next Step' : 'Co
       </div>
 
       <div
-        v-if="formError"
+        v-if="isStorageBootSelected && formError"
         class="mt-6 rounded-lg border border-red-200 bg-red-50 p-4 text-sm font-medium text-red-700 dark:border-red-800 dark:bg-red-900/10 dark:text-red-300"
       >
         {{ formError }}
diff --git a/web/src/components/Onboarding/store/onboardingDraft.ts b/web/src/components/Onboarding/store/onboardingDraft.ts
index 009323efff..d8d86a049e 100644
--- a/web/src/components/Onboarding/store/onboardingDraft.ts
+++ b/web/src/components/Onboarding/store/onboardingDraft.ts
@@ -9,6 +9,8 @@ export interface OnboardingInternalBootSelection {
   updateBios: boolean;
 }
 
+export type OnboardingBootMode = 'usb' | 'storage';
+
 const normalizePersistedPlugins = (value: unknown): string[] => {
   if (Array.isArray(value)) {
     return value.filter((item): item is string => typeof item === 'string');
@@ -54,6 +56,16 @@ const normalizePersistedInternalBootSelection = (
   };
 };
 
+const normalizePersistedBootMode = (
+  value: unknown,
+  internalBootSelection: OnboardingInternalBootSelection | null
+): OnboardingBootMode => {
+  if (value === 'usb' || value === 'storage') {
+    return value;
+  }
+  return internalBootSelection ? 'storage' : 'usb';
+};
+
 export const useOnboardingDraftStore = defineStore(
   'onboardingDraft',
   () => {
@@ -72,6 +84,7 @@ export const useOnboardingDraftStore = defineStore(
 
     // Internal boot
     const internalBootSelection = ref<OnboardingInternalBootSelection | null>(null);
+    const bootMode = ref<OnboardingBootMode>('usb');
     const internalBootInitialized = ref(false);
     const internalBootSkipped = ref(false);
     const internalBootApplySucceeded = ref(false);
@@ -110,6 +123,7 @@ export const useOnboardingDraftStore = defineStore(
         bootSizeMiB: selection.bootSizeMiB,
         updateBios: selection.updateBios,
       };
+      bootMode.value = 'storage';
       internalBootInitialized.value = true;
       internalBootSkipped.value = false;
       internalBootApplySucceeded.value = false;
@@ -117,11 +131,21 @@ export const useOnboardingDraftStore = defineStore(
 
     function skipInternalBoot() {
       internalBootSelection.value = null;
+      bootMode.value = 'usb';
       internalBootInitialized.value = true;
       internalBootSkipped.value = true;
       internalBootApplySucceeded.value = false;
     }
 
+    function setBootMode(mode: OnboardingBootMode) {
+      bootMode.value = mode;
+      internalBootInitialized.value = true;
+      internalBootSkipped.value = mode === 'usb';
+      if (mode === 'usb') {
+        internalBootApplySucceeded.value = false;
+      }
+    }
+
     function setInternalBootApplySucceeded(value: boolean) {
       internalBootApplySucceeded.value = value;
     }
@@ -141,6 +165,7 @@ export const useOnboardingDraftStore = defineStore(
       selectedPlugins,
       pluginSelectionInitialized,
       internalBootSelection,
+      bootMode,
       internalBootInitialized,
       internalBootSkipped,
       internalBootApplySucceeded,
@@ -149,6 +174,7 @@ export const useOnboardingDraftStore = defineStore(
       setPlugins,
       setInternalBootSelection,
       skipInternalBoot,
+      setBootMode,
       setInternalBootApplySucceeded,
       setStepIndex,
     };
@@ -166,6 +192,10 @@ export const useOnboardingDraftStore = defineStore(
           const normalizedInternalBootSelection = normalizePersistedInternalBootSelection(
             parsed.internalBootSelection
           );
+          const normalizedBootMode = normalizePersistedBootMode(
+            parsed.bootMode,
+            normalizedInternalBootSelection
+          );
           const hasLegacyCoreDraft =
             (typeof parsed.serverName === 'string' && parsed.serverName.length > 0) ||
             (typeof parsed.serverDescription === 'string' && parsed.serverDescription.length > 0) ||
@@ -181,8 +211,12 @@ export const useOnboardingDraftStore = defineStore(
             ...parsed,
             selectedPlugins: new Set(normalizePersistedPlugins(parsed.selectedPlugins)),
             internalBootSelection: normalizedInternalBootSelection,
+            bootMode: normalizedBootMode,
             internalBootInitialized: Boolean(parsed.internalBootInitialized),
-            internalBootSkipped: Boolean(parsed.internalBootSkipped),
+            internalBootSkipped:
+              parsed.internalBootSkipped !== undefined
+                ? Boolean(parsed.internalBootSkipped)
+                : normalizedBootMode === 'usb',
             internalBootApplySucceeded: Boolean(parsed.internalBootApplySucceeded),
             coreSettingsInitialized: Boolean(parsed.coreSettingsInitialized || hasLegacyCoreDraft),
             pluginSelectionInitialized: hadLegacyPluginShape

From e9c16ace68e8eb2847fb2d3829b85e288f1b458d Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Tue, 3 Mar 2026 10:29:44 -0500
Subject: [PATCH 21/53] feat(onboarding): add boot safety dialogs and summary
 boot section

- Purpose: add explicit user confirmation for destructive boot actions and make boot choices visible in onboarding summary.
- Before: summary only showed internal boot details when present, confirm-and-apply executed immediately, and reboot action had no warning dialog.
- Problem: users could trigger disk-destructive storage boot setup without an explicit confirmation and had no final-step reminder about flash-device handling during reboot.
- Change: summary now always shows a full-width Boot Configuration section under Plugins, including selected boot method and storage details when applicable.
- Change: confirm-and-apply now opens a warning dialog listing selected boot drives before proceeding with storage boot setup.
- Change: next-steps reboot action now opens a warning dialog and requires an "I understand" confirmation before issuing reboot.
- Change: improved summary field layout to wrap long values/device names for responsive behavior.
---
 .../steps/OnboardingNextStepsStep.vue         |  51 ++++-
 .../steps/OnboardingSummaryStep.vue           | 207 ++++++++++++------
 2 files changed, 193 insertions(+), 65 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
index 78f886f88e..b5546c0067 100644
--- a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import {
@@ -13,7 +13,7 @@ import {
   WrenchScrewdriverIcon,
 } from '@heroicons/vue/24/outline';
 import { CheckCircleIcon, EnvelopeIcon } from '@heroicons/vue/24/solid';
-import { BrandButton } from '@unraid/ui';
+import { BrandButton, Dialog } from '@unraid/ui';
 // Use ?raw to import SVG content string
 import UnraidIconSvg from '@/assets/partners/simple-icons-unraid.svg?raw';
 import { submitInternalBootReboot } from '@/components/Onboarding/composables/internalBoot';
@@ -52,6 +52,7 @@ const showRebootButton = computed(() => draftStore.internalBootApplySucceeded);
 const primaryButtonText = computed(() =>
   showRebootButton.value ? 'Reboot' : t('onboarding.nextSteps.continueToDashboard')
 );
+const showRebootWarningDialog = ref(false);
 
 const basicsItems = [
   { label: t('onboarding.nextSteps.basics.shares'), url: 'https://docs.unraid.net/go/shares/' },
@@ -82,12 +83,21 @@ const handleMouseMove = (e: MouseEvent) => {
 
 const handlePrimaryAction = () => {
   if (showRebootButton.value) {
-    submitInternalBootReboot();
+    showRebootWarningDialog.value = true;
     return;
   }
 
   props.onComplete();
 };
+
+const handleConfirmReboot = () => {
+  showRebootWarningDialog.value = false;
+  submitInternalBootReboot();
+};
+
+const handleCancelReboot = () => {
+  showRebootWarningDialog.value = false;
+};
 </script>
 
 <template>
@@ -340,6 +350,41 @@ const handlePrimaryAction = () => {
         </div>
       </div>
 
+      <Dialog
+        v-if="showRebootWarningDialog"
+        :model-value="showRebootWarningDialog"
+        :show-footer="false"
+        :show-close-button="false"
+        size="md"
+        class="max-w-md"
+      >
+        <div class="space-y-6 p-2">
+          <div class="space-y-2">
+            <h3 class="text-lg font-semibold">Confirm Reboot</h3>
+            <p class="text-muted-foreground text-sm">
+              Please do NOT remove your Unraid flash drive until your server has finished rebooting into
+              Unraid again.
+            </p>
+          </div>
+          <div class="flex justify-end gap-3">
+            <button
+              type="button"
+              class="border-muted hover:bg-muted rounded-md border px-4 py-2 text-sm font-medium"
+              @click="handleCancelReboot"
+            >
+              Cancel
+            </button>
+            <button
+              type="button"
+              class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
+              @click="handleConfirmReboot"
+            >
+              I understand
+            </button>
+          </div>
+        </div>
+      </Dialog>
+
       <!-- Footer -->
       <div
         class="border-muted mt-8 flex flex-col-reverse items-center justify-between gap-6 border-t pt-8 sm:flex-row"
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 3d3134c0b2..d338dfd4c8 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -121,11 +121,18 @@ const displayLanguage = computed(() => {
   return draftStore.selectedLanguage || coreSettingsResult.value?.display?.locale || 'en_US';
 });
 
+const selectedBootMode = computed(() =>
+  draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
+);
+const bootModeLabel = computed(() =>
+  selectedBootMode.value === 'storage' ? 'Use Storage Drive(s) to Boot Unraid' : 'Use USB to Boot Unraid'
+);
+
 const internalBootSelection = computed(() => {
-  if (draftStore.internalBootSkipped) {
+  if (selectedBootMode.value !== 'storage') {
     return null;
   }
-  return draftStore.internalBootSelection;
+  return draftStore.internalBootSelection ?? null;
 });
 
 const hasInternalBootSelection = computed(() => Boolean(internalBootSelection.value));
@@ -158,6 +165,7 @@ const error = ref<string | null>(null);
 const logs = ref<LogEntry[]>([]);
 const showConsole = computed(() => isProcessing.value || logs.value.length > 0);
 const showApplyResultDialog = ref(false);
+const showBootDriveWarningDialog = ref(false);
 const applyResultTitle = ref('');
 const applyResultMessage = ref('');
 const applyResultSeverity = ref<'success' | 'warning' | 'error'>('success');
@@ -169,6 +177,8 @@ const addLog = (message: string, type: LogEntry['type'] = 'info') => {
 const showDiagnosticLogsInResultDialog = computed(
   () => applyResultSeverity.value !== 'success' && logs.value.length > 0
 );
+const selectedBootDeviceNames = computed(() => internalBootSummary.value?.devices ?? []);
+const selectedBootDeviceNamesText = computed(() => selectedBootDeviceNames.value.join(', '));
 
 const isInstallTimeoutError = (error: unknown): boolean => {
   if (!error || typeof error !== 'object') {
@@ -408,6 +418,7 @@ const handleComplete = async () => {
   if (isProcessing.value) {
     return;
   }
+  showBootDriveWarningDialog.value = false;
   if (!canApply.value) {
     error.value = 'Settings are still loading. Please wait a moment and try again.';
     return;
@@ -657,7 +668,11 @@ const handleComplete = async () => {
     // 3. Internal boot setup
     if (internalBootSelection.value) {
       const selection = internalBootSelection.value;
+      addLog('Starting internal boot setup. This might take a while...', 'info');
       addLog('Configuring internal boot pool...', 'info');
+      const internalBootProgressTimer = setInterval(() => {
+        addLog('Still setting up internal boot...', 'info');
+      }, 10000);
       try {
         const result = await submitInternalBootCreation(
           {
@@ -682,6 +697,8 @@ const handleComplete = async () => {
         hadWarnings = true;
         const errorMessage = e instanceof Error ? e.message : 'Unknown error';
         addLog(`Internal boot setup failed: ${errorMessage}`, 'error');
+      } finally {
+        clearInterval(internalBootProgressTimer);
       }
     }
 
@@ -802,6 +819,25 @@ const handleApplyResultConfirm = () => {
   props.onComplete();
 };
 
+const handleApplyClick = async () => {
+  if (isProcessing.value) {
+    return;
+  }
+  if (hasInternalBootSelection.value) {
+    showBootDriveWarningDialog.value = true;
+    return;
+  }
+  await handleComplete();
+};
+
+const handleBootDriveWarningConfirm = async () => {
+  await handleComplete();
+};
+
+const handleBootDriveWarningCancel = () => {
+  showBootDriveWarningDialog.value = false;
+};
+
 const handleBack = () => {
   props.onBack?.();
 };
@@ -846,21 +882,21 @@ const handleBack = () => {
             </h3>
           </div>
           <div class="space-y-3">
-            <div class="flex items-center justify-between text-sm">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">{{ t('onboarding.coreSettings.serverName') }}</span>
-              <span class="text-highlighted font-medium">{{ serverName }}</span>
+              <span class="text-highlighted font-medium break-all sm:text-right">{{ serverName }}</span>
             </div>
             <div class="bg-elevated flex flex-col rounded text-sm" v-if="draftStore.serverDescription">
               <span class="text-muted">Server Description</span>
-              <span class="text-highlighted truncate font-medium">{{
+              <span class="text-highlighted font-medium break-all">{{
                 draftStore.serverDescription
               }}</span>
             </div>
-            <div class="flex items-center justify-between text-sm">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">Activation</span>
-              <div class="flex items-center gap-1.5">
+              <div class="flex items-center gap-1.5 sm:justify-end">
                 <component :is="activationStatus.icon" :class="['h-4 w-4', activationStatus.color]" />
-                <span class="text-highlighted font-medium">{{ activationStatus.label }}</span>
+                <span class="text-highlighted font-medium break-all">{{ activationStatus.label }}</span>
               </div>
             </div>
           </div>
@@ -873,18 +909,18 @@ const handleBack = () => {
             <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Configuration</h3>
           </div>
           <div class="space-y-3">
-            <div class="flex items-center justify-between text-sm">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">{{ t('onboarding.coreSettings.timezone') }}</span>
-              <div class="flex items-center gap-1.5">
+              <div class="flex items-center gap-1.5 sm:justify-end">
                 <ClockIcon class="text-muted h-4 w-4" />
-                <span class="text-highlighted font-medium">{{ currentTimeZone }}</span>
+                <span class="text-highlighted font-medium break-all">{{ currentTimeZone }}</span>
               </div>
             </div>
-            <div class="flex items-center justify-between text-sm">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">{{ t('onboarding.coreSettings.ssh') }}</span>
-              <div class="flex items-center gap-1.5">
+              <div class="flex items-center gap-1.5 sm:justify-end">
                 <div :class="[sshEnabled ? 'bg-green-500' : 'bg-gray-400', 'h-2 w-2 rounded-full']" />
-                <span class="text-highlighted font-medium">
+                <span class="text-highlighted font-medium break-all">
                   {{
                     sshEnabled
                       ? t('onboarding.summaryStep.sshActive')
@@ -894,63 +930,22 @@ const handleBack = () => {
               </div>
             </div>
             <!-- Theme & Language -->
-            <div class="flex items-center justify-between text-sm">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">Theme</span>
-              <div class="flex items-center gap-1.5">
+              <div class="flex items-center gap-1.5 sm:justify-end">
                 <SwatchIcon class="text-muted h-4 w-4" />
-                <span class="text-highlighted font-medium capitalize">{{ displayTheme }}</span>
+                <span class="text-highlighted font-medium break-all capitalize">{{ displayTheme }}</span>
               </div>
             </div>
-            <div class="flex items-center justify-between text-sm">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">Language</span>
-              <div class="flex items-center gap-1.5">
+              <div class="flex items-center gap-1.5 sm:justify-end">
                 <LanguageIcon class="text-muted h-4 w-4" />
-                <span class="text-highlighted font-medium">{{ displayLanguage }}</span>
+                <span class="text-highlighted font-medium break-all">{{ displayLanguage }}</span>
               </div>
             </div>
           </div>
         </div>
-
-        <div v-if="internalBootSummary" class="border-muted bg-bg/50 rounded-lg border p-5">
-          <div class="mb-4 flex items-center gap-2">
-            <CircleStackIcon class="text-primary h-5 w-5" />
-            <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Internal Boot</h3>
-          </div>
-          <div class="space-y-3">
-            <div class="flex items-center justify-between text-sm">
-              <span class="text-muted">Pool</span>
-              <span class="text-highlighted font-medium">{{ internalBootSummary.poolName }}</span>
-            </div>
-            <div class="flex items-center justify-between text-sm">
-              <span class="text-muted">Slots</span>
-              <span class="text-highlighted font-medium">{{ internalBootSummary.slotCount }}</span>
-            </div>
-            <div class="flex items-center justify-between text-sm">
-              <span class="text-muted">Boot Reserved</span>
-              <span class="text-highlighted font-medium">{{
-                internalBootSummary.bootReservedSize
-              }}</span>
-            </div>
-            <div class="flex items-center justify-between text-sm">
-              <span class="text-muted">Update BIOS</span>
-              <span class="text-highlighted font-medium">{{
-                internalBootSummary.updateBios ? 'Yes' : 'No'
-              }}</span>
-            </div>
-            <div>
-              <p class="text-muted mb-1 text-sm">Devices</p>
-              <ul class="space-y-1">
-                <li
-                  v-for="device in internalBootSummary.devices"
-                  :key="device"
-                  class="text-highlighted text-sm font-medium"
-                >
-                  {{ device }}
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
       </div>
 
       <!-- Plugins Summary -->
@@ -1036,6 +1031,58 @@ const handleBack = () => {
         </Disclosure>
       </div>
 
+      <div class="border-muted bg-bg/50 mt-6 rounded-lg border p-5">
+        <div class="mb-4 flex items-center gap-2">
+          <CircleStackIcon class="text-primary h-5 w-5" />
+          <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Boot Configuration</h3>
+        </div>
+        <div class="space-y-3">
+          <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
+            <span class="text-muted">Boot Method</span>
+            <span class="text-highlighted font-medium break-all sm:text-right">{{ bootModeLabel }}</span>
+          </div>
+
+          <template v-if="internalBootSummary">
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
+              <span class="text-muted">Pool</span>
+              <span class="text-highlighted font-medium break-all sm:text-right">{{
+                internalBootSummary.poolName
+              }}</span>
+            </div>
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
+              <span class="text-muted">Slots</span>
+              <span class="text-highlighted font-medium break-all sm:text-right">{{
+                internalBootSummary.slotCount
+              }}</span>
+            </div>
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
+              <span class="text-muted">Boot Reserved</span>
+              <span class="text-highlighted font-medium break-all sm:text-right">{{
+                internalBootSummary.bootReservedSize
+              }}</span>
+            </div>
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
+              <span class="text-muted">Update BIOS</span>
+              <span class="text-highlighted font-medium break-all sm:text-right">{{
+                internalBootSummary.updateBios ? 'Yes' : 'No'
+              }}</span>
+            </div>
+            <div class="space-y-1 text-sm">
+              <p class="text-muted">Devices</p>
+              <ul class="space-y-1">
+                <li
+                  v-for="device in internalBootSummary.devices"
+                  :key="device"
+                  class="text-highlighted font-medium break-all"
+                >
+                  {{ device }}
+                </li>
+              </ul>
+            </div>
+          </template>
+        </div>
+      </div>
+
       <!-- Processing / Error Status -->
       <div v-if="showConsole" class="mt-6">
         <OnboardingConsole :logs="logs" title="System Setup Log" />
@@ -1059,6 +1106,42 @@ const handleBack = () => {
         </p>
       </div>
 
+      <Dialog
+        v-if="showBootDriveWarningDialog"
+        :model-value="showBootDriveWarningDialog"
+        :show-footer="false"
+        :show-close-button="false"
+        size="md"
+        class="max-w-lg"
+      >
+        <div class="space-y-6 p-2">
+          <div class="space-y-3">
+            <h3 class="text-lg font-semibold">Confirm Boot Drive Wipe</h3>
+            <p class="text-muted-foreground text-sm">
+              You've selected drives: {{ selectedBootDeviceNamesText }} to boot Unraid. Please make sure
+              to backup any existing data on your drive(s). Continuing will permanently destroy all
+              existing data on the drive(s). Are you sure you want to continue?
+            </p>
+          </div>
+          <div class="flex justify-end gap-3">
+            <button
+              type="button"
+              class="border-muted hover:bg-muted rounded-md border px-4 py-2 text-sm font-medium"
+              @click="handleBootDriveWarningCancel"
+            >
+              Cancel
+            </button>
+            <button
+              type="button"
+              class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
+              @click="handleBootDriveWarningConfirm"
+            >
+              Continue
+            </button>
+          </div>
+        </div>
+      </Dialog>
+
       <Dialog
         v-if="showApplyResultDialog"
         :model-value="showApplyResultDialog"
@@ -1114,7 +1197,7 @@ const handleBack = () => {
               ? '!bg-gray-400 !text-white hover:!bg-gray-400'
               : '!bg-primary hover:!bg-primary/90 !text-white hover:shadow-lg'
           }`"
-          @click="handleComplete"
+          @click="handleApplyClick"
           :disabled="isProcessing || !canApply"
           :icon-right="isProcessing ? undefined : ChevronRightIcon"
         >

From 860e134e5f12ef3c82629974296a39d9fe1410b9 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Tue, 3 Mar 2026 10:29:55 -0500
Subject: [PATCH 22/53] test(onboarding): cover boot warnings and new
 next-steps reboot flow

- Purpose: protect the new boot-mode UX and confirmation dialog behavior with focused onboarding tests.
- Before: tests did not cover the summary wipe-confirmation gate or the next-steps reboot warning dialog.
- Problem: destructive-action safeguards and reboot confirmation behavior could regress without detection.
- Change: updated summary tests to include bootMode state, auto-confirm storage wipe in shared apply helper, and explicit coverage for the cancel path.
- Change: added assertions that Boot Configuration is always rendered for USB mode.
- Change: added a new next-steps test suite that verifies reboot warning dialog flow and "I understand" confirmation behavior.
---
 .../OnboardingNextStepsStep.test.ts           | 110 ++++++++++++++++++
 .../Onboarding/OnboardingSummaryStep.test.ts  |  52 +++++++++
 2 files changed, 162 insertions(+)
 create mode 100644 web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts

diff --git a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
new file mode 100644
index 0000000000..53ee5e217a
--- /dev/null
+++ b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
@@ -0,0 +1,110 @@
+import { reactive } from 'vue';
+import { flushPromises, mount } from '@vue/test-utils';
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import OnboardingNextStepsStep from '~/components/Onboarding/steps/OnboardingNextStepsStep.vue';
+import { createTestI18n } from '../../utils/i18n';
+
+const { draftStore, activationCodeDataStore, submitInternalBootRebootMock } = vi.hoisted(() => ({
+  draftStore: {
+    internalBootApplySucceeded: false,
+  },
+  activationCodeDataStore: {
+    partnerInfo: {
+      value: {
+        partner: {
+          manualUrl: null,
+          hardwareSpecsUrl: null,
+          supportUrl: null,
+          extraLinks: [],
+        },
+      },
+    },
+    activationCode: {
+      value: null,
+    },
+  },
+  submitInternalBootRebootMock: vi.fn(),
+}));
+
+vi.mock('@unraid/ui', () => ({
+  BrandButton: {
+    props: ['text', 'disabled'],
+    emits: ['click'],
+    template:
+      '<button data-testid="brand-button" :disabled="disabled" @click="$emit(\'click\')"><slot />{{ text }}</button>',
+  },
+  Dialog: {
+    props: ['modelValue'],
+    template: '<div v-if="modelValue" data-testid="dialog"><slot /></div>',
+  },
+}));
+
+vi.mock('~/components/Onboarding/store/onboardingDraft', () => ({
+  useOnboardingDraftStore: () => reactive(draftStore),
+}));
+
+vi.mock('~/components/Onboarding/store/activationCodeData', () => ({
+  useActivationCodeDataStore: () => reactive(activationCodeDataStore),
+}));
+
+vi.mock('~/components/Onboarding/composables/internalBoot', () => ({
+  submitInternalBootReboot: submitInternalBootRebootMock,
+}));
+
+describe('OnboardingNextStepsStep', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    draftStore.internalBootApplySucceeded = false;
+  });
+
+  const mountComponent = () => {
+    const onComplete = vi.fn();
+    const wrapper = mount(OnboardingNextStepsStep, {
+      props: {
+        onComplete,
+        showBack: true,
+      },
+      global: {
+        plugins: [createTestI18n()],
+      },
+    });
+
+    return { wrapper, onComplete };
+  };
+
+  it('continues to dashboard when reboot is not required', async () => {
+    const { wrapper, onComplete } = mountComponent();
+
+    const button = wrapper.find('[data-testid="brand-button"]');
+    await button.trigger('click');
+    await flushPromises();
+
+    expect(onComplete).toHaveBeenCalledTimes(1);
+    expect(submitInternalBootRebootMock).not.toHaveBeenCalled();
+  });
+
+  it('shows reboot warning dialog and waits for confirmation', async () => {
+    draftStore.internalBootApplySucceeded = true;
+    const { wrapper, onComplete } = mountComponent();
+
+    const button = wrapper.find('[data-testid="brand-button"]');
+    await button.trigger('click');
+    await flushPromises();
+
+    expect(wrapper.text()).toContain('Confirm Reboot');
+    expect(submitInternalBootRebootMock).not.toHaveBeenCalled();
+    expect(onComplete).not.toHaveBeenCalled();
+
+    const confirmButton = wrapper
+      .findAll('button')
+      .find((candidate) => candidate.text().trim() === 'I understand');
+    expect(confirmButton).toBeTruthy();
+    await confirmButton!.trigger('click');
+    await flushPromises();
+
+    expect(submitInternalBootRebootMock).toHaveBeenCalledTimes(1);
+    expect(onComplete).not.toHaveBeenCalled();
+  });
+});
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 8598972f30..153fedc2d9 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -49,6 +49,7 @@ const {
     selectedTheme: 'white',
     selectedLanguage: 'en_US',
     useSsh: false,
+    bootMode: 'usb' as 'usb' | 'storage',
     selectedPlugins: new Set<string>(),
     internalBootSelection: null as {
       poolName: string;
@@ -248,6 +249,16 @@ const clickApply = async (wrapper: ReturnType<typeof mountComponent>['wrapper'])
   const applyButton = buttons[buttons.length - 1];
   await applyButton.trigger('click');
   await flushPromises();
+
+  if (wrapper.text().includes('Confirm Boot Drive Wipe')) {
+    const continueButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().trim() === 'Continue');
+    expect(continueButton).toBeTruthy();
+    await continueButton!.trigger('click');
+    await flushPromises();
+  }
+
   await vi.runAllTimersAsync();
   await flushPromises();
 };
@@ -264,6 +275,7 @@ describe('OnboardingSummaryStep', () => {
     draftStore.selectedTheme = 'white';
     draftStore.selectedLanguage = 'en_US';
     draftStore.useSsh = false;
+    draftStore.bootMode = 'usb';
     draftStore.selectedPlugins = new Set();
     draftStore.internalBootSelection = null;
     draftStore.internalBootSkipped = false;
@@ -947,7 +959,46 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('Setup Saved in Best-Effort Mode');
   });
 
+  it('always shows boot configuration section for USB boot mode', () => {
+    draftStore.bootMode = 'usb';
+    draftStore.internalBootSelection = null;
+
+    const { wrapper } = mountComponent();
+
+    expect(wrapper.text()).toContain('Boot Configuration');
+    expect(wrapper.text()).toContain('Use USB to Boot Unraid');
+  });
+
+  it('requires confirmation before applying storage boot drive changes', async () => {
+    draftStore.bootMode = 'storage';
+    draftStore.internalBootSelection = {
+      poolName: 'cache',
+      slotCount: 1,
+      devices: ['diskA'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    };
+
+    const { wrapper } = mountComponent();
+    const buttons = wrapper.findAll('[data-testid="brand-button"]');
+    const applyButton = buttons[buttons.length - 1];
+    await applyButton.trigger('click');
+    await flushPromises();
+
+    expect(wrapper.text()).toContain('Confirm Boot Drive Wipe');
+    expect(submitInternalBootCreationMock).not.toHaveBeenCalled();
+
+    const cancelButton = wrapper.findAll('button').find((button) => button.text().trim() === 'Cancel');
+    expect(cancelButton).toBeTruthy();
+    await cancelButton!.trigger('click');
+    await flushPromises();
+
+    expect(wrapper.text()).not.toContain('Confirm Boot Drive Wipe');
+    expect(submitInternalBootCreationMock).not.toHaveBeenCalled();
+  });
+
   it('applies internal boot configuration without reboot and records success', async () => {
+    draftStore.bootMode = 'storage';
     draftStore.internalBootSelection = {
       poolName: 'cache',
       slotCount: 2,
@@ -974,6 +1025,7 @@ describe('OnboardingSummaryStep', () => {
   });
 
   it('continues with warnings when internal boot setup returns an error', async () => {
+    draftStore.bootMode = 'storage';
     draftStore.internalBootSelection = {
       poolName: 'cache',
       slotCount: 1,

From c04fbfb0d674b288d8166c4fdfd2ccab4d8b4931 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Tue, 3 Mar 2026 11:11:37 -0500
Subject: [PATCH 23/53] refactor(onboarding): rename step id to configure boot

- Purpose: align internal step identifiers with the new Configure Boot UX naming.
- Before: onboarding used INTERNAL_BOOT as the underlying step id while UI labels showed Configure Boot.
- Problem: mismatch between step id and user-facing language made flow metadata and tests less clear.
- Change: renamed step id references from INTERNAL_BOOT to CONFIGURE_BOOT in step registry, modal flow wiring, and stepper typings.
- Change: updated onboarding modal tests to mock the renamed step id.
- Behavior: functional flow is unchanged; this is an identifier rename for consistency.
---
 .../components/Onboarding/OnboardingModal.test.ts      |  2 +-
 web/src/components/Onboarding/OnboardingModal.vue      | 10 +++++-----
 web/src/components/Onboarding/OnboardingSteps.vue      |  4 ++--
 web/src/components/Onboarding/stepRegistry.ts          |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index 4c55e07ba5..0f31d96954 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -111,7 +111,7 @@ vi.mock('~/components/Onboarding/stepRegistry', () => ({
   stepComponents: {
     OVERVIEW: { template: '<div data-testid="overview-step" />' },
     CONFIGURE_SETTINGS: { template: '<div data-testid="settings-step" />' },
-    INTERNAL_BOOT: { template: '<div data-testid="internal-boot-step" />' },
+    CONFIGURE_BOOT: { template: '<div data-testid="internal-boot-step" />' },
     ADD_PLUGINS: { template: '<div data-testid="plugins-step" />' },
     ACTIVATE_LICENSE: { template: '<div data-testid="license-step" />' },
     SUMMARY: { template: '<div data-testid="summary-step" />' },
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 07487c3d73..01bc6218d2 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -67,7 +67,7 @@ const activateExternal = computed(() => purchaseStore.openInNewTab);
 type StepId =
   | 'OVERVIEW'
   | 'CONFIGURE_SETTINGS'
-  | 'INTERNAL_BOOT'
+  | 'CONFIGURE_BOOT'
   | 'ADD_PLUGINS'
   | 'ACTIVATE_LICENSE'
   | 'SUMMARY'
@@ -77,7 +77,7 @@ type StepId =
 const HARDCODED_STEPS: Array<{ id: StepId; required: boolean }> = [
   { id: 'OVERVIEW', required: false },
   { id: 'CONFIGURE_SETTINGS', required: false },
-  { id: 'INTERNAL_BOOT', required: false },
+  { id: 'CONFIGURE_BOOT', required: false },
   { id: 'ADD_PLUGINS', required: false },
   { id: 'ACTIVATE_LICENSE', required: true },
   { id: 'SUMMARY', required: false },
@@ -107,7 +107,7 @@ const hideInternalBootStep = computed(() => {
 const visibleHardcodedSteps = computed(() =>
   HARDCODED_STEPS.filter((step) => showActivationStep.value || step.id !== 'ACTIVATE_LICENSE').filter(
     (step) => {
-      if (step.id !== 'INTERNAL_BOOT') {
+      if (step.id !== 'CONFIGURE_BOOT') {
         return true;
       }
       return !isPartnerBuild.value && !hideInternalBootStep.value;
@@ -340,8 +340,8 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
       };
     }
 
-    case 'INTERNAL_BOOT': {
-      const hardcodedStep = HARDCODED_STEPS.find((s) => s.id === 'INTERNAL_BOOT');
+    case 'CONFIGURE_BOOT': {
+      const hardcodedStep = HARDCODED_STEPS.find((s) => s.id === 'CONFIGURE_BOOT');
       return {
         ...baseProps,
         onComplete: handleInternalBootComplete,
diff --git a/web/src/components/Onboarding/OnboardingSteps.vue b/web/src/components/Onboarding/OnboardingSteps.vue
index 6798cf4f3f..77935f18d4 100644
--- a/web/src/components/Onboarding/OnboardingSteps.vue
+++ b/web/src/components/Onboarding/OnboardingSteps.vue
@@ -10,7 +10,7 @@ import { stepMetadata } from '~/components/Onboarding/stepRegistry';
 type StepId =
   | 'OVERVIEW'
   | 'CONFIGURE_SETTINGS'
-  | 'INTERNAL_BOOT'
+  | 'CONFIGURE_BOOT'
   | 'ADD_PLUGINS'
   | 'ACTIVATE_LICENSE'
   | 'SUMMARY'
@@ -55,7 +55,7 @@ const dynamicSteps = computed(() => {
     const defaultSteps = [
       metadataLookup.OVERVIEW,
       metadataLookup.CONFIGURE_SETTINGS,
-      metadataLookup.INTERNAL_BOOT,
+      metadataLookup.CONFIGURE_BOOT,
       metadataLookup.ADD_PLUGINS,
       metadataLookup.ACTIVATE_LICENSE,
     ];
diff --git a/web/src/components/Onboarding/stepRegistry.ts b/web/src/components/Onboarding/stepRegistry.ts
index 3c575b96f6..7966d4a87b 100644
--- a/web/src/components/Onboarding/stepRegistry.ts
+++ b/web/src/components/Onboarding/stepRegistry.ts
@@ -11,7 +11,7 @@ import OnboardingSummaryStep from '~/components/Onboarding/steps/OnboardingSumma
 export const stepComponents: Record<string, Component> = {
   OVERVIEW: OnboardingOverviewStep,
   CONFIGURE_SETTINGS: OnboardingCoreSettingsStep,
-  INTERNAL_BOOT: OnboardingInternalBootStep,
+  CONFIGURE_BOOT: OnboardingInternalBootStep,
   ADD_PLUGINS: OnboardingPluginsStep,
   ACTIVATE_LICENSE: OnboardingLicenseStep,
   SUMMARY: OnboardingSummaryStep,
@@ -35,7 +35,7 @@ export const stepMetadata: Record<string, StepMetadataEntry> = {
     descriptionKey: 'onboarding.coreSettings.description',
     icon: 'i-heroicons-cog-6-tooth',
   },
-  INTERNAL_BOOT: {
+  CONFIGURE_BOOT: {
     titleKey: 'Configure Boot',
     descriptionKey: 'Choose USB or storage drive boot',
     icon: 'i-heroicons-circle-stack',

From 49973965a6d1eb8cf0cc1e21f8f12f97af892a43 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Tue, 3 Mar 2026 11:34:29 -0500
Subject: [PATCH 24/53] fix(onboarding): unlock setup boot radios during
 context loading

- Purpose: remove the temporary non-interactive state on the Setup Boot step when arriving from Configure Settings.
- Before: radio inputs and primary action were disabled while internal-boot context was loading, causing a visible lag where boot choice could not be changed.
- Problem: users saw the step render with delayed interactivity and inconsistent perceived selection state.
- Change: boot-mode radios now lock only when the step itself is saving, not while internal-boot options are loading.
- Change: primary action is now enabled for USB mode immediately and only waits on loading when storage boot setup is selected.
- Change: boot-mode normalization now applies immediately via a typed helper to keep selection stable during draft hydration.
- Change: renamed user-facing step title from "Configure Boot" to "Setup Boot".
---
 web/src/components/Onboarding/stepRegistry.ts |  2 +-
 .../steps/OnboardingInternalBootStep.vue      | 35 ++++++++++++-------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/web/src/components/Onboarding/stepRegistry.ts b/web/src/components/Onboarding/stepRegistry.ts
index 7966d4a87b..a9239b6517 100644
--- a/web/src/components/Onboarding/stepRegistry.ts
+++ b/web/src/components/Onboarding/stepRegistry.ts
@@ -36,7 +36,7 @@ export const stepMetadata: Record<string, StepMetadataEntry> = {
     icon: 'i-heroicons-cog-6-tooth',
   },
   CONFIGURE_BOOT: {
-    titleKey: 'Configure Boot',
+    titleKey: 'Setup Boot',
     descriptionKey: 'Choose USB or storage drive boot',
     icon: 'i-heroicons-circle-stack',
   },
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 6bec972e75..6e265e3509 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -26,6 +26,7 @@ export interface Props {
 const props = defineProps<Props>();
 const { t } = useI18n();
 const draftStore = useOnboardingDraftStore();
+const toBootMode = (value: unknown): OnboardingBootMode => (value === 'storage' ? 'storage' : 'usb');
 
 interface InternalBootDeviceOption {
   value: string;
@@ -137,7 +138,7 @@ const {
 const formError = ref<string | null>(null);
 const hasInitializedForm = ref(false);
 const bootMode = ref<OnboardingBootMode>(
-  draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
+  toBootMode(draftStore.bootMode ?? (draftStore.internalBootSelection ? 'storage' : 'usb'))
 );
 
 const poolName = ref('cache');
@@ -235,6 +236,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
 
 const isLoading = computed(() => Boolean(contextLoading.value));
 const isBusy = computed(() => Boolean(props.isSavingStep) || isLoading.value);
+const isStepLocked = computed(() => Boolean(props.isSavingStep));
 const isArrayStopped = computed(() => {
   if (contextResult.value?.array.state) {
     return contextResult.value.array.state === 'STOPPED';
@@ -260,6 +262,12 @@ const canConfigure = computed(
     deviceOptions.value.length > 0
 );
 const isStorageBootSelected = computed(() => bootMode.value === 'storage');
+const isPrimaryActionDisabled = computed(
+  () => isStepLocked.value || (isStorageBootSelected.value && isLoading.value)
+);
+const isPrimaryActionLoading = computed(
+  () => isStepLocked.value || (isStorageBootSelected.value && isLoading.value)
+);
 
 const loadStatusMessage = computed(() => {
   if (contextError.value) {
@@ -554,10 +562,9 @@ watch(
 watch(
   () => draftStore.bootMode,
   (mode) => {
-    if (mode === 'usb' || mode === 'storage') {
-      bootMode.value = mode;
-    }
-  }
+    bootMode.value = toBootMode(mode);
+  },
+  { immediate: true }
 );
 
 const handleBack = () => {
@@ -604,9 +611,7 @@ const primaryButtonText = computed(() => 'Continue');
         <div class="space-y-2">
           <div class="flex items-center gap-3">
             <CircleStackIcon class="text-primary h-8 w-8" />
-            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">
-              Configure Boot
-            </h2>
+            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">Setup Boot</h2>
           </div>
           <p class="text-muted text-lg">
             You can setup Unraid to boot via a USB or using a boot drive. The default is to boot via a
@@ -619,7 +624,13 @@ const primaryButtonText = computed(() => 'Continue');
         <label
           class="border-muted bg-bg/50 has-[:checked]:border-primary has-[:checked]:bg-primary/5 flex cursor-pointer items-start gap-3 rounded-lg border p-4 transition-colors"
         >
-          <input v-model="bootMode" type="radio" value="usb" class="mt-0.5 h-4 w-4" :disabled="isBusy" />
+          <input
+            v-model="bootMode"
+            type="radio"
+            value="usb"
+            class="mt-0.5 h-4 w-4"
+            :disabled="isStepLocked"
+          />
           <div class="space-y-1">
             <p class="text-highlighted text-sm font-semibold">Use USB to Boot Unraid</p>
           </div>
@@ -632,7 +643,7 @@ const primaryButtonText = computed(() => 'Continue');
             type="radio"
             value="storage"
             class="mt-0.5 h-4 w-4"
-            :disabled="isBusy"
+            :disabled="isStepLocked"
           />
           <div class="space-y-1">
             <p class="text-highlighted text-sm font-semibold">Use Storage Drive(s) to Boot Unraid</p>
@@ -783,8 +794,8 @@ const primaryButtonText = computed(() => 'Continue');
           <BrandButton
             :text="primaryButtonText"
             class="!bg-primary hover:!bg-primary/90 w-full min-w-[160px] font-bold tracking-wide !text-white uppercase shadow-md transition-all hover:shadow-lg sm:w-auto"
-            :disabled="isBusy"
-            :loading="isBusy"
+            :disabled="isPrimaryActionDisabled"
+            :loading="isPrimaryActionLoading"
             @click="handlePrimaryAction"
             :icon-right="ChevronRightIcon"
           />

From d9fca1850c10faf4777641eca3ca776878f2a1a1 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Tue, 3 Mar 2026 11:41:55 -0500
Subject: [PATCH 25/53] style(onboarding): use primary accent for boot inputs

- Purpose: align Setup Boot form controls with Unraid primary accent styling.
- Before: boot mode radios and the update BIOS checkbox used browser-default accent colors.
- Problem: controls looked visually inconsistent with the rest of the onboarding UI.
- Change: applied accent-primary to both boot mode radios and the update BIOS checkbox.
- Behavior: no functional changes; only input accent color styling.
---
 .../Onboarding/steps/OnboardingInternalBootStep.vue   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 6e265e3509..6f54e5ccd4 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -628,7 +628,7 @@ const primaryButtonText = computed(() => 'Continue');
             v-model="bootMode"
             type="radio"
             value="usb"
-            class="mt-0.5 h-4 w-4"
+            class="accent-primary mt-0.5 h-4 w-4"
             :disabled="isStepLocked"
           />
           <div class="space-y-1">
@@ -642,7 +642,7 @@ const primaryButtonText = computed(() => 'Continue');
             v-model="bootMode"
             type="radio"
             value="storage"
-            class="mt-0.5 h-4 w-4"
+            class="accent-primary mt-0.5 h-4 w-4"
             :disabled="isStepLocked"
           />
           <div class="space-y-1">
@@ -753,7 +753,12 @@ const primaryButtonText = computed(() => 'Continue');
         <p class="text-muted text-xs">{{ bootSizeHelpText }}</p>
 
         <label class="flex items-center gap-3 text-sm">
-          <input v-model="updateBios" type="checkbox" class="h-4 w-4" :disabled="isBusy" />
+          <input
+            v-model="updateBios"
+            type="checkbox"
+            class="accent-primary h-4 w-4"
+            :disabled="isBusy"
+          />
           <span class="text-highlighted font-medium">Update BIOS boot order</span>
         </label>
         <p class="text-muted text-xs">

From 03798a224232954309f456d98d08c59709ed52b5 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Wed, 4 Mar 2026 15:14:12 -0500
Subject: [PATCH 26/53] feat(api): add internal boot onboarding mutation flow

- Purpose: expose a first-class onboarding mutation to create an internal boot pool via emcmd.

- Before: onboarding web logic called mkbootpool directly from the browser path, with no typed API contract.

- Problem: direct script calls bypassed GraphQL permissions/validation and made backend orchestration hard to test.

- Change: added CreateInternalBootPool input/output models, resolver field wiring, service implementation, and vitest coverage for happy/error/validation paths.

- How it works: resolver delegates to OnboardingInternalBootService, which runs ordered emcmd steps with timeout handling and structured output/result codes; API GraphQL schema/types were regenerated to publish the new mutation contract.
---
 api/generated-schema.graphql                  |  25 +++-
 api/src/unraid-api/cli/generated/graphql.ts   |  25 ++++
 .../resolvers/mutation/mutation.model.ts      |   6 +
 .../onboarding-internal-boot.service.spec.ts  |  94 ++++++++++++++
 .../onboarding-internal-boot.service.ts       | 119 ++++++++++++++++++
 .../resolvers/onboarding/onboarding.model.ts  |  62 ++++++++-
 .../onboarding/onboarding.mutation.spec.ts    |  31 ++++-
 .../onboarding/onboarding.mutation.ts         |  23 +++-
 .../graph/resolvers/resolvers.module.ts       |   2 +
 9 files changed, 380 insertions(+), 7 deletions(-)
 create mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
 create mode 100644 api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 8e0e93f311..780bee08c5 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -338,7 +338,9 @@ type Disk implements Node {
   """The serial number of the disk"""
   serialNum: String!
 
-  """Device identifier from emhttp devs.ini used by disk assignment commands"""
+  """
+  Device identifier from emhttp devs.ini used by disk assignment commands
+  """
   emhttpDeviceId: String
 
   """Sector count from emhttp devs.ini for this device"""
@@ -1062,6 +1064,13 @@ type Customization {
   availableLanguages: [Language!]
 }
 
+"""Result of attempting internal boot pool setup"""
+type OnboardingInternalBootResult {
+  ok: Boolean!
+  code: Int
+  output: String!
+}
+
 type RCloneDrive {
   """Provider name"""
   name: String!
@@ -1373,6 +1382,9 @@ type OnboardingMutations {
 
   """Clear onboarding override state and reload from disk"""
   clearOnboardingOverride: Onboarding!
+
+  """Create and configure internal boot pool via emcmd operations"""
+  createInternalBootPool(input: CreateInternalBootPoolInput!): OnboardingInternalBootResult!
 }
 
 """Onboarding override input for testing"""
@@ -1447,6 +1459,15 @@ input PartnerInfoOverrideInput {
   branding: BrandingConfigInput
 }
 
+"""Input for creating an internal boot pool during onboarding"""
+input CreateInternalBootPoolInput {
+  poolName: String!
+  devices: [String!]!
+  bootSizeMiB: Int!
+  updateBios: Boolean!
+  reboot: Boolean
+}
+
 """Unraid plugin management mutations"""
 type UnraidPluginsMutations {
   """Install an Unraid plugin and track installation progress"""
@@ -3538,4 +3559,4 @@ type Subscription {
   systemMetricsTemperature: TemperatureMetrics
   upsUpdates: UPSDevice!
   pluginInstallUpdates(operationId: ID!): PluginInstallEvent!
-}
+}
\ No newline at end of file
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index 469b73e6e1..47606cefc4 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -652,6 +652,15 @@ export type CreateApiKeyInput = {
   roles?: InputMaybe<Array<Role>>;
 };
 
+/** Input for creating an internal boot pool during onboarding */
+export type CreateInternalBootPoolInput = {
+  bootSizeMiB: Scalars['Int']['input'];
+  devices: Array<Scalars['String']['input']>;
+  poolName: Scalars['String']['input'];
+  reboot?: InputMaybe<Scalars['Boolean']['input']>;
+  updateBios: Scalars['Boolean']['input'];
+};
+
 export type CreateRCloneRemoteInput = {
   name: Scalars['String']['input'];
   parameters: Scalars['JSON']['input'];
@@ -1969,6 +1978,14 @@ export type Onboarding = {
   status: OnboardingStatus;
 };
 
+/** Result of attempting internal boot pool setup */
+export type OnboardingInternalBootResult = {
+  __typename?: 'OnboardingInternalBootResult';
+  code?: Maybe<Scalars['Int']['output']>;
+  ok: Scalars['Boolean']['output'];
+  output: Scalars['String']['output'];
+};
+
 /** Onboarding related mutations */
 export type OnboardingMutations = {
   __typename?: 'OnboardingMutations';
@@ -1976,6 +1993,8 @@ export type OnboardingMutations = {
   clearOnboardingOverride: Onboarding;
   /** Mark onboarding as completed */
   completeOnboarding: Onboarding;
+  /** Create and configure internal boot pool via emcmd operations */
+  createInternalBootPool: OnboardingInternalBootResult;
   /** Reset onboarding progress (for testing) */
   resetOnboarding: Onboarding;
   /** Override onboarding state for testing (in-memory only) */
@@ -1983,6 +2002,12 @@ export type OnboardingMutations = {
 };
 
 
+/** Onboarding related mutations */
+export type OnboardingMutationsCreateInternalBootPoolArgs = {
+  input: CreateInternalBootPoolInput;
+};
+
+
 /** Onboarding related mutations */
 export type OnboardingMutationsSetOnboardingOverrideArgs = {
   input: OnboardingOverrideInput;
diff --git a/api/src/unraid-api/graph/resolvers/mutation/mutation.model.ts b/api/src/unraid-api/graph/resolvers/mutation/mutation.model.ts
index af2a98d14e..ee26ee8cad 100644
--- a/api/src/unraid-api/graph/resolvers/mutation/mutation.model.ts
+++ b/api/src/unraid-api/graph/resolvers/mutation/mutation.model.ts
@@ -2,6 +2,7 @@ import { Field, ObjectType } from '@nestjs/graphql';
 
 import { Onboarding } from '@app/unraid-api/graph/resolvers/customization/activation-code.model.js';
 import { Theme } from '@app/unraid-api/graph/resolvers/customization/theme.model.js';
+import { OnboardingInternalBootResult } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.model.js';
 import { RCloneRemote } from '@app/unraid-api/graph/resolvers/rclone/rclone.model.js';
 import { PluginInstallOperation } from '@app/unraid-api/graph/resolvers/unraid-plugins/unraid-plugins.model.js';
 
@@ -77,6 +78,11 @@ export class OnboardingMutations {
         description: 'Clear onboarding override state and reload from disk',
     })
     clearOnboardingOverride!: Onboarding;
+
+    @Field(() => OnboardingInternalBootResult, {
+        description: 'Create and configure internal boot pool via emcmd operations',
+    })
+    createInternalBootPool!: OnboardingInternalBootResult;
 }
 
 @ObjectType({
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
new file mode 100644
index 0000000000..4097cf7233
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
@@ -0,0 +1,94 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { emcmd } from '@app/core/utils/clients/emcmd.js';
+import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
+
+vi.mock('@app/core/utils/clients/emcmd.js', () => ({
+    emcmd: vi.fn(),
+}));
+
+describe('OnboardingInternalBootService', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('runs the internal boot emcmd sequence and returns success', async () => {
+        vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
+        const service = new OnboardingInternalBootService();
+
+        const result = await service.createInternalBootPool({
+            poolName: 'cache',
+            devices: ['disk-1', 'disk-2'],
+            bootSizeMiB: 16384,
+            updateBios: true,
+        });
+
+        expect(result.ok).toBe(true);
+        expect(result.code).toBe(0);
+        expect(vi.mocked(emcmd)).toHaveBeenCalledTimes(5);
+        expect(vi.mocked(emcmd)).toHaveBeenNthCalledWith(
+            1,
+            { debug: 'cmdCreatePool,cmdAssignDisk,cmdMakeBootable' },
+            { waitForToken: true }
+        );
+        expect(vi.mocked(emcmd)).toHaveBeenNthCalledWith(
+            2,
+            { cmdCreatePool: 'apply', poolName: 'cache', poolSlots: '2' },
+            { waitForToken: true }
+        );
+        expect(vi.mocked(emcmd)).toHaveBeenNthCalledWith(
+            3,
+            { cmdAssignDisk: 'apply', diskName: 'cache', diskId: 'disk-1' },
+            { waitForToken: true }
+        );
+        expect(vi.mocked(emcmd)).toHaveBeenNthCalledWith(
+            4,
+            { cmdAssignDisk: 'apply', diskName: 'cache2', diskId: 'disk-2' },
+            { waitForToken: true }
+        );
+        expect(vi.mocked(emcmd)).toHaveBeenNthCalledWith(
+            5,
+            {
+                cmdMakeBootable: 'apply',
+                poolName: 'cache',
+                poolBootSize: '16384',
+            },
+            { waitForToken: true }
+        );
+    });
+
+    it('returns validation error for duplicate devices', async () => {
+        const service = new OnboardingInternalBootService();
+
+        const result = await service.createInternalBootPool({
+            poolName: 'cache',
+            devices: ['disk-1', 'disk-1'],
+            bootSizeMiB: 16384,
+            updateBios: false,
+        });
+
+        expect(result).toEqual({
+            ok: false,
+            code: 2,
+            output: 'mkbootpool: duplicate device id: disk-1',
+        });
+        expect(vi.mocked(emcmd)).not.toHaveBeenCalled();
+    });
+
+    it('returns failure output when emcmd command throws', async () => {
+        vi.mocked(emcmd).mockRejectedValue(new Error('socket failure'));
+        const service = new OnboardingInternalBootService();
+
+        const result = await service.createInternalBootPool({
+            poolName: 'cache',
+            devices: ['disk-1'],
+            bootSizeMiB: 16384,
+            updateBios: false,
+        });
+
+        expect(result.ok).toBe(false);
+        expect(result.code).toBe(1);
+        expect(result.output).toContain('mkbootpool: command failed or timed out');
+        expect(result.output).toContain('socket failure');
+    });
+});
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
new file mode 100644
index 0000000000..04c92b473c
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -0,0 +1,119 @@
+import { Injectable } from '@nestjs/common';
+
+import type {
+    CreateInternalBootPoolInput,
+    OnboardingInternalBootResult,
+} from '@app/unraid-api/graph/resolvers/onboarding/onboarding.model.js';
+import { emcmd } from '@app/core/utils/clients/emcmd.js';
+import { withTimeout } from '@app/core/utils/misc/with-timeout.js';
+
+const INTERNAL_BOOT_COMMAND_TIMEOUT_MS = 180000;
+
+@Injectable()
+export class OnboardingInternalBootService {
+    private async runStep(
+        commandText: string,
+        command: Record<string, string>,
+        output: string[]
+    ): Promise<void> {
+        output.push(`Running: emcmd ${commandText}`);
+        await withTimeout(
+            emcmd(command, { waitForToken: true }),
+            INTERNAL_BOOT_COMMAND_TIMEOUT_MS,
+            `internal boot (${commandText})`
+        );
+    }
+
+    private hasDuplicateDevices(devices: string[]): string | null {
+        const seen = new Set<string>();
+        for (const device of devices) {
+            if (seen.has(device)) {
+                return device;
+            }
+            seen.add(device);
+        }
+        return null;
+    }
+
+    async createInternalBootPool(
+        input: CreateInternalBootPoolInput
+    ): Promise<OnboardingInternalBootResult> {
+        const output: string[] = [];
+        if (input.updateBios) {
+            output.push(
+                'Note: updateBios was requested; this API path only runs emcmd pool setup commands.'
+            );
+        }
+        if (input.reboot) {
+            output.push(
+                'Note: reboot was requested; onboarding handles reboot separately after internal boot setup.'
+            );
+        }
+
+        const duplicateDevice = this.hasDuplicateDevices(input.devices);
+        if (duplicateDevice) {
+            return {
+                ok: false,
+                code: 2,
+                output: `mkbootpool: duplicate device id: ${duplicateDevice}`,
+            };
+        }
+
+        try {
+            await this.runStep(
+                'debug=cmdCreatePool,cmdAssignDisk,cmdMakeBootable',
+                { debug: 'cmdCreatePool,cmdAssignDisk,cmdMakeBootable' },
+                output
+            );
+
+            await this.runStep(
+                `cmdCreatePool=apply&poolName=${input.poolName}&poolSlots=${input.devices.length}`,
+                {
+                    cmdCreatePool: 'apply',
+                    poolName: input.poolName,
+                    poolSlots: String(input.devices.length),
+                },
+                output
+            );
+
+            for (const [index, diskId] of input.devices.entries()) {
+                const slot = index + 1;
+                const diskName = slot === 1 ? input.poolName : `${input.poolName}${slot}`;
+                await this.runStep(
+                    `cmdAssignDisk=apply&diskName=${diskName}&diskId=${diskId}`,
+                    {
+                        cmdAssignDisk: 'apply',
+                        diskName,
+                        diskId,
+                    },
+                    output
+                );
+            }
+
+            await this.runStep(
+                `cmdMakeBootable=apply&poolName=${input.poolName}&poolBootSize=${input.bootSizeMiB}`,
+                {
+                    cmdMakeBootable: 'apply',
+                    poolName: input.poolName,
+                    poolBootSize: String(input.bootSizeMiB),
+                },
+                output
+            );
+
+            return {
+                ok: true,
+                code: 0,
+                output: output.join('\n') || 'No output',
+            };
+        } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            output.push('mkbootpool: command failed or timed out');
+            output.push(message);
+            return {
+                ok: false,
+                code: 1,
+                output: output.join('\n') || 'mkbootpool: command failed or timed out',
+            };
+        }
+    }
+}
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
index 8943713285..069d1bfd3d 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
@@ -1,7 +1,19 @@
-import { Field, InputType } from '@nestjs/graphql';
+import { Field, InputType, Int, ObjectType } from '@nestjs/graphql';
 
 import { Type } from 'class-transformer';
-import { IsBoolean, IsEnum, IsIn, IsOptional, IsString, ValidateNested } from 'class-validator';
+import {
+    ArrayMaxSize,
+    ArrayMinSize,
+    IsBoolean,
+    IsEnum,
+    IsIn,
+    IsInt,
+    IsOptional,
+    IsString,
+    Matches,
+    Min,
+    ValidateNested,
+} from 'class-validator';
 
 import { RegistrationState } from '@app/unraid-api/graph/resolvers/registration/registration.model.js';
 
@@ -261,3 +273,49 @@ export class OnboardingOverrideInput {
     @IsEnum(RegistrationState)
     registrationState?: RegistrationState;
 }
+
+@InputType({
+    description: 'Input for creating an internal boot pool during onboarding',
+})
+export class CreateInternalBootPoolInput {
+    @Field(() => String)
+    @IsString()
+    @Matches(/^[a-z]([a-z0-9~._-]*[a-z_-])*$/, {
+        message: 'Pool name must match Unraid naming requirements',
+    })
+    poolName!: string;
+
+    @Field(() => [String])
+    @ArrayMinSize(1)
+    @ArrayMaxSize(4)
+    @IsString({ each: true })
+    devices!: string[];
+
+    @Field(() => Int)
+    @IsInt()
+    @Min(0)
+    bootSizeMiB!: number;
+
+    @Field(() => Boolean)
+    @IsBoolean()
+    updateBios!: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    @IsOptional()
+    @IsBoolean()
+    reboot?: boolean;
+}
+
+@ObjectType({
+    description: 'Result of attempting internal boot pool setup',
+})
+export class OnboardingInternalBootResult {
+    @Field(() => Boolean)
+    ok!: boolean;
+
+    @Field(() => Int, { nullable: true })
+    code?: number;
+
+    @Field(() => String)
+    output!: string;
+}
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.spec.ts
index 8961aa8367..97db6ca47f 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.spec.ts
@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { OnboardingStatus } from '@app/unraid-api/graph/resolvers/customization/activation-code.model.js';
+import { CreateInternalBootPoolInput } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.model.js';
 import { OnboardingMutationsResolver } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.mutation.js';
 
 describe('OnboardingMutationsResolver', () => {
@@ -22,6 +23,10 @@ describe('OnboardingMutationsResolver', () => {
         clearActivationDataCache: vi.fn(),
     };
 
+    const onboardingInternalBootService = {
+        createInternalBootPool: vi.fn(),
+    };
+
     let resolver: OnboardingMutationsResolver;
 
     beforeEach(() => {
@@ -43,7 +48,8 @@ describe('OnboardingMutationsResolver', () => {
         resolver = new OnboardingMutationsResolver(
             onboardingTracker as any,
             onboardingOverrides as any,
-            onboardingService as any
+            onboardingService as any,
+            onboardingInternalBootService as any
         );
     });
 
@@ -179,4 +185,27 @@ describe('OnboardingMutationsResolver', () => {
         expect(onboardingService.clearActivationDataCache).toHaveBeenCalledTimes(1);
         expect(result.status).toBe(OnboardingStatus.INCOMPLETE);
     });
+
+    it('delegates createInternalBootPool to onboarding internal boot service', async () => {
+        onboardingInternalBootService.createInternalBootPool.mockResolvedValue({
+            ok: true,
+            code: 0,
+            output: 'done',
+        });
+
+        const input: CreateInternalBootPoolInput = {
+            poolName: 'cache',
+            devices: ['disk-1'],
+            bootSizeMiB: 16384,
+            updateBios: true,
+        };
+        const result = await resolver.createInternalBootPool(input);
+
+        expect(onboardingInternalBootService.createInternalBootPool).toHaveBeenCalledWith(input);
+        expect(result).toEqual({
+            ok: true,
+            code: 0,
+            output: 'done',
+        });
+    });
 });
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.ts
index 606d0c6deb..358347fdcf 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.mutation.ts
@@ -12,15 +12,21 @@ import {
 } from '@app/unraid-api/graph/resolvers/customization/activation-code.model.js';
 import { OnboardingService } from '@app/unraid-api/graph/resolvers/customization/onboarding.service.js';
 import { OnboardingMutations } from '@app/unraid-api/graph/resolvers/mutation/mutation.model.js';
+import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
 import { getOnboardingVersionDirection } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-status.util.js';
-import { OnboardingOverrideInput } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.model.js';
+import {
+    CreateInternalBootPoolInput,
+    OnboardingInternalBootResult,
+    OnboardingOverrideInput,
+} from '@app/unraid-api/graph/resolvers/onboarding/onboarding.model.js';
 
 @Resolver(() => OnboardingMutations)
 export class OnboardingMutationsResolver {
     constructor(
         private readonly onboardingTracker: OnboardingTrackerService,
         private readonly onboardingOverrides: OnboardingOverrideService,
-        private readonly onboardingService: OnboardingService
+        private readonly onboardingService: OnboardingService,
+        private readonly onboardingInternalBootService: OnboardingInternalBootService
     ) {}
 
     /**
@@ -109,4 +115,17 @@ export class OnboardingMutationsResolver {
         this.onboardingService.clearActivationDataCache();
         return this.buildOnboardingResponse();
     }
+
+    @ResolveField(() => OnboardingInternalBootResult, {
+        description: 'Create and configure internal boot pool via emcmd operations',
+    })
+    @UsePermissions({
+        action: AuthAction.UPDATE_ANY,
+        resource: Resource.WELCOME,
+    })
+    async createInternalBootPool(
+        @Args('input') input: CreateInternalBootPoolInput
+    ): Promise<OnboardingInternalBootResult> {
+        return this.onboardingInternalBootService.createInternalBootPool(input);
+    }
 }
diff --git a/api/src/unraid-api/graph/resolvers/resolvers.module.ts b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
index dc689376f2..7001406539 100644
--- a/api/src/unraid-api/graph/resolvers/resolvers.module.ts
+++ b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
@@ -20,6 +20,7 @@ import { MetricsModule } from '@app/unraid-api/graph/resolvers/metrics/metrics.m
 import { RootMutationsResolver } from '@app/unraid-api/graph/resolvers/mutation/mutation.resolver.js';
 import { NotificationsModule } from '@app/unraid-api/graph/resolvers/notifications/notifications.module.js';
 import { NotificationsResolver } from '@app/unraid-api/graph/resolvers/notifications/notifications.resolver.js';
+import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
 import { OnboardingMutationsResolver } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.mutation.js';
 import { OnlineResolver } from '@app/unraid-api/graph/resolvers/online/online.resolver.js';
 import { OwnerResolver } from '@app/unraid-api/graph/resolvers/owner/owner.resolver.js';
@@ -75,6 +76,7 @@ import { MeResolver } from '@app/unraid-api/graph/user/user.resolver.js';
         OnlineResolver,
         OwnerResolver,
         OnboardingMutationsResolver,
+        OnboardingInternalBootService,
         RegistrationResolver,
         RootMutationsResolver,
         ServerResolver,

From e35417cdb179ad43f52d3037ea3d00f2df9bc9f1 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Wed, 4 Mar 2026 15:14:30 -0500
Subject: [PATCH 27/53] feat(web): switch internal boot setup to GraphQL
 mutation

- Purpose: move onboarding internal boot submission onto the typed GraphQL API contract.

- Before: the composable posted URL-encoded args directly to mkbootpool.php and parsed raw text responses.

- Problem: browser-side script coupling made the flow brittle, harder to type-check, and inconsistent with GraphQL-first onboarding paths.

- Change: added createInternalBootPool mutation document, updated composable to call Apollo mutate, and rewrote tests around mutation payload/response behavior including empty-response handling.

- How it works: submitInternalBootCreation now sends CreateInternalBootPoolInput, consumes onboarding.createInternalBootPool, and uses regenerated web GraphQL documents/types for compile-time safety.
---
 .../Onboarding/internalBoot.test.ts           | 134 ++++++++++++++----
 .../Onboarding/composables/internalBoot.ts    | 100 +++----------
 .../createInternalBootPool.mutation.ts        |  13 ++
 web/src/composables/gql/gql.ts                |   6 +
 web/src/composables/gql/graphql.ts            |  33 +++++
 web/src/composables/gql/index.ts              |   4 +-
 6 files changed, 180 insertions(+), 110 deletions(-)
 create mode 100644 web/src/components/Onboarding/graphql/createInternalBootPool.mutation.ts

diff --git a/web/__test__/components/Onboarding/internalBoot.test.ts b/web/__test__/components/Onboarding/internalBoot.test.ts
index 4e013fb128..5668036dc5 100644
--- a/web/__test__/components/Onboarding/internalBoot.test.ts
+++ b/web/__test__/components/Onboarding/internalBoot.test.ts
@@ -5,25 +5,36 @@ import {
   submitInternalBootReboot,
 } from '~/components/Onboarding/composables/internalBoot';
 
+const mutateMock = vi.fn();
+
+vi.mock('@vue/apollo-composable', () => ({
+  useApolloClient: () => ({
+    client: {
+      mutate: mutateMock,
+    },
+  }),
+}));
+
 describe('internalBoot composable', () => {
   beforeEach(() => {
     vi.restoreAllMocks();
+    mutateMock.mockReset();
     document.body.innerHTML = '';
     globalThis.csrf_token = 'csrf-token-value';
   });
 
-  it('includes csrf token and args when creating internal boot pool', async () => {
-    const fetchMock = vi.fn().mockResolvedValue({
-      text: vi.fn().mockResolvedValue(
-        JSON.stringify({
-          ok: true,
-          code: 0,
-          output: 'done',
-        })
-      ),
-      status: 200,
+  it('submits create internal boot pool via onboarding mutation', async () => {
+    mutateMock.mockResolvedValue({
+      data: {
+        onboarding: {
+          createInternalBootPool: {
+            ok: true,
+            code: 0,
+            output: 'done',
+          },
+        },
+      },
     });
-    vi.stubGlobal('fetch', fetchMock);
 
     const result = await submitInternalBootCreation({
       poolName: 'cache',
@@ -37,30 +48,93 @@ describe('internalBoot composable', () => {
       code: 0,
       output: 'done',
     });
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-    expect(fetchMock).toHaveBeenCalledWith(
-      '/plugins/dynamix/include/mkbootpool.php',
-      expect.objectContaining({
-        method: 'POST',
-        headers: expect.objectContaining({
-          'x-csrf-token': 'csrf-token-value',
-        }),
-      })
+    expect(mutateMock).toHaveBeenCalledTimes(1);
+    const call = mutateMock.mock.calls[0]?.[0];
+    expect(call).toBeDefined();
+    if (!call || typeof call !== 'object') {
+      return;
+    }
+
+    const payload = call as {
+      variables?: {
+        input?: {
+          poolName?: string;
+          devices?: string[];
+          bootSizeMiB?: number;
+          updateBios?: boolean;
+          reboot?: boolean;
+        };
+      };
+    };
+
+    expect(payload.variables?.input).toEqual({
+      poolName: 'cache',
+      devices: ['disk-1'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+      reboot: false,
+    });
+  });
+
+  it('returns fallback error when mutation response is empty', async () => {
+    mutateMock.mockResolvedValue({
+      data: {
+        onboarding: {
+          createInternalBootPool: null,
+        },
+      },
+    });
+
+    const result = await submitInternalBootCreation({
+      poolName: 'cache',
+      devices: ['disk-1'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    });
+
+    expect(result).toEqual({
+      ok: false,
+      output: 'Internal boot setup request failed: empty API response.',
+    });
+  });
+
+  it('passes reboot flag when requested', async () => {
+    mutateMock.mockResolvedValue({
+      data: {
+        onboarding: {
+          createInternalBootPool: {
+            ok: true,
+            code: 0,
+            output: 'done',
+          },
+        },
+      },
+    });
+
+    await submitInternalBootCreation(
+      {
+        poolName: 'cache',
+        devices: ['disk-1'],
+        bootSizeMiB: 16384,
+        updateBios: false,
+      },
+      { reboot: true }
     );
 
-    const options = fetchMock.mock.calls[0]?.[1];
-    expect(options).toBeDefined();
-    if (!options || typeof options !== 'object') {
+    const call = mutateMock.mock.calls[0]?.[0];
+    expect(call).toBeDefined();
+    if (!call || typeof call !== 'object') {
       return;
     }
 
-    const body = (options as { body?: string }).body ?? '';
-    expect(body).toContain('args%5B%5D=cache');
-    expect(body).toContain('args%5B%5D=16384');
-    expect(body).toContain('args%5B%5D=disk-1');
-    expect(body).toContain('args%5B%5D=updatebios');
-    expect(body).toContain('args%5B%5D=update');
-    expect(body).toContain('csrf_token=csrf-token-value');
+    const payload = call as {
+      variables?: {
+        input?: {
+          reboot?: boolean;
+        };
+      };
+    };
+    expect(payload.variables?.input?.reboot).toBe(true);
   });
 
   it('submits reboot form with cmd and csrf token', () => {
diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index b88572fcd2..f417a8686a 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -1,3 +1,7 @@
+import { useApolloClient } from '@vue/apollo-composable';
+
+import { CREATE_INTERNAL_BOOT_POOL_MUTATION } from '@/components/Onboarding/graphql/createInternalBootPool.mutation';
+
 export interface InternalBootSelection {
   poolName: string;
   devices: string[];
@@ -15,50 +19,6 @@ export interface InternalBootSubmitResult {
   output: string;
 }
 
-interface MkbootpoolResponsePayload {
-  ok?: boolean;
-  code?: number;
-  output?: string;
-}
-
-const buildInternalBootArgs = (
-  selection: InternalBootSelection,
-  options: SubmitInternalBootOptions
-): string[] => {
-  const args = [selection.poolName, String(selection.bootSizeMiB), ...selection.devices];
-  if (selection.updateBios) {
-    args.push('updatebios');
-  }
-  if (options.reboot) {
-    args.push('reboot');
-  }
-  args.push('update');
-  return args;
-};
-
-const parseMkbootpoolPayload = (raw: string): MkbootpoolResponsePayload | null => {
-  const trimmed = raw.trim();
-  if (trimmed.length === 0) {
-    return null;
-  }
-
-  try {
-    return JSON.parse(trimmed) as MkbootpoolResponsePayload;
-  } catch {
-    const firstBrace = trimmed.indexOf('{');
-    const lastBrace = trimmed.lastIndexOf('}');
-    if (firstBrace === -1 || lastBrace <= firstBrace) {
-      return null;
-    }
-
-    try {
-      return JSON.parse(trimmed.slice(firstBrace, lastBrace + 1)) as MkbootpoolResponsePayload;
-    } catch {
-      return null;
-    }
-  }
-};
-
 const readCsrfToken = (): string | null => {
   const token = globalThis.csrf_token;
   if (typeof token !== 'string') {
@@ -72,49 +32,33 @@ export const submitInternalBootCreation = async (
   selection: InternalBootSelection,
   options: SubmitInternalBootOptions = {}
 ): Promise<InternalBootSubmitResult> => {
-  const payload = new URLSearchParams();
-  const args = buildInternalBootArgs(selection, options);
-  for (const arg of args) {
-    payload.append('args[]', arg);
-  }
-  const csrfToken = readCsrfToken();
-  if (csrfToken) {
-    payload.append('csrf_token', csrfToken);
-  }
-
-  const response = await fetch('/plugins/dynamix/include/mkbootpool.php', {
-    method: 'POST',
-    credentials: 'same-origin',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-      'X-Requested-With': 'XMLHttpRequest',
-      ...(csrfToken ? { 'x-csrf-token': csrfToken } : {}),
+  const apolloClient = useApolloClient().client;
+  const { data } = await apolloClient.mutate({
+    mutation: CREATE_INTERNAL_BOOT_POOL_MUTATION,
+    variables: {
+      input: {
+        poolName: selection.poolName,
+        devices: selection.devices,
+        bootSizeMiB: selection.bootSizeMiB,
+        updateBios: selection.updateBios,
+        reboot: Boolean(options.reboot),
+      },
     },
-    body: payload.toString(),
+    fetchPolicy: 'no-cache',
   });
 
-  const raw = await response.text();
-  const trimmedRaw = raw.trim();
-  const parsed = parseMkbootpoolPayload(raw);
-
-  if (parsed) {
-    const parsedOutput = parsed.output?.trim() ?? '';
-    return {
-      ok: Boolean(parsed.ok),
-      code: parsed.code,
-      output: parsedOutput.length > 0 ? parsedOutput : trimmedRaw || 'No output',
-    };
-  }
-  if (trimmedRaw.length > 0) {
+  const result = data?.onboarding?.createInternalBootPool;
+  if (!result) {
     return {
       ok: false,
-      output: trimmedRaw,
+      output: 'Internal boot setup request failed: empty API response.',
     };
   }
 
   return {
-    ok: false,
-    output: `mkbootpool returned an empty response (HTTP ${response.status}). Check /boot/config/internal_boot/output.log via server shell for script output.`,
+    ok: result.ok,
+    code: result.code ?? undefined,
+    output: result.output?.trim() || 'No output',
   };
 };
 
diff --git a/web/src/components/Onboarding/graphql/createInternalBootPool.mutation.ts b/web/src/components/Onboarding/graphql/createInternalBootPool.mutation.ts
new file mode 100644
index 0000000000..1a6ac30943
--- /dev/null
+++ b/web/src/components/Onboarding/graphql/createInternalBootPool.mutation.ts
@@ -0,0 +1,13 @@
+import { graphql } from '~/composables/gql';
+
+export const CREATE_INTERNAL_BOOT_POOL_MUTATION = graphql(/* GraphQL */ `
+  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {
+    onboarding {
+      createInternalBootPool(input: $input) {
+        ok
+        code
+        output
+      }
+    }
+  }
+`);
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 50ffdb0754..39b60ee474 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -72,6 +72,7 @@ type Documents = {
     "\n  mutation UpdateServerIdentity($name: String!, $comment: String, $sysModel: String) {\n    updateServerIdentity(name: $name, comment: $comment, sysModel: $sysModel) {\n      id\n      name\n      comment\n    }\n  }\n": typeof types.UpdateServerIdentityDocument,
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": typeof types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
+    "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": typeof types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
     "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": typeof types.GetInternalBootStepVisibilityDocument,
@@ -156,6 +157,7 @@ const documents: Documents = {
     "\n  mutation UpdateServerIdentity($name: String!, $comment: String, $sysModel: String) {\n    updateServerIdentity(name: $name, comment: $comment, sysModel: $sysModel) {\n      id\n      name\n      comment\n    }\n  }\n": types.UpdateServerIdentityDocument,
     "\n  mutation SetLocale($locale: String!) {\n    customization {\n      setLocale(locale: $locale)\n    }\n  }\n": types.SetLocaleDocument,
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
+    "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
     "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": types.GetInternalBootStepVisibilityDocument,
@@ -428,6 +430,10 @@ export function graphql(source: "\n  mutation SetLocale($locale: String!) {\n
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 8fd7f906a2..a4145ff892 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -652,6 +652,15 @@ export type CreateApiKeyInput = {
   roles?: InputMaybe<Array<Role>>;
 };
 
+/** Input for creating an internal boot pool during onboarding */
+export type CreateInternalBootPoolInput = {
+  bootSizeMiB: Scalars['Int']['input'];
+  devices: Array<Scalars['String']['input']>;
+  poolName: Scalars['String']['input'];
+  reboot?: InputMaybe<Scalars['Boolean']['input']>;
+  updateBios: Scalars['Boolean']['input'];
+};
+
 export type CreateRCloneRemoteInput = {
   name: Scalars['String']['input'];
   parameters: Scalars['JSON']['input'];
@@ -1969,6 +1978,14 @@ export type Onboarding = {
   status: OnboardingStatus;
 };
 
+/** Result of attempting internal boot pool setup */
+export type OnboardingInternalBootResult = {
+  __typename?: 'OnboardingInternalBootResult';
+  code?: Maybe<Scalars['Int']['output']>;
+  ok: Scalars['Boolean']['output'];
+  output: Scalars['String']['output'];
+};
+
 /** Onboarding related mutations */
 export type OnboardingMutations = {
   __typename?: 'OnboardingMutations';
@@ -1976,6 +1993,8 @@ export type OnboardingMutations = {
   clearOnboardingOverride: Onboarding;
   /** Mark onboarding as completed */
   completeOnboarding: Onboarding;
+  /** Create and configure internal boot pool via emcmd operations */
+  createInternalBootPool: OnboardingInternalBootResult;
   /** Reset onboarding progress (for testing) */
   resetOnboarding: Onboarding;
   /** Override onboarding state for testing (in-memory only) */
@@ -1983,6 +2002,12 @@ export type OnboardingMutations = {
 };
 
 
+/** Onboarding related mutations */
+export type OnboardingMutationsCreateInternalBootPoolArgs = {
+  input: CreateInternalBootPoolInput;
+};
+
+
 /** Onboarding related mutations */
 export type OnboardingMutationsSetOnboardingOverrideArgs = {
   input: OnboardingOverrideInput;
@@ -3861,6 +3886,13 @@ export type UpdateSshSettingsMutationVariables = Exact<{
 
 export type UpdateSshSettingsMutation = { __typename?: 'Mutation', updateSshSettings: { __typename?: 'Vars', id: string, useSsh?: boolean | null, portssh?: number | null } };
 
+export type CreateInternalBootPoolMutationVariables = Exact<{
+  input: CreateInternalBootPoolInput;
+}>;
+
+
+export type CreateInternalBootPoolMutation = { __typename?: 'Mutation', onboarding: { __typename?: 'OnboardingMutations', createInternalBootPool: { __typename?: 'OnboardingInternalBootResult', ok: boolean, code?: number | null, output: string } } };
+
 export type GetCoreSettingsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -4058,6 +4090,7 @@ export const CompleteOnboardingDocument = {"kind":"Document","definitions":[{"ki
 export const UpdateServerIdentityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateServerIdentity"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"comment"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"sysModel"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateServerIdentity"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"comment"},"value":{"kind":"Variable","name":{"kind":"Name","value":"comment"}}},{"kind":"Argument","name":{"kind":"Name","value":"sysModel"},"value":{"kind":"Variable","name":{"kind":"Name","value":"sysModel"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]} as unknown as DocumentNode<UpdateServerIdentityMutation, UpdateServerIdentityMutationVariables>;
 export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLocale"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"locale"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLocale"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"locale"},"value":{"kind":"Variable","name":{"kind":"Name","value":"locale"}}}]}]}}]}}]} as unknown as DocumentNode<SetLocaleMutation, SetLocaleMutationVariables>;
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
+export const CreateInternalBootPoolDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateInternalBootPool"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateInternalBootPoolInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createInternalBootPool"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}},{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<CreateInternalBootPoolMutation, CreateInternalBootPoolMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
 export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","alias":{"kind":"Name","value":"emhttpSectors"},"name":{"kind":"Name","value":"sectors"}},{"kind":"Field","alias":{"kind":"Name","value":"emhttpSectorSize"},"name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const GetInternalBootStepVisibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootStepVisibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootStepVisibilityQuery, GetInternalBootStepVisibilityQueryVariables>;
diff --git a/web/src/composables/gql/index.ts b/web/src/composables/gql/index.ts
index c682b1e2f9..0ea4a91cf8 100644
--- a/web/src/composables/gql/index.ts
+++ b/web/src/composables/gql/index.ts
@@ -1,2 +1,2 @@
-export * from './fragment-masking';
-export * from './gql';
+export * from "./fragment-masking";
+export * from "./gql";

From 0579cf03180145b7120ae8be476859df63c3be59 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Wed, 4 Mar 2026 16:23:19 -0500
Subject: [PATCH 28/53] feat(onboarding): clarify boot selection and summary UX

- Purpose: Improve boot-drive onboarding clarity for both US and EU audiences and simplify destructive-action confirmation.

- Before: Boot step copy was long, USB wording was inconsistent, summary boot method repeated full action labels, devices were plain text, and wipe confirmation used dense paragraph text.

- Problem: The step was harder to skim, terminology was less globally clear, and high-risk confirmation content was difficult to parse quickly.

- Change: Updated boot-step copy and radio labels to use USB/Flash wording, changed default internal boot pool fallback from cache to boot, shortened summary boot method values, rendered selected devices as right-aligned badges, and simplified the wipe confirmation dialog title/content with drive badges.

- How: Edited OnboardingInternalBootStep and OnboardingSummaryStep templates/computed values and aligned summary tests to new labels/dialog text.
---
 .../Onboarding/OnboardingSummaryStep.test.ts  |  8 ++---
 .../steps/OnboardingInternalBootStep.vue      | 14 ++++----
 .../steps/OnboardingSummaryStep.vue           | 35 +++++++++++--------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 153fedc2d9..7b6b6ead9f 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -250,7 +250,7 @@ const clickApply = async (wrapper: ReturnType<typeof mountComponent>['wrapper'])
   await applyButton.trigger('click');
   await flushPromises();
 
-  if (wrapper.text().includes('Confirm Boot Drive Wipe')) {
+  if (wrapper.text().includes('Confirm Drive Wipe')) {
     const continueButton = wrapper
       .findAll('button')
       .find((button) => button.text().trim() === 'Continue');
@@ -966,7 +966,7 @@ describe('OnboardingSummaryStep', () => {
     const { wrapper } = mountComponent();
 
     expect(wrapper.text()).toContain('Boot Configuration');
-    expect(wrapper.text()).toContain('Use USB to Boot Unraid');
+    expect(wrapper.text()).toContain('USB/Flash Drive');
   });
 
   it('requires confirmation before applying storage boot drive changes', async () => {
@@ -985,7 +985,7 @@ describe('OnboardingSummaryStep', () => {
     await applyButton.trigger('click');
     await flushPromises();
 
-    expect(wrapper.text()).toContain('Confirm Boot Drive Wipe');
+    expect(wrapper.text()).toContain('Confirm Drive Wipe');
     expect(submitInternalBootCreationMock).not.toHaveBeenCalled();
 
     const cancelButton = wrapper.findAll('button').find((button) => button.text().trim() === 'Cancel');
@@ -993,7 +993,7 @@ describe('OnboardingSummaryStep', () => {
     await cancelButton!.trigger('click');
     await flushPromises();
 
-    expect(wrapper.text()).not.toContain('Confirm Boot Drive Wipe');
+    expect(wrapper.text()).not.toContain('Confirm Drive Wipe');
     expect(submitInternalBootCreationMock).not.toHaveBeenCalled();
   });
 
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 6f54e5ccd4..6e92b7a938 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -141,7 +141,7 @@ const bootMode = ref<OnboardingBootMode>(
   toBootMode(draftStore.bootMode ?? (draftStore.internalBootSelection ? 'storage' : 'usb'))
 );
 
-const poolName = ref('cache');
+const poolName = ref('boot');
 const slotCount = ref(1);
 const selectedDevices = ref<string[]>(['']);
 const bootSizePreset = ref<string>('');
@@ -222,7 +222,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
 
   return {
     isBootPoolEligible: Boolean(data.vars?.bootEligible),
-    poolNameDefault: poolNameSet.size === 0 ? 'cache' : '',
+    poolNameDefault: poolNameSet.size === 0 ? 'boot' : '',
     slotOptions: [1, 2],
     deviceOptions,
     bootSizePresetsMiB: BOOT_SIZE_PRESETS_MIB,
@@ -520,7 +520,7 @@ const initializeForm = (data: InternalBootTemplateData) => {
   const firstSlot = data.slotOptions[0] ?? 1;
   const defaultSlot = Math.max(1, Math.min(2, firstSlot));
 
-  poolName.value = draftSelection?.poolName || data.poolNameDefault || 'cache';
+  poolName.value = draftSelection?.poolName || data.poolNameDefault || 'boot';
   slotCount.value = draftSelection?.slotCount ?? defaultSlot;
   selectedDevices.value =
     draftSelection?.devices.slice(0, slotCount.value) ??
@@ -614,8 +614,8 @@ const primaryButtonText = computed(() => 'Continue');
             <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">Setup Boot</h2>
           </div>
           <p class="text-muted text-lg">
-            You can setup Unraid to boot via a USB or using a boot drive. The default is to boot via a
-            USB. You can always switch to use a storage drive instead of a USB in the Unraid Dashboard.
+            Choose how Unraid boots: USB/Flash Drive (default) or Storage Drive(s). You can switch to
+            Storage Drive boot later in the Unraid Dashboard.
           </p>
         </div>
       </div>
@@ -632,7 +632,7 @@ const primaryButtonText = computed(() => 'Continue');
             :disabled="isStepLocked"
           />
           <div class="space-y-1">
-            <p class="text-highlighted text-sm font-semibold">Use USB to Boot Unraid</p>
+            <p class="text-highlighted text-sm font-semibold">Use USB/Flash Drive to boot Unraid</p>
           </div>
         </label>
         <label
@@ -646,7 +646,7 @@ const primaryButtonText = computed(() => 'Continue');
             :disabled="isStepLocked"
           />
           <div class="space-y-1">
-            <p class="text-highlighted text-sm font-semibold">Use Storage Drive(s) to Boot Unraid</p>
+            <p class="text-highlighted text-sm font-semibold">Use Storage Drive(s) to boot Unraid</p>
           </div>
         </label>
       </div>
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index d338dfd4c8..6b48617e56 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -125,7 +125,7 @@ const selectedBootMode = computed(() =>
   draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
 );
 const bootModeLabel = computed(() =>
-  selectedBootMode.value === 'storage' ? 'Use Storage Drive(s) to Boot Unraid' : 'Use USB to Boot Unraid'
+  selectedBootMode.value === 'storage' ? 'Storage Drive(s)' : 'USB/Flash Drive'
 );
 
 const internalBootSelection = computed(() => {
@@ -178,7 +178,6 @@ const showDiagnosticLogsInResultDialog = computed(
   () => applyResultSeverity.value !== 'success' && logs.value.length > 0
 );
 const selectedBootDeviceNames = computed(() => internalBootSummary.value?.devices ?? []);
-const selectedBootDeviceNamesText = computed(() => selectedBootDeviceNames.value.join(', '));
 
 const isInstallTimeoutError = (error: unknown): boolean => {
   if (!error || typeof error !== 'object') {
@@ -1067,17 +1066,17 @@ const handleBack = () => {
                 internalBootSummary.updateBios ? 'Yes' : 'No'
               }}</span>
             </div>
-            <div class="space-y-1 text-sm">
-              <p class="text-muted">Devices</p>
-              <ul class="space-y-1">
-                <li
+            <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
+              <span class="text-muted">Devices</span>
+              <div class="flex flex-wrap gap-2 sm:justify-end">
+                <span
                   v-for="device in internalBootSummary.devices"
                   :key="device"
-                  class="text-highlighted font-medium break-all"
+                  class="bg-primary/10 text-primary rounded-full px-2.5 py-1 text-xs font-semibold break-all"
                 >
                   {{ device }}
-                </li>
-              </ul>
+                </span>
+              </div>
             </div>
           </template>
         </div>
@@ -1116,12 +1115,18 @@ const handleBack = () => {
       >
         <div class="space-y-6 p-2">
           <div class="space-y-3">
-            <h3 class="text-lg font-semibold">Confirm Boot Drive Wipe</h3>
-            <p class="text-muted-foreground text-sm">
-              You've selected drives: {{ selectedBootDeviceNamesText }} to boot Unraid. Please make sure
-              to backup any existing data on your drive(s). Continuing will permanently destroy all
-              existing data on the drive(s). Are you sure you want to continue?
-            </p>
+            <h3 class="text-lg font-semibold">Confirm Drive Wipe</h3>
+            <p class="text-muted-foreground text-sm">You've selected drives:</p>
+            <div class="flex flex-wrap gap-2">
+              <span
+                v-for="device in selectedBootDeviceNames"
+                :key="`dialog-${device}`"
+                class="bg-primary/10 text-primary rounded-full px-2.5 py-1 text-xs font-semibold"
+              >
+                {{ device }}
+              </span>
+            </div>
+            <p class="text-muted-foreground text-sm">Are you sure you want to continue?</p>
           </div>
           <div class="flex justify-end gap-3">
             <button

From 01e5122740ba8935beadcdae4a190874f39ea287 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Wed, 4 Mar 2026 16:49:13 -0500
Subject: [PATCH 29/53] feat(onboarding): refine boot messaging and reboot
 guidance

- Purpose: Improve onboarding clarity around storage boot selection and reboot instructions while keeping summary details easy to scan.

- Before: Summary device badges showed only raw IDs, reboot confirmation used "I understand" and lacked BIOS guidance, and setup-boot BIOS messaging was a static inline note.

- Problem: Users could miss key hardware context (device size/name mapping) and important post-config boot-order guidance, especially during destructive and reboot actions.

- Change: Added device-size/name labels in boot summary and wipe confirmation badges, updated reboot dialog confirmation label to "I Understand", added BIOS boot-order blockquote in Next Steps, and replaced setup-boot BIOS helper text with a conditional warning blockquote shown when BIOS update is selected.

- How: Wired Summary step to internal-boot context query for disk metadata formatting, updated Next Steps and Setup Boot templates, and aligned onboarding tests to cover the new copy and rendered details.
---
 .../OnboardingNextStepsStep.test.ts           |   5 +-
 .../Onboarding/OnboardingSummaryStep.test.ts  |  40 +++++++
 .../steps/OnboardingInternalBootStep.vue      |  12 ++-
 .../steps/OnboardingNextStepsStep.vue         |   8 +-
 .../steps/OnboardingSummaryStep.vue           | 100 ++++++++++++++++--
 5 files changed, 154 insertions(+), 11 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
index 53ee5e217a..0e5bb6e43e 100644
--- a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
@@ -94,12 +94,15 @@ describe('OnboardingNextStepsStep', () => {
     await flushPromises();
 
     expect(wrapper.text()).toContain('Confirm Reboot');
+    expect(wrapper.text()).toContain(
+      'On some systems, you may need to manually change the BIOS boot order from the USB device to the storage drive.'
+    );
     expect(submitInternalBootRebootMock).not.toHaveBeenCalled();
     expect(onComplete).not.toHaveBeenCalled();
 
     const confirmButton = wrapper
       .findAll('button')
-      .find((candidate) => candidate.text().trim() === 'I understand');
+      .find((candidate) => candidate.text().trim() === 'I Understand');
     expect(confirmButton).toBeTruthy();
     await confirmButton!.trigger('click');
     await flushPromises();
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 7b6b6ead9f..7759d73e23 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -9,6 +9,7 @@ import {
   UPDATE_SSH_SETTINGS_MUTATION,
 } from '@/components/Onboarding/graphql/coreSettings.mutations';
 import { GET_CORE_SETTINGS_QUERY } from '@/components/Onboarding/graphql/getCoreSettings.query';
+import { GET_INTERNAL_BOOT_CONTEXT_QUERY } from '@/components/Onboarding/graphql/getInternalBootContext.query';
 import { INSTALLED_UNRAID_PLUGINS_QUERY } from '@/components/Onboarding/graphql/installedPlugins.query';
 import { UPDATE_SYSTEM_TIME_MUTATION } from '@/components/Onboarding/graphql/updateSystemTime.mutation';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
@@ -25,6 +26,7 @@ const {
   activationCodeRef,
   coreSettingsResult,
   coreSettingsError,
+  internalBootContextResult,
   installedPluginsResult,
   availableLanguagesResult,
   refetchInstalledPluginsMock,
@@ -71,6 +73,7 @@ const {
     value: null as unknown,
   },
   coreSettingsError: { value: null as unknown },
+  internalBootContextResult: { value: null as unknown },
   installedPluginsResult: { value: { installedUnraidPlugins: [] as string[] } },
   availableLanguagesResult: {
     value: {
@@ -215,6 +218,9 @@ const setupApolloMocks = () => {
     if (doc === GET_CORE_SETTINGS_QUERY) {
       return { result: coreSettingsResult, error: coreSettingsError };
     }
+    if (doc === GET_INTERNAL_BOOT_CONTEXT_QUERY) {
+      return { result: internalBootContextResult };
+    }
     if (doc === INSTALLED_UNRAID_PLUGINS_QUERY) {
       return {
         result: installedPluginsResult,
@@ -292,6 +298,24 @@ describe('OnboardingSummaryStep', () => {
       systemTime: { timeZone: 'UTC' },
       info: { primaryNetwork: { ipAddress: '192.168.1.2' } },
     };
+    internalBootContextResult.value = {
+      disks: [
+        {
+          device: '/dev/sda',
+          size: 500 * 1024 * 1024 * 1024,
+          emhttpDeviceId: 'diskA',
+          emhttpSectors: null,
+          emhttpSectorSize: null,
+        },
+        {
+          device: '/dev/sdb',
+          size: 250 * 1024 * 1024 * 1024,
+          emhttpDeviceId: 'diskB',
+          emhttpSectors: null,
+          emhttpSectorSize: null,
+        },
+      ],
+    };
     installedPluginsResult.value = { installedUnraidPlugins: [] };
     availableLanguagesResult.value = {
       customization: {
@@ -969,6 +993,22 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('USB/Flash Drive');
   });
 
+  it('shows selected boot devices with device name and size details', () => {
+    draftStore.bootMode = 'storage';
+    draftStore.internalBootSelection = {
+      poolName: 'boot',
+      slotCount: 2,
+      devices: ['diskA', 'diskB'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    };
+
+    const { wrapper } = mountComponent();
+
+    expect(wrapper.text()).toContain('diskA - 500 GB (sda)');
+    expect(wrapper.text()).toContain('diskB - 250 GB (sdb)');
+  });
+
   it('requires confirmation before applying storage boot drive changes', async () => {
     draftStore.bootMode = 'storage';
     draftStore.internalBootSelection = {
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 6e92b7a938..cc18df85aa 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -761,9 +761,15 @@ const primaryButtonText = computed(() => 'Continue');
           />
           <span class="text-highlighted font-medium">Update BIOS boot order</span>
         </label>
-        <p class="text-muted text-xs">
-          Some systems may need manual intervention to change boot order in the BIOS.
-        </p>
+        <blockquote v-if="updateBios" class="border-s-4 border-yellow-500 bg-yellow-100 p-4">
+          <div class="flex items-start gap-2">
+            <ExclamationTriangleIcon class="mt-0.5 h-5 w-5 flex-shrink-0 text-yellow-700" />
+            <p class="text-sm leading-relaxed text-yellow-900">
+              On some systems, you may need to manually change the BIOS boot order from the USB device to
+              the storage drive.
+            </p>
+          </div>
+        </blockquote>
       </div>
 
       <div
diff --git a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
index b5546c0067..f03511ed73 100644
--- a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
@@ -365,6 +365,12 @@ const handleCancelReboot = () => {
               Please do NOT remove your Unraid flash drive until your server has finished rebooting into
               Unraid again.
             </p>
+            <blockquote class="border-s-4 border-yellow-500 bg-yellow-100 p-3">
+              <p class="text-sm leading-relaxed text-yellow-900">
+                On some systems, you may need to manually change the BIOS boot order from the USB device
+                to the storage drive.
+              </p>
+            </blockquote>
           </div>
           <div class="flex justify-end gap-3">
             <button
@@ -379,7 +385,7 @@ const handleCancelReboot = () => {
               class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
               @click="handleConfirmReboot"
             >
-              I understand
+              I Understand
             </button>
           </div>
         </div>
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 6b48617e56..c6735996b5 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -38,6 +38,7 @@ import {
   UPDATE_SSH_SETTINGS_MUTATION,
 } from '@/components/Onboarding/graphql/coreSettings.mutations';
 import { GET_CORE_SETTINGS_QUERY } from '@/components/Onboarding/graphql/getCoreSettings.query';
+import { GET_INTERNAL_BOOT_CONTEXT_QUERY } from '@/components/Onboarding/graphql/getInternalBootContext.query';
 import { INSTALLED_UNRAID_PLUGINS_QUERY } from '@/components/Onboarding/graphql/installedPlugins.query';
 import { UPDATE_SYSTEM_TIME_MUTATION } from '@/components/Onboarding/graphql/updateSystemTime.mutation';
 import { useActivationCodeModalStore } from '@/components/Onboarding/store/activationCodeModal';
@@ -92,6 +93,9 @@ const { result: installedPluginsResult, refetch: refetchInstalledPlugins } = use
 const { result: availableLanguagesResult } = useQuery(GET_AVAILABLE_LANGUAGES_QUERY, null, {
   fetchPolicy: 'cache-first',
 });
+const { result: internalBootContextResult } = useQuery(GET_INTERNAL_BOOT_CONTEXT_QUERY, null, {
+  fetchPolicy: 'cache-first',
+});
 
 const draftPluginsCount = computed(() => draftStore.selectedPlugins?.size ?? 0);
 
@@ -144,6 +148,84 @@ const formatBootSize = (bootSizeMiB: number) => {
   return `${Math.round(bootSizeMiB / 1024)} GB`;
 };
 
+const formatBytes = (bytes: number) => {
+  if (!Number.isFinite(bytes) || bytes <= 0) {
+    return 'Unknown';
+  }
+
+  const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+  let value = bytes;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex += 1;
+  }
+
+  const precision = value >= 100 || unitIndex === 0 ? 0 : 1;
+  return `${value.toFixed(precision)} ${units[unitIndex]}`;
+};
+
+const normalizeDeviceName = (value: string | null | undefined): string => {
+  if (!value) {
+    return '';
+  }
+  const trimmed = value.trim();
+  if (trimmed.startsWith('/dev/')) {
+    return trimmed.slice('/dev/'.length);
+  }
+  return trimmed;
+};
+
+const deriveDeviceSizeBytes = (
+  sectors: number | null | undefined,
+  sectorSize: number | null | undefined,
+  fallbackSize: number
+) => {
+  if (
+    typeof sectors === 'number' &&
+    Number.isFinite(sectors) &&
+    sectors > 0 &&
+    typeof sectorSize === 'number' &&
+    Number.isFinite(sectorSize) &&
+    sectorSize > 0
+  ) {
+    return sectors * sectorSize;
+  }
+  return fallbackSize;
+};
+
+interface InternalBootContextDisk {
+  device: string;
+  size: number;
+  emhttpDeviceId?: string | null;
+  emhttpSectors?: number | null;
+  emhttpSectorSize?: number | null;
+}
+
+const internalBootDeviceLabelById = computed(() => {
+  const data = internalBootContextResult.value as { disks?: InternalBootContextDisk[] } | null;
+  const disks = data?.disks ?? [];
+  const labels = new Map<string, string>();
+
+  for (const disk of disks) {
+    const device = normalizeDeviceName(disk.device);
+    if (!device) {
+      continue;
+    }
+
+    const emhttpDeviceId = disk.emhttpDeviceId?.trim() || '';
+    const optionValue = emhttpDeviceId || device;
+    const sizeBytes = deriveDeviceSizeBytes(disk.emhttpSectors, disk.emhttpSectorSize, disk.size);
+    const sizeLabel = formatBytes(sizeBytes);
+    const label = `${optionValue} - ${sizeLabel} (${device})`;
+
+    labels.set(optionValue, label);
+    labels.set(device, label);
+  }
+
+  return labels;
+});
+
 const internalBootSummary = computed(() => {
   const selection = internalBootSelection.value;
   if (!selection) {
@@ -178,6 +260,12 @@ const showDiagnosticLogsInResultDialog = computed(
   () => applyResultSeverity.value !== 'success' && logs.value.length > 0
 );
 const selectedBootDeviceNames = computed(() => internalBootSummary.value?.devices ?? []);
+const selectedBootDevices = computed(() =>
+  selectedBootDeviceNames.value.map((deviceId) => ({
+    id: deviceId,
+    label: internalBootDeviceLabelById.value.get(deviceId) ?? deviceId,
+  }))
+);
 
 const isInstallTimeoutError = (error: unknown): boolean => {
   if (!error || typeof error !== 'object') {
@@ -1070,11 +1158,11 @@ const handleBack = () => {
               <span class="text-muted">Devices</span>
               <div class="flex flex-wrap gap-2 sm:justify-end">
                 <span
-                  v-for="device in internalBootSummary.devices"
-                  :key="device"
+                  v-for="device in selectedBootDevices"
+                  :key="device.id"
                   class="bg-primary/10 text-primary rounded-full px-2.5 py-1 text-xs font-semibold break-all"
                 >
-                  {{ device }}
+                  {{ device.label }}
                 </span>
               </div>
             </div>
@@ -1119,11 +1207,11 @@ const handleBack = () => {
             <p class="text-muted-foreground text-sm">You've selected drives:</p>
             <div class="flex flex-wrap gap-2">
               <span
-                v-for="device in selectedBootDeviceNames"
-                :key="`dialog-${device}`"
+                v-for="device in selectedBootDevices"
+                :key="`dialog-${device.id}`"
                 class="bg-primary/10 text-primary rounded-full px-2.5 py-1 text-xs font-semibold"
               >
-                {{ device }}
+                {{ device.label }}
               </span>
             </div>
             <p class="text-muted-foreground text-sm">Are you sure you want to continue?</p>

From ec41b9b17c6237b289f5ed2ad8601249d1ef650c Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Wed, 4 Mar 2026 17:44:40 -0500
Subject: [PATCH 30/53] feat(onboarding): implement BIOS update flow for
 internal boot

- Purpose: make updateBios in onboarding internal boot perform the same EFI boot entry work as mkbootpool.php.

- Before: createInternalBootPool accepted updateBios but only logged a note and skipped BIOS/EFI changes.

- Problem: onboarding behavior diverged from WebGUI flow, so internal boot entries and boot order were not updated when requested.

- Change: added efibootmgr execution after successful pool creation to delete stale entries, create internal-boot entries, recreate Unraid Flash entry, and set boot order/next boot.

- How: use existing API emhttp state via getters.emhttp() for id->device and flash-device resolution, with loadStateFileSync(StateFileKey.devs/disks) fallback when state is not preloaded.

- Tests: expanded onboarding internal boot service spec to cover the updateBios efibootmgr sequence and retained existing emcmd-only, duplicate-device, and failure-path coverage.
---
 .../onboarding-internal-boot.service.spec.ts  | 109 +++++++-
 .../onboarding-internal-boot.service.ts       | 237 +++++++++++++++++-
 2 files changed, 340 insertions(+), 6 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
index 4097cf7233..368827955e 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
@@ -1,15 +1,36 @@
+import { execa } from 'execa';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { emcmd } from '@app/core/utils/clients/emcmd.js';
+import { getters } from '@app/store/index.js';
+import { loadStateFileSync } from '@app/store/services/state-file-loader.js';
 import { OnboardingInternalBootService } from '@app/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.js';
 
 vi.mock('@app/core/utils/clients/emcmd.js', () => ({
     emcmd: vi.fn(),
 }));
 
+vi.mock('execa', () => ({
+    execa: vi.fn(),
+}));
+
+vi.mock('@app/store/index.js', () => ({
+    getters: {
+        emhttp: vi.fn(),
+    },
+}));
+
+vi.mock('@app/store/services/state-file-loader.js', () => ({
+    loadStateFileSync: vi.fn(),
+}));
+
 describe('OnboardingInternalBootService', () => {
     beforeEach(() => {
         vi.clearAllMocks();
+        vi.mocked(getters.emhttp).mockReturnValue({
+            devices: [],
+            disks: [],
+        } as unknown as ReturnType<typeof getters.emhttp>);
     });
 
     it('runs the internal boot emcmd sequence and returns success', async () => {
@@ -20,12 +41,13 @@ describe('OnboardingInternalBootService', () => {
             poolName: 'cache',
             devices: ['disk-1', 'disk-2'],
             bootSizeMiB: 16384,
-            updateBios: true,
+            updateBios: false,
         });
 
         expect(result.ok).toBe(true);
         expect(result.code).toBe(0);
         expect(vi.mocked(emcmd)).toHaveBeenCalledTimes(5);
+        expect(vi.mocked(execa)).not.toHaveBeenCalled();
         expect(vi.mocked(emcmd)).toHaveBeenNthCalledWith(
             1,
             { debug: 'cmdCreatePool,cmdAssignDisk,cmdMakeBootable' },
@@ -57,6 +79,91 @@ describe('OnboardingInternalBootService', () => {
         );
     });
 
+    it('runs efibootmgr update flow when updateBios is requested', async () => {
+        vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
+        vi.mocked(getters.emhttp).mockReturnValue({
+            devices: [{ id: 'disk-1', device: 'sdb' }],
+            disks: [{ type: 'FLASH', device: 'sda' }],
+        } as unknown as ReturnType<typeof getters.emhttp>);
+        vi.mocked(execa)
+            .mockResolvedValueOnce({
+                stdout: 'Boot0001* Old Entry',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: 'Boot0003* Unraid Internal Boot - disk-1\nBoot0004* Unraid Flash',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>);
+        const service = new OnboardingInternalBootService();
+
+        const result = await service.createInternalBootPool({
+            poolName: 'cache',
+            devices: ['disk-1'],
+            bootSizeMiB: 16384,
+            updateBios: true,
+        });
+
+        expect(result.ok).toBe(true);
+        expect(result.code).toBe(0);
+        expect(vi.mocked(emcmd)).toHaveBeenCalledTimes(4);
+        expect(vi.mocked(loadStateFileSync)).not.toHaveBeenCalled();
+        expect(vi.mocked(execa)).toHaveBeenNthCalledWith(1, 'efibootmgr', [], { reject: false });
+        expect(vi.mocked(execa)).toHaveBeenNthCalledWith(2, 'efibootmgr', ['-b', '0001', '-B'], {
+            reject: false,
+        });
+        expect(vi.mocked(execa)).toHaveBeenNthCalledWith(
+            3,
+            'efibootmgr',
+            [
+                '-c',
+                '-d',
+                '/dev/sdb',
+                '-p',
+                '2',
+                '-L',
+                'Unraid Internal Boot - disk-1',
+                '-l',
+                '\\EFI\\BOOT\\BOOTX64.EFI',
+            ],
+            { reject: false }
+        );
+        expect(vi.mocked(execa)).toHaveBeenNthCalledWith(
+            4,
+            'efibootmgr',
+            ['-c', '-d', '/dev/sda', '-p', '1', '-L', 'Unraid Flash'],
+            { reject: false }
+        );
+        expect(vi.mocked(execa)).toHaveBeenNthCalledWith(5, 'efibootmgr', [], { reject: false });
+        expect(vi.mocked(execa)).toHaveBeenNthCalledWith(
+            6,
+            'efibootmgr',
+            ['-o', '0003,0004', '-n', '0003'],
+            { reject: false }
+        );
+    });
+
     it('returns validation error for duplicate devices', async () => {
         const service = new OnboardingInternalBootService();
 
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
index 04c92b473c..913784f791 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -1,13 +1,25 @@
 import { Injectable } from '@nestjs/common';
 
+import { execa } from 'execa';
+
 import type {
     CreateInternalBootPoolInput,
     OnboardingInternalBootResult,
 } from '@app/unraid-api/graph/resolvers/onboarding/onboarding.model.js';
 import { emcmd } from '@app/core/utils/clients/emcmd.js';
 import { withTimeout } from '@app/core/utils/misc/with-timeout.js';
+import { getters } from '@app/store/index.js';
+import { loadStateFileSync } from '@app/store/services/state-file-loader.js';
+import { StateFileKey } from '@app/store/types.js';
+import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model.js';
 
 const INTERNAL_BOOT_COMMAND_TIMEOUT_MS = 180000;
+const EFI_BOOT_PATH = '\\EFI\\BOOT\\BOOTX64.EFI';
+
+type EmhttpDeviceRecord = {
+    id?: unknown;
+    device?: unknown;
+};
 
 @Injectable()
 export class OnboardingInternalBootService {
@@ -35,15 +47,225 @@ export class OnboardingInternalBootService {
         return null;
     }
 
+    private shellQuote(value: string): string {
+        return `'${value.replaceAll("'", `'"'"'`)}'`;
+    }
+
+    private commandOutputLines(stdout: string, stderr: string): string[] {
+        const merged = [stdout, stderr].filter((value) => value.length > 0).join('\n');
+        if (merged.length === 0) {
+            return [];
+        }
+        return merged.split('\n');
+    }
+
+    private parseBootLabelMap(lines: string[]): Map<string, string> {
+        const labels = new Map<string, string>();
+        for (const line of lines) {
+            const match = line.match(/^Boot([0-9A-Fa-f]{4})\*?\s+(.+)$/);
+            if (!match) {
+                continue;
+            }
+            const bootNumber = match[1]?.toUpperCase();
+            const labelText = match[2]?.trim();
+            if (bootNumber && labelText) {
+                labels.set(labelText, bootNumber);
+            }
+        }
+        return labels;
+    }
+
+    private async runEfiBootMgr(
+        args: string[],
+        output: string[]
+    ): Promise<{
+        exitCode: number;
+        lines: string[];
+    }> {
+        const commandText = args.map((arg) => this.shellQuote(arg)).join(' ');
+        output.push(`Running: efibootmgr${commandText.length > 0 ? ` ${commandText}` : ''}`);
+        try {
+            const result = await execa('efibootmgr', args, { reject: false });
+            const lines = this.commandOutputLines(result.stdout, result.stderr);
+            if (lines.length > 0) {
+                output.push(...lines);
+            }
+            return {
+                exitCode: result.exitCode ?? 1,
+                lines,
+            };
+        } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            output.push(message);
+            return {
+                exitCode: 1,
+                lines: [],
+            };
+        }
+    }
+
+    private ensureEmhttpBootContext(): void {
+        const emhttpState = getters.emhttp();
+        const hasDevices = Array.isArray(emhttpState.devices) && emhttpState.devices.length > 0;
+        const hasDisks = Array.isArray(emhttpState.disks) && emhttpState.disks.length > 0;
+        if (!hasDevices) {
+            loadStateFileSync(StateFileKey.devs);
+        }
+        if (!hasDisks) {
+            loadStateFileSync(StateFileKey.disks);
+        }
+    }
+
+    private getDeviceMapFromEmhttpState(): Map<string, string> {
+        const emhttpState = getters.emhttp();
+        const rawDevices = Array.isArray(emhttpState.devices) ? emhttpState.devices : [];
+        const devicesById = new Map<string, string>();
+
+        for (const rawDevice of rawDevices) {
+            if (!rawDevice || typeof rawDevice !== 'object') {
+                continue;
+            }
+            const record = rawDevice as EmhttpDeviceRecord;
+            const id = typeof record.id === 'string' ? record.id.trim() : '';
+            const device = typeof record.device === 'string' ? record.device.trim() : '';
+            if (id.length > 0 && device.length > 0) {
+                devicesById.set(id, device);
+            }
+        }
+
+        return devicesById;
+    }
+
+    private getFlashDeviceFromEmhttpState(): string | null {
+        const emhttpState = getters.emhttp();
+        const emhttpDisks = Array.isArray(emhttpState.disks) ? emhttpState.disks : [];
+        for (const disk of emhttpDisks) {
+            if (!disk || typeof disk !== 'object') {
+                continue;
+            }
+            if (disk.type !== ArrayDiskType.FLASH) {
+                continue;
+            }
+            const device = typeof disk.device === 'string' ? disk.device.trim() : '';
+            if (device.length > 0) {
+                return device;
+            }
+        }
+        return null;
+    }
+
+    private async updateBiosBootEntries(devices: string[], output: string[]): Promise<void> {
+        this.ensureEmhttpBootContext();
+        const devsById = this.getDeviceMapFromEmhttpState();
+
+        const existingEntries = await this.runEfiBootMgr([], output);
+        const bootLabelMap =
+            existingEntries.exitCode === 0
+                ? this.parseBootLabelMap(existingEntries.lines)
+                : new Map<string, string>();
+
+        for (const bootNumber of bootLabelMap.values()) {
+            const deleteResult = await this.runEfiBootMgr(['-b', bootNumber, '-B'], output);
+            if (deleteResult.exitCode !== 0) {
+                output.push(
+                    `efibootmgr failed to delete boot entry ${bootNumber} (rc=${deleteResult.exitCode})`
+                );
+            }
+        }
+
+        for (const bootDevice of devices) {
+            const bootId = bootDevice;
+            let device = bootDevice;
+            if (device === '' || devsById.has(device)) {
+                const mapped = devsById.get(device);
+                if (mapped) {
+                    device = mapped;
+                }
+            }
+            if (device === '') {
+                continue;
+            }
+            const devicePath = `/dev/${device}`;
+            const createResult = await this.runEfiBootMgr(
+                [
+                    '-c',
+                    '-d',
+                    devicePath,
+                    '-p',
+                    '2',
+                    '-L',
+                    `Unraid Internal Boot - ${bootId}`,
+                    '-l',
+                    EFI_BOOT_PATH,
+                ],
+                output
+            );
+            if (createResult.exitCode !== 0) {
+                output.push(
+                    `efibootmgr failed for ${this.shellQuote(devicePath)} (rc=${createResult.exitCode})`
+                );
+            }
+        }
+
+        const flashDevice = this.getFlashDeviceFromEmhttpState();
+        if (flashDevice) {
+            const device = flashDevice.trim();
+            const devicePath = `/dev/${device}`;
+            const flashResult = await this.runEfiBootMgr(
+                ['-c', '-d', devicePath, '-p', '1', '-L', 'Unraid Flash'],
+                output
+            );
+            if (flashResult.exitCode !== 0) {
+                output.push(`efibootmgr failed for flash (rc=${flashResult.exitCode})`);
+            }
+        }
+
+        const currentEntries = await this.runEfiBootMgr([], output);
+        if (currentEntries.exitCode !== 0) {
+            return;
+        }
+
+        const labelMap = this.parseBootLabelMap(currentEntries.lines);
+        const desiredOrder: string[] = [];
+
+        for (const bootId of devices) {
+            const expectedLabel = `Unraid Internal Boot - ${bootId}`.toLowerCase();
+            for (const [labelText, bootNumber] of labelMap.entries()) {
+                if (labelText.toLowerCase().includes(expectedLabel)) {
+                    desiredOrder.push(bootNumber);
+                    break;
+                }
+            }
+        }
+
+        for (const [labelText, bootNumber] of labelMap.entries()) {
+            if (labelText.toLowerCase().includes('unraid flash')) {
+                desiredOrder.push(bootNumber);
+                break;
+            }
+        }
+
+        const uniqueOrder = [...new Set(desiredOrder.filter((entry) => entry.length > 0))];
+        if (uniqueOrder.length === 0) {
+            return;
+        }
+
+        const nextBoot = uniqueOrder[0];
+        const orderArgs = ['-o', uniqueOrder.join(',')];
+        if (nextBoot) {
+            orderArgs.push('-n', nextBoot);
+        }
+
+        const orderResult = await this.runEfiBootMgr(orderArgs, output);
+        if (orderResult.exitCode !== 0) {
+            output.push(`efibootmgr failed to set boot order (rc=${orderResult.exitCode})`);
+        }
+    }
+
     async createInternalBootPool(
         input: CreateInternalBootPoolInput
     ): Promise<OnboardingInternalBootResult> {
         const output: string[] = [];
-        if (input.updateBios) {
-            output.push(
-                'Note: updateBios was requested; this API path only runs emcmd pool setup commands.'
-            );
-        }
         if (input.reboot) {
             output.push(
                 'Note: reboot was requested; onboarding handles reboot separately after internal boot setup.'
@@ -100,6 +322,11 @@ export class OnboardingInternalBootService {
                 output
             );
 
+            if (input.updateBios) {
+                output.push('Applying BIOS boot entry updates...');
+                await this.updateBiosBootEntries(input.devices, output);
+            }
+
             return {
                 ok: true,
                 code: 0,

From 0000d3e4c8919cee027c66765aecf2bf6c4174f8 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 13:23:07 -0500
Subject: [PATCH 31/53] feat(onboarding): add sanitized error diagnostics to
 apply logs

- Purpose: improve Confirm & Apply troubleshooting without cluttering normal onboarding logs.

- Before: failures were mostly logged as short strings and several paths dropped request/response context entirely.

- Problem: support could not reliably diagnose network, GraphQL, timeout, or TLS issues from copied onboarding logs.

- Change: attach structured diagnostics to error log entries only, and render them in a collapsible Technical details block.

- How: added a reusable diagnostics builder that extracts request/response/status/error metadata, classifies error type, redacts sensitive keys, truncates oversized payloads, and is wired across onboarding apply failure paths (mutations, plugin/language install flows, refetches, and fatal catch).
---
 .../components/OnboardingConsole.vue          |  40 ++-
 .../composables/onboardingErrorDiagnostics.ts | 225 +++++++++++++++
 .../steps/OnboardingSummaryStep.vue           | 267 +++++++++++++++---
 3 files changed, 476 insertions(+), 56 deletions(-)
 create mode 100644 web/src/components/Onboarding/composables/onboardingErrorDiagnostics.ts

diff --git a/web/src/components/Onboarding/components/OnboardingConsole.vue b/web/src/components/Onboarding/components/OnboardingConsole.vue
index 66f4b9dff6..cf3f6510a3 100644
--- a/web/src/components/Onboarding/components/OnboardingConsole.vue
+++ b/web/src/components/Onboarding/components/OnboardingConsole.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup>
+import type { OnboardingErrorDiagnostics } from '@/components/Onboarding/composables/onboardingErrorDiagnostics';
+
 export interface LogEntry {
   message: string;
   type: 'info' | 'success' | 'error';
   timestamp?: number;
+  details?: OnboardingErrorDiagnostics;
 }
 
 defineProps<{
@@ -19,6 +22,8 @@ const formatTime = (ts?: number) => {
     second: '2-digit',
   });
 };
+
+const formatDetails = (details: OnboardingErrorDiagnostics) => JSON.stringify(details, null, 2);
 </script>
 
 <template>
@@ -46,18 +51,29 @@ const formatTime = (ts?: number) => {
         <span v-if="log.timestamp" class="shrink-0 text-gray-500 select-none"
           >[{{ formatTime(log.timestamp) }}]</span
         >
-        <span
-          :class="{
-            'text-gray-300': log.type === 'info',
-            'text-green-400': log.type === 'success',
-            'text-red-400': log.type === 'error',
-          }"
-        >
-          <span v-if="log.type === 'success'" class="mr-1">✓</span>
-          <span v-if="log.type === 'error'" class="mr-1">✗</span>
-          <span v-if="log.type === 'info'" class="mr-1">➜</span>
-          {{ log.message }}
-        </span>
+        <div class="min-w-0 flex-1">
+          <span
+            :class="{
+              'text-gray-300': log.type === 'info',
+              'text-green-400': log.type === 'success',
+              'text-red-400': log.type === 'error',
+            }"
+          >
+            <span v-if="log.type === 'success'" class="mr-1">✓</span>
+            <span v-if="log.type === 'error'" class="mr-1">✗</span>
+            <span v-if="log.type === 'info'" class="mr-1">➜</span>
+            {{ log.message }}
+          </span>
+          <details
+            v-if="log.type === 'error' && log.details"
+            class="mt-1 rounded border border-red-900/40 bg-red-950/30 px-2 py-1"
+          >
+            <summary class="cursor-pointer text-xs text-red-300">Technical details</summary>
+            <pre class="mt-1 overflow-x-auto text-xs break-words whitespace-pre-wrap text-red-200">{{
+              formatDetails(log.details)
+            }}</pre>
+          </details>
+        </div>
       </div>
       <!-- Blinking cursor at the end -->
       <div class="mt-1 animate-pulse text-gray-500">_</div>
diff --git a/web/src/components/Onboarding/composables/onboardingErrorDiagnostics.ts b/web/src/components/Onboarding/composables/onboardingErrorDiagnostics.ts
new file mode 100644
index 0000000000..e4a939cb2a
--- /dev/null
+++ b/web/src/components/Onboarding/composables/onboardingErrorDiagnostics.ts
@@ -0,0 +1,225 @@
+export type OnboardingErrorCategory = 'network' | 'graphql' | 'timeout' | 'tls' | 'unknown';
+
+export interface OnboardingErrorDiagnosticsRequest {
+  operation: string;
+  variables?: unknown;
+}
+
+export interface OnboardingErrorDiagnosticsError {
+  name: string;
+  code: string | number | null;
+  message: string;
+  category: OnboardingErrorCategory;
+  graphQLErrors?: string[];
+  networkError?: unknown;
+}
+
+export interface OnboardingErrorDiagnostics {
+  request: OnboardingErrorDiagnosticsRequest;
+  response: unknown | null;
+  status: number | null;
+  error: OnboardingErrorDiagnosticsError;
+}
+
+interface OnboardingErrorContext {
+  operation: string;
+  variables?: unknown;
+}
+
+const SENSITIVE_KEY_PATTERN = /(authorization|cookie|csrf|password|secret|token|api[_-]?key|session)/i;
+const MAX_DEPTH = 5;
+const MAX_OBJECT_KEYS = 40;
+const MAX_ARRAY_ITEMS = 20;
+const MAX_STRING_LENGTH = 500;
+
+const truncate = (value: string) => {
+  if (value.length <= MAX_STRING_LENGTH) {
+    return value;
+  }
+  return `${value.slice(0, MAX_STRING_LENGTH)}...[truncated]`;
+};
+
+const asRecord = (value: unknown): Record<string, unknown> | null => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return null;
+  }
+  return value as Record<string, unknown>;
+};
+
+const asString = (value: unknown): string | null => {
+  if (typeof value !== 'string') {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+};
+
+const asNumber = (value: unknown): number | null => {
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return value;
+  }
+  if (typeof value === 'string') {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed)) {
+      return parsed;
+    }
+  }
+  return null;
+};
+
+const sanitizeValue = (value: unknown, depth = 0): unknown => {
+  if (value === null || value === undefined) {
+    return value;
+  }
+  if (typeof value === 'string') {
+    return truncate(value);
+  }
+  if (typeof value === 'number' || typeof value === 'boolean') {
+    return value;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (typeof value === 'function') {
+    return '[Function]';
+  }
+  if (depth >= MAX_DEPTH) {
+    return '[Max depth reached]';
+  }
+  if (value instanceof Error) {
+    return {
+      name: value.name,
+      message: truncate(value.message),
+    };
+  }
+  if (Array.isArray(value)) {
+    const limitedItems = value.slice(0, MAX_ARRAY_ITEMS).map((item) => sanitizeValue(item, depth + 1));
+    if (value.length > MAX_ARRAY_ITEMS) {
+      limitedItems.push(`[${value.length - MAX_ARRAY_ITEMS} more items truncated]`);
+    }
+    return limitedItems;
+  }
+
+  const record = asRecord(value);
+  if (!record) {
+    return String(value);
+  }
+
+  const entries = Object.entries(record);
+  const limitedEntries = entries.slice(0, MAX_OBJECT_KEYS);
+  const sanitized: Record<string, unknown> = {};
+  for (const [key, nestedValue] of limitedEntries) {
+    if (SENSITIVE_KEY_PATTERN.test(key)) {
+      sanitized[key] = '[REDACTED]';
+      continue;
+    }
+    sanitized[key] = sanitizeValue(nestedValue, depth + 1);
+  }
+
+  if (entries.length > MAX_OBJECT_KEYS) {
+    sanitized.__truncatedKeys = `${entries.length - MAX_OBJECT_KEYS} keys omitted`;
+  }
+
+  return sanitized;
+};
+
+const inferCategory = (messageParts: string[], graphQLErrors: string[]): OnboardingErrorCategory => {
+  const normalized = messageParts.join(' ').toLowerCase();
+  if (
+    normalized.includes('self-signed') ||
+    normalized.includes('pkix') ||
+    normalized.includes('certificate')
+  ) {
+    return 'tls';
+  }
+  if (normalized.includes('timed out') || normalized.includes('timeout')) {
+    return 'timeout';
+  }
+  if (graphQLErrors.length > 0) {
+    return 'graphql';
+  }
+  if (
+    normalized.includes('failed to fetch') ||
+    normalized.includes('network') ||
+    normalized.includes('offline') ||
+    normalized.includes('load failed')
+  ) {
+    return 'network';
+  }
+  return 'unknown';
+};
+
+export const buildOnboardingErrorDiagnostics = (
+  caughtError: unknown,
+  context: OnboardingErrorContext
+): OnboardingErrorDiagnostics => {
+  const root = asRecord(caughtError);
+  const networkError = asRecord(root?.networkError);
+  const responseRecord = asRecord(networkError?.response);
+
+  const status =
+    asNumber(networkError?.statusCode) ??
+    asNumber(networkError?.status) ??
+    asNumber(responseRecord?.status);
+
+  const graphQLErrorMessages = Array.isArray(root?.graphQLErrors)
+    ? root.graphQLErrors
+        .map((entry) => {
+          const item = asRecord(entry);
+          return asString(item?.message);
+        })
+        .filter((message): message is string => Boolean(message))
+    : [];
+
+  const codeValue =
+    (typeof root?.code === 'string' || typeof root?.code === 'number' ? root.code : null) ??
+    (typeof networkError?.code === 'string' || typeof networkError?.code === 'number'
+      ? networkError.code
+      : null);
+
+  const directMessage =
+    (caughtError instanceof Error ? caughtError.message : null) ??
+    asString(root?.message) ??
+    asString(networkError?.message) ??
+    graphQLErrorMessages[0] ??
+    'Unknown error';
+
+  const name =
+    (caughtError instanceof Error ? caughtError.name : null) ?? asString(root?.name) ?? 'Error';
+
+  const responsePayload =
+    networkError?.result ??
+    responseRecord?.result ??
+    responseRecord?.data ??
+    responseRecord?.body ??
+    responseRecord?.bodyText ??
+    null;
+
+  const request: OnboardingErrorDiagnosticsRequest = {
+    operation: context.operation,
+  };
+  if (context.variables !== undefined) {
+    request.variables = sanitizeValue(context.variables);
+  }
+
+  const messageParts = [directMessage, asString(networkError?.message), ...graphQLErrorMessages].filter(
+    (part): part is string => Boolean(part)
+  );
+
+  return {
+    request,
+    response: responsePayload === null ? null : sanitizeValue(responsePayload),
+    status,
+    error: {
+      name,
+      code: codeValue,
+      message: truncate(directMessage),
+      category: inferCategory(messageParts, graphQLErrorMessages),
+      graphQLErrors:
+        graphQLErrorMessages.length > 0
+          ? graphQLErrorMessages.map((message) => truncate(message))
+          : undefined,
+      networkError: networkError ? sanitizeValue(networkError) : undefined,
+    },
+  };
+};
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index c6735996b5..0f3e6ae286 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -26,6 +26,7 @@ import {
 import { BrandButton, Dialog } from '@unraid/ui';
 import OnboardingConsole from '@/components/Onboarding/components/OnboardingConsole.vue';
 import { submitInternalBootCreation } from '@/components/Onboarding/composables/internalBoot';
+import { buildOnboardingErrorDiagnostics } from '@/components/Onboarding/composables/onboardingErrorDiagnostics';
 import usePluginInstaller, {
   INSTALL_OPERATION_TIMEOUT_CODE,
 } from '@/components/Onboarding/composables/usePluginInstaller';
@@ -47,6 +48,7 @@ import { useUpgradeOnboardingStore } from '@/components/Onboarding/store/upgrade
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue';
 
 import type { LogEntry } from '@/components/Onboarding/components/OnboardingConsole.vue';
+import type { OnboardingErrorDiagnostics } from '@/components/Onboarding/composables/onboardingErrorDiagnostics';
 
 import { useActivationCodeDataStore } from '~/components/Onboarding/store/activationCodeData';
 import { useOnboardingDraftStore } from '~/components/Onboarding/store/onboardingDraft';
@@ -252,8 +254,43 @@ const applyResultTitle = ref('');
 const applyResultMessage = ref('');
 const applyResultSeverity = ref<'success' | 'warning' | 'error'>('success');
 
-const addLog = (message: string, type: LogEntry['type'] = 'info') => {
-  logs.value.push({ message, type, timestamp: Date.now() });
+const addLog = (
+  message: string,
+  type: LogEntry['type'] = 'info',
+  details?: OnboardingErrorDiagnostics
+) => {
+  logs.value.push({ message, type, timestamp: Date.now(), details });
+};
+
+const getErrorMessage = (caughtError: unknown) => {
+  if (caughtError instanceof Error) {
+    const trimmedMessage = caughtError.message.trim();
+    if (trimmedMessage) {
+      return trimmedMessage;
+    }
+  }
+
+  if (typeof caughtError === 'string') {
+    const trimmedMessage = caughtError.trim();
+    if (trimmedMessage) {
+      return trimmedMessage;
+    }
+  }
+
+  return 'Unknown error';
+};
+
+interface OnboardingErrorLogContext {
+  operation: string;
+  variables?: unknown;
+}
+
+const addErrorLog = (message: string, caughtError: unknown, context: OnboardingErrorLogContext) => {
+  addLog(
+    `${message}: ${getErrorMessage(caughtError)}`,
+    'error',
+    buildOnboardingErrorDiagnostics(caughtError, context)
+  );
 };
 
 const showDiagnosticLogsInResultDialog = computed(
@@ -592,10 +629,17 @@ const handleComplete = async () => {
       promises.push(
         updateSystemTime({ input: { timeZone: targetCoreSettings.timeZone } })
           .then(() => addLog('TimeZone updated.', 'success'))
-          .catch((e) => {
+          .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addLog(`TimeZone request returned an error, continuing: ${e.message}`, 'info');
+            addErrorLog('TimeZone request returned an error, continuing', caughtError, {
+              operation: 'UpdateSystemTime',
+              variables: {
+                input: {
+                  timeZone: targetCoreSettings.timeZone,
+                },
+              },
+            });
           })
       );
     }
@@ -609,10 +653,17 @@ const handleComplete = async () => {
           sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
         })
           .then(() => addLog('Server Identity updated.', 'success'))
-          .catch((e) => {
+          .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addLog(`Server identity request returned an error, continuing: ${e.message}`, 'info');
+            addErrorLog('Server identity request returned an error, continuing', caughtError, {
+              operation: 'UpdateServerIdentity',
+              variables: {
+                name: targetCoreSettings.serverName,
+                comment: targetCoreSettings.serverDescription,
+                sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
+              },
+            });
           })
       );
     }
@@ -622,10 +673,15 @@ const handleComplete = async () => {
       promises.push(
         setTheme({ theme: targetCoreSettings.theme })
           .then(() => addLog('Theme updated.', 'success'))
-          .catch((e) => {
+          .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addLog(`Theme request returned an error, continuing: ${e.message}`, 'info');
+            addErrorLog('Theme request returned an error, continuing', caughtError, {
+              operation: 'SetTheme',
+              variables: {
+                theme: targetCoreSettings.theme,
+              },
+            });
           })
       );
     }
@@ -639,10 +695,15 @@ const handleComplete = async () => {
         addLog(`Setting Language to ${targetLocale}...`, 'info');
         await setLocale({ locale: targetLocale })
           .then(() => addLog('Language updated.', 'success'))
-          .catch((e) => {
+          .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addLog(`Language request returned an error, continuing: ${e.message}`, 'info');
+            addErrorLog('Language request returned an error, continuing', caughtError, {
+              operation: 'SetLocale',
+              variables: {
+                locale: targetLocale,
+              },
+            });
           });
       } else {
         const availableLanguages =
@@ -656,7 +717,16 @@ const handleComplete = async () => {
           hadWarnings = true;
           addLog(
             `Language pack metadata for ${targetLocale} is unavailable. Skipping locale change.`,
-            'error'
+            'error',
+            buildOnboardingErrorDiagnostics(
+              new Error(`Language pack metadata for ${targetLocale} is unavailable`),
+              {
+                operation: 'AvailableLanguages',
+                variables: {
+                  locale: targetLocale,
+                },
+              }
+            )
           );
         } else {
           addLog(`Installing language pack for ${language.name}...`, 'info');
@@ -672,27 +742,56 @@ const handleComplete = async () => {
               hadWarnings = true;
               addLog(
                 `Language pack installation did not succeed for ${language.name}. Keeping current locale.`,
-                'error'
+                'error',
+                buildOnboardingErrorDiagnostics(
+                  {
+                    message: `Language install operation ended with status ${installResult.status}`,
+                    code: installResult.status,
+                    networkError: {
+                      result: installResult,
+                    },
+                  },
+                  {
+                    operation: 'InstallLanguage',
+                    variables: {
+                      forced: false,
+                      name: language.name,
+                      url: language.url,
+                    },
+                  }
+                )
               );
             } else {
               addLog(`Language pack installed for ${language.name}.`, 'success');
               addLog(`Setting Language to ${targetLocale}...`, 'info');
               await setLocale({ locale: targetLocale })
                 .then(() => addLog('Language updated.', 'success'))
-                .catch((e) => {
+                .catch((caughtError: unknown) => {
                   hadNonOptimisticFailures = true;
                   hadWarnings = true;
-                  addLog(`Language request returned an error, continuing: ${e.message}`, 'info');
+                  addErrorLog('Language request returned an error, continuing', caughtError, {
+                    operation: 'SetLocale',
+                    variables: {
+                      locale: targetLocale,
+                    },
+                  });
                 });
             }
-          } catch (e: unknown) {
+          } catch (caughtError: unknown) {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            hadInstallTimeout = hadInstallTimeout || isInstallTimeoutError(e);
-            const errorMessage = e instanceof Error ? e.message : 'Unknown error';
-            addLog(
-              `Language pack installation failed for ${language.name}. Keeping current locale: ${errorMessage}`,
-              'error'
+            hadInstallTimeout = hadInstallTimeout || isInstallTimeoutError(caughtError);
+            addErrorLog(
+              `Language pack installation failed for ${language.name}. Keeping current locale`,
+              caughtError,
+              {
+                operation: 'InstallLanguage',
+                variables: {
+                  forced: false,
+                  name: language.name,
+                  url: language.url,
+                },
+              }
             );
           }
         }
@@ -702,9 +801,15 @@ const handleComplete = async () => {
     // 2. Install Plugins
     try {
       await refetchInstalledPlugins();
-    } catch {
+    } catch (caughtError: unknown) {
       hadWarnings = true;
-      addLog('Could not refresh installed plugins list. Continuing with current plugin state.', 'info');
+      addErrorLog(
+        'Could not refresh installed plugins list. Continuing with current plugin state.',
+        caughtError,
+        {
+          operation: 'InstalledUnraidPlugins',
+        }
+      );
     }
 
     const pluginsToInstall = pluginIdsToInstall.value;
@@ -735,16 +840,43 @@ const handleComplete = async () => {
             } else {
               hadNonOptimisticFailures = true;
               hadWarnings = true;
-              addLog(`${details.name} installation failed. Continuing.`, 'error');
+              addLog(
+                `${details.name} installation failed. Continuing.`,
+                'error',
+                buildOnboardingErrorDiagnostics(
+                  {
+                    message: `Plugin install operation ended with status ${installResult.status}`,
+                    code: installResult.status,
+                    networkError: {
+                      result: installResult,
+                    },
+                  },
+                  {
+                    operation: 'InstallPlugin',
+                    variables: {
+                      url: details.url,
+                      name: details.name,
+                      forced: false,
+                    },
+                  }
+                )
+              );
             }
-          } catch (e: unknown) {
+          } catch (caughtError: unknown) {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            hadInstallTimeout = hadInstallTimeout || isInstallTimeoutError(e);
-            const errorMessage = e instanceof Error ? e.message : 'Unknown error';
-            addLog(
-              `Plugin install reported an error for ${details.name}, continuing: ${errorMessage}`,
-              'info'
+            hadInstallTimeout = hadInstallTimeout || isInstallTimeoutError(caughtError);
+            addErrorLog(
+              `Plugin install reported an error for ${details.name}, continuing`,
+              caughtError,
+              {
+                operation: 'InstallPlugin',
+                variables: {
+                  url: details.url,
+                  name: details.name,
+                  forced: false,
+                },
+              }
             );
             // Continue installing others
           }
@@ -777,13 +909,44 @@ const handleComplete = async () => {
         } else {
           hadNonOptimisticFailures = true;
           hadWarnings = true;
-          addLog(`Internal boot setup returned an error: ${result.output}`, 'error');
+          addLog(
+            `Internal boot setup returned an error: ${result.output}`,
+            'error',
+            buildOnboardingErrorDiagnostics(
+              {
+                message: 'Internal boot setup returned ok=false',
+                code: result.code ?? null,
+                networkError: {
+                  status: result.code ?? null,
+                  result,
+                },
+              },
+              {
+                operation: 'CreateInternalBootPool',
+                variables: {
+                  poolName: selection.poolName,
+                  devices: selection.devices,
+                  bootSizeMiB: selection.bootSizeMiB,
+                  updateBios: selection.updateBios,
+                  reboot: false,
+                },
+              }
+            )
+          );
         }
-      } catch (e: unknown) {
+      } catch (caughtError: unknown) {
         hadNonOptimisticFailures = true;
         hadWarnings = true;
-        const errorMessage = e instanceof Error ? e.message : 'Unknown error';
-        addLog(`Internal boot setup failed: ${errorMessage}`, 'error');
+        addErrorLog('Internal boot setup failed', caughtError, {
+          operation: 'CreateInternalBootPool',
+          variables: {
+            poolName: selection.poolName,
+            devices: selection.devices,
+            bootSizeMiB: selection.bootSizeMiB,
+            updateBios: selection.updateBios,
+            reboot: false,
+          },
+        });
       } finally {
         clearInterval(internalBootProgressTimer);
       }
@@ -809,10 +972,20 @@ const handleComplete = async () => {
             'info'
           );
         }
-      } catch {
+      } catch (caughtError: unknown) {
         hadWarnings = true;
         hadSshVerificationUncertainty = true;
-        addLog('SSH update request returned an error, continuing (service may have restarted).', 'info');
+        addErrorLog(
+          'SSH update request returned an error, continuing (service may have restarted).',
+          caughtError,
+          {
+            operation: 'UpdateSshSettings',
+            variables: {
+              enabled: targetCoreSettings.useSsh,
+              port: 22,
+            },
+          }
+        );
       }
     }
 
@@ -824,13 +997,11 @@ const handleComplete = async () => {
       completionMarked = true;
       cleanupOnboardingStorage({ clearTemporaryBypassSessionState: true });
       addLog('Setup complete!', 'success');
-    } catch (e: unknown) {
+    } catch (caughtError: unknown) {
       hadWarnings = true;
-      const errorMessage = e instanceof Error ? e.message : 'Unknown error';
-      addLog(
-        `Could not mark onboarding complete right now (API may be offline): ${errorMessage}`,
-        'info'
-      );
+      addErrorLog('Could not mark onboarding complete right now (API may be offline)', caughtError, {
+        operation: 'CompleteOnboarding',
+      });
     }
 
     if (completionMarked) {
@@ -846,9 +1017,11 @@ const handleComplete = async () => {
             setTimeout(() => reject(new Error('Onboarding refresh timed out')), 1500)
           ),
         ]);
-      } catch {
+      } catch (caughtError: unknown) {
         hadWarnings = true;
-        addLog('Could not refresh onboarding state right now. Continuing.', 'info');
+        addErrorLog('Could not refresh onboarding state right now. Continuing.', caughtError, {
+          operation: 'OnboardingQuery',
+        });
       }
     } else {
       hadWarnings = true;
@@ -892,7 +1065,13 @@ const handleComplete = async () => {
     console.error('Failed to complete onboarding:', err);
     error.value = 'An error occurred during setup. Please check the logs.';
     isProcessing.value = false;
-    addLog('Setup failed.', 'error');
+    addLog(
+      'Setup failed.',
+      'error',
+      buildOnboardingErrorDiagnostics(err, {
+        operation: 'ConfirmAndApply',
+      })
+    );
     applyResultSeverity.value = 'error';
     applyResultTitle.value = 'Setup Failed';
     applyResultMessage.value =

From 2244d2d8f060b462c5e6d5c601cd783340095766 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 14:56:57 -0500
Subject: [PATCH 32/53] fix(onboarding): gate fresh-install modal on completion

- Purpose: Prevent fresh-install onboarding modal from reappearing after onboarding is already completed at the current version.

- Before: The fresh-install branch only checked registration state (ENOKEYFILE) and session modal flags, so completed systems could still auto-open onboarding.

- Problem: Users could see onboarding again even when onboarding-tracker indicated completion, especially across hostname/session contexts.

- After: Fresh-install auto-open now also requires onboarding to be incomplete, while force-open and temporary bypass testing controls remain intact.

- Implementation: activationCodeModal now reads onboarding completed state from upgradeOnboarding store and gates isVisible with !completed for the default fresh-install path.
---
 web/src/components/Onboarding/store/activationCodeModal.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/components/Onboarding/store/activationCodeModal.ts b/web/src/components/Onboarding/store/activationCodeModal.ts
index 00bb513553..eac35ee3ac 100644
--- a/web/src/components/Onboarding/store/activationCodeModal.ts
+++ b/web/src/components/Onboarding/store/activationCodeModal.ts
@@ -6,6 +6,7 @@ import { ACTIVATION_CODE_MODAL_HIDDEN_STORAGE_KEY, ONBOARDING_TEMP_BYPASS_STORAG
 
 import { useActivationCodeDataStore } from '~/components/Onboarding/store/activationCodeData';
 import { clearOnboardingDraftStorage } from '~/components/Onboarding/store/onboardingStorageCleanup';
+import { useOnboardingStore } from '~/components/Onboarding/store/upgradeOnboarding';
 import { useCallbackActionsStore } from '~/store/callbackActions';
 import { useServerStore } from '~/store/server';
 
@@ -53,6 +54,7 @@ export const useActivationCodeModalStore = defineStore('activationCodeModal', ()
   );
 
   const { isFreshInstall } = storeToRefs(useActivationCodeDataStore());
+  const { completed } = storeToRefs(useOnboardingStore());
   const { callbackData } = storeToRefs(useCallbackActionsStore());
   const { uptime } = storeToRefs(useServerStore());
 
@@ -132,6 +134,7 @@ export const useActivationCodeModalStore = defineStore('activationCodeModal', ()
    * 1. It's explicitly set to show (isHidden === false)
    * OR
    * 2. It's a fresh server install where no keyfile has been present before
+   *    and onboarding has not already been completed
    * 3. there's not callback data
    * 4. it's not been explicitly hidden (isHidden === null)
    *
@@ -148,7 +151,7 @@ export const useActivationCodeModalStore = defineStore('activationCodeModal', ()
     if (isHidden.value === false) {
       return true;
     }
-    return isHidden.value === null && isFreshInstall.value && !callbackData.value;
+    return isHidden.value === null && isFreshInstall.value && !completed.value && !callbackData.value;
   });
 
   watch(isTemporarilyBypassed, (active) => {

From 8600918ca797cde8f0907237270ba97cfbc9c057 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 14:57:11 -0500
Subject: [PATCH 33/53] fix(onboarding): swap reboot confirm warning copy

- Purpose: Align reboot confirmation messaging with intended priority of instructions in the final onboarding step.

- Before: The descriptive paragraph warned about not removing the flash drive, while the blockquote contained BIOS boot-order guidance.

- Problem: The visual emphasis and supporting text hierarchy were reversed from the intended UX content order.

- After: The description now contains BIOS boot-order guidance and the highlighted blockquote now contains the flash-drive warning.

- Implementation: Swapped the two existing strings in the confirm reboot popup without changing layout, styles, or behavior.
---
 .../Onboarding/steps/OnboardingNextStepsStep.vue          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
index f03511ed73..93ba17159e 100644
--- a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
@@ -362,13 +362,13 @@ const handleCancelReboot = () => {
           <div class="space-y-2">
             <h3 class="text-lg font-semibold">Confirm Reboot</h3>
             <p class="text-muted-foreground text-sm">
-              Please do NOT remove your Unraid flash drive until your server has finished rebooting into
-              Unraid again.
+              On some systems, you may need to manually change the BIOS boot order from the USB device to
+              the storage drive.
             </p>
             <blockquote class="border-s-4 border-yellow-500 bg-yellow-100 p-3">
               <p class="text-sm leading-relaxed text-yellow-900">
-                On some systems, you may need to manually change the BIOS boot order from the USB device
-                to the storage drive.
+                Please do NOT remove your Unraid flash drive until your server has finished rebooting
+                into Unraid again.
               </p>
             </blockquote>
           </div>

From c08c9fc2be099bc0e2ab6ba774e19a23f8129835 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 15:10:59 -0500
Subject: [PATCH 34/53] fix(onboarding): detect tailscale preview as installed

- Purpose: Prevent onboarding from offering/reinstalling Tailscale when the preview plugin variant is already installed.

- Before: Install detection only matched canonical plugin filenames from the configured plugin URL, so tailscale-preview.plg was not recognized as satisfying tailscale.

- Problem: Users with tailscale-preview.plg could still be prompted to install Tailscale and see inconsistent installed status in onboarding.

- After: Tailscale install detection treats both tailscale.plg and tailscale-preview.plg as installed across plugin selection and summary/apply flows.

- Implementation: Added alias-aware filename matching helpers and metadata in OnboardingPluginsStep and OnboardingSummaryStep, and replaced single-filename checks with alias-set matching.
---
 .../steps/OnboardingPluginsStep.vue           | 18 ++++++++-
 .../steps/OnboardingSummaryStep.vue           | 39 +++++++++++++++----
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue b/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
index 03fe956eb8..8aeccf92f7 100644
--- a/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
@@ -58,6 +58,19 @@ const availablePlugins: Plugin[] = [
   },
 ];
 
+const pluginInstalledFileAliases: Partial<Record<Plugin['id'], string[]>> = {
+  tailscale: ['tailscale-preview.plg'],
+};
+
+const getPluginInstallDetectionFileNames = (plugin: Plugin): Set<string> => {
+  const fileNames = new Set<string>([normalizePluginFileName(getPluginFileName(plugin.url))]);
+  const aliases = pluginInstalledFileAliases[plugin.id] ?? [];
+  for (const alias of aliases) {
+    fileNames.add(normalizePluginFileName(alias));
+  }
+  return fileNames;
+};
+
 const defaultSelectedPluginIds = new Set<string>(['community-apps', 'fix-common-problems']);
 
 // Respect persisted draft selections after first interaction with this step.
@@ -87,8 +100,9 @@ const applyInstalledPlugins = (installedPlugins: string[] | null | undefined) =>
   const nextInstalledIds = new Set<string>();
 
   for (const plugin of availablePlugins) {
-    const fileName = normalizePluginFileName(getPluginFileName(plugin.url));
-    if (installedFiles.has(fileName)) {
+    const fileNames = getPluginInstallDetectionFileNames(plugin);
+    const hasMatch = Array.from(fileNames).some((fileName) => installedFiles.has(fileName));
+    if (hasMatch) {
       nextInstalledIds.add(plugin.id);
     }
   }
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 0f3e6ae286..490586b0e4 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -391,7 +391,13 @@ const getPluginFileName = (url: string) => {
   return parts[parts.length - 1] ?? url;
 };
 
-const pluginMap: Record<string, { url: string; name: string }> = {
+type OnboardingPluginDetails = {
+  url: string;
+  name: string;
+  installedFileAliases?: string[];
+};
+
+const pluginMap: Record<string, OnboardingPluginDetails> = {
   'community-apps': {
     url: 'https://raw.githubusercontent.com/unraid/community.applications/master/plugins/community.applications.plg',
     name: 'Community Apps',
@@ -403,9 +409,18 @@ const pluginMap: Record<string, { url: string; name: string }> = {
   tailscale: {
     url: 'https://raw.githubusercontent.com/unraid/unraid-tailscale/main/plugin/tailscale.plg',
     name: 'Tailscale',
+    installedFileAliases: ['tailscale-preview.plg'],
   },
 };
 
+const getPluginInstallDetectionFileNames = (details: OnboardingPluginDetails): Set<string> => {
+  const fileNames = new Set<string>([normalizePluginFileName(getPluginFileName(details.url))]);
+  for (const alias of details.installedFileAliases ?? []) {
+    fileNames.add(normalizePluginFileName(alias));
+  }
+  return fileNames;
+};
+
 const installedPluginFileNames = computed(() => {
   const installed = installedPluginsResult.value?.installedUnraidPlugins ?? [];
   return new Set(installed.map((name) => normalizePluginFileName(name)));
@@ -415,8 +430,11 @@ const pluginIdsToInstall = computed(() => {
   return Array.from(draftStore.selectedPlugins).filter((pluginId) => {
     const details = pluginMap[pluginId];
     if (!details) return false;
-    const fileName = normalizePluginFileName(getPluginFileName(details.url));
-    return !installedPluginFileNames.value.has(fileName);
+    const detectionFileNames = getPluginInstallDetectionFileNames(details);
+    const isInstalled = Array.from(detectionFileNames).some((fileName) =>
+      installedPluginFileNames.value.has(fileName)
+    );
+    return !isInstalled;
   });
 });
 
@@ -424,8 +442,12 @@ const selectedPluginSummaries = computed(() => {
   return Array.from(draftStore.selectedPlugins).map((pluginId) => {
     const details = pluginMap[pluginId];
     const pluginName = details?.name ?? pluginId;
-    const pluginFileName = details ? normalizePluginFileName(getPluginFileName(details.url)) : null;
-    const installed = pluginFileName ? installedPluginFileNames.value.has(pluginFileName) : false;
+    const pluginDetectionFileNames = details ? getPluginInstallDetectionFileNames(details) : null;
+    const installed = pluginDetectionFileNames
+      ? Array.from(pluginDetectionFileNames).some((fileName) =>
+          installedPluginFileNames.value.has(fileName)
+        )
+      : false;
 
     return {
       id: pluginId,
@@ -819,8 +841,11 @@ const handleComplete = async () => {
       for (const pluginId of pluginsToInstall) {
         const details = pluginMap[pluginId];
         if (details) {
-          const fileName = normalizePluginFileName(getPluginFileName(details.url));
-          if (installedPluginFileNames.value.has(fileName)) {
+          const detectionFileNames = getPluginInstallDetectionFileNames(details);
+          const isInstalled = Array.from(detectionFileNames).some((fileName) =>
+            installedPluginFileNames.value.has(fileName)
+          );
+          if (isInstalled) {
             addLog(`${details.name} is already installed. Skipping.`, 'info');
             continue;
           }

From b67b5a86929385470601f0836e708991fcdb799a Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 15:34:15 -0500
Subject: [PATCH 35/53] feat(onboarding): move onboarding UI copy to i18n keys

- Purpose: make onboarding copy consistently translatable by routing user-facing text through locale keys.
- Before: onboarding had mixed hardcoded strings and translation lookups across steps, dialogs, console labels, and runtime status/result messaging.
- Problem: mixed patterns caused gaps in the translation system and made copy updates and localization coverage inconsistent.
- Change: replaced onboarding literals with / lookups, added structured  key groups (including internal boot, summary, modal, console, stepper, plugin labels, and missing license keys), and updated step metadata to use translation keys.
- How it works: components now resolve display text from , including dynamic/interpolated strings for validation, logs, warnings, and confirmations, while preserving existing English behavior.
---
 .../components/Onboarding/OnboardingModal.vue |  10 +-
 .../components/Onboarding/OnboardingSteps.vue |   4 +-
 .../components/OnboardingConsole.vue          |  13 +-
 web/src/components/Onboarding/stepRegistry.ts |   4 +-
 .../steps/OnboardingCoreSettingsStep.vue      |  22 +-
 .../steps/OnboardingInternalBootStep.vue      | 103 ++++---
 .../steps/OnboardingLicenseStep.vue           |  20 +-
 .../steps/OnboardingNextStepsStep.vue         |  18 +-
 .../steps/OnboardingOverviewStep.vue          |   6 +-
 .../steps/OnboardingPluginsStep.vue           |  62 ++--
 .../steps/OnboardingSummaryStep.vue           | 279 +++++++++---------
 web/src/locales/en.json                       | 197 +++++++++++++
 12 files changed, 488 insertions(+), 250 deletions(-)

diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 01bc6218d2..c3ce2a7afa 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -397,7 +397,7 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
       <button
         type="button"
         class="bg-background/90 text-foreground hover:bg-muted fixed top-5 right-8 z-20 rounded-md p-1.5 shadow-sm transition-colors"
-        aria-label="Close onboarding"
+        :aria-label="t('onboarding.modal.closeAriaLabel')"
         @click="handleExitIntent"
       >
         <XMarkIcon class="h-5 w-5" />
@@ -433,9 +433,9 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
   >
     <div class="space-y-6 p-2">
       <div class="space-y-2">
-        <h3 class="text-lg font-semibold">Exit onboarding?</h3>
+        <h3 class="text-lg font-semibold">{{ t('onboarding.modal.exit.title') }}</h3>
         <p class="text-muted-foreground text-sm">
-          You can skip setup now and continue from the dashboard later.
+          {{ t('onboarding.modal.exit.description') }}
         </p>
       </div>
 
@@ -445,14 +445,14 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
           class="border-muted text-foreground hover:bg-muted rounded-md border px-4 py-2 text-sm"
           @click="handleExitCancel"
         >
-          Keep onboarding
+          {{ t('onboarding.modal.exit.keepOnboarding') }}
         </button>
         <button
           type="button"
           class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
           @click="handleExitConfirm"
         >
-          Exit setup
+          {{ t('onboarding.modal.exit.confirm') }}
         </button>
       </div>
     </div>
diff --git a/web/src/components/Onboarding/OnboardingSteps.vue b/web/src/components/Onboarding/OnboardingSteps.vue
index 77935f18d4..8920103ae4 100644
--- a/web/src/components/Onboarding/OnboardingSteps.vue
+++ b/web/src/components/Onboarding/OnboardingSteps.vue
@@ -41,9 +41,11 @@ const { t } = useI18n();
 t('onboarding.activationSteps.activateLicense');
 t('onboarding.activationSteps.createAnUnraidNetAccountAnd');
 t('onboarding.pluginsStep.addHelpfulPlugins');
+t('onboarding.internalBootStep.stepTitle');
+t('onboarding.internalBootStep.stepDescription');
 
 const formatStep = (title: string, index: number, icon?: string): StepItem => ({
-  title: `Step ${index + 1}`,
+  title: t('onboarding.stepper.stepLabel', { number: index + 1 }),
   description: title,
   icon,
 });
diff --git a/web/src/components/Onboarding/components/OnboardingConsole.vue b/web/src/components/Onboarding/components/OnboardingConsole.vue
index cf3f6510a3..b6de268997 100644
--- a/web/src/components/Onboarding/components/OnboardingConsole.vue
+++ b/web/src/components/Onboarding/components/OnboardingConsole.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import { useI18n } from 'vue-i18n';
+
 import type { OnboardingErrorDiagnostics } from '@/components/Onboarding/composables/onboardingErrorDiagnostics';
 
 export interface LogEntry {
@@ -12,6 +14,7 @@ defineProps<{
   logs: LogEntry[];
   title?: string;
 }>();
+const { t } = useI18n();
 
 const formatTime = (ts?: number) => {
   if (!ts) return '';
@@ -33,7 +36,7 @@ const formatDetails = (details: OnboardingErrorDiagnostics) => JSON.stringify(de
     <!-- Header / Title -->
     <div class="flex items-center justify-between border-b border-gray-800 bg-gray-950 px-4 py-2">
       <span class="text-xs font-bold tracking-wider text-gray-400 uppercase">{{
-        title || 'Setup Console'
+        title || t('onboarding.console.title')
       }}</span>
       <div class="flex gap-1.5">
         <div class="h-2.5 w-2.5 rounded-full bg-red-500/20" />
@@ -46,7 +49,9 @@ const formatDetails = (details: OnboardingErrorDiagnostics) => JSON.stringify(de
     <div
       class="scrollbar-thin scrollbar-thumb-gray-700 scrollbar-track-transparent flex-1 space-y-1 overflow-y-auto p-4"
     >
-      <div v-if="logs.length === 0" class="text-gray-600 italic">Waiting...</div>
+      <div v-if="logs.length === 0" class="text-gray-600 italic">
+        {{ t('onboarding.console.waiting') }}
+      </div>
       <div v-for="(log, idx) in logs" :key="idx" class="flex gap-3">
         <span v-if="log.timestamp" class="shrink-0 text-gray-500 select-none"
           >[{{ formatTime(log.timestamp) }}]</span
@@ -68,7 +73,9 @@ const formatDetails = (details: OnboardingErrorDiagnostics) => JSON.stringify(de
             v-if="log.type === 'error' && log.details"
             class="mt-1 rounded border border-red-900/40 bg-red-950/30 px-2 py-1"
           >
-            <summary class="cursor-pointer text-xs text-red-300">Technical details</summary>
+            <summary class="cursor-pointer text-xs text-red-300">
+              {{ t('onboarding.console.technicalDetails') }}
+            </summary>
             <pre class="mt-1 overflow-x-auto text-xs break-words whitespace-pre-wrap text-red-200">{{
               formatDetails(log.details)
             }}</pre>
diff --git a/web/src/components/Onboarding/stepRegistry.ts b/web/src/components/Onboarding/stepRegistry.ts
index a9239b6517..ce0a9c054e 100644
--- a/web/src/components/Onboarding/stepRegistry.ts
+++ b/web/src/components/Onboarding/stepRegistry.ts
@@ -36,8 +36,8 @@ export const stepMetadata: Record<string, StepMetadataEntry> = {
     icon: 'i-heroicons-cog-6-tooth',
   },
   CONFIGURE_BOOT: {
-    titleKey: 'Setup Boot',
-    descriptionKey: 'Choose USB or storage drive boot',
+    titleKey: 'onboarding.internalBootStep.stepTitle',
+    descriptionKey: 'onboarding.internalBootStep.stepDescription',
     icon: 'i-heroicons-circle-stack',
   },
   ADD_PLUGINS: {
diff --git a/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue b/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue
index 5637ded013..503c4d81e7 100644
--- a/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue
@@ -37,7 +37,7 @@ const { completed: onboardingCompleted, loading: onboardingLoading } = storeToRe
 );
 
 const TRUSTED_DEFAULT_PROFILE = Object.freeze({
-  serverName: 'Tower',
+  serverName: t('onboarding.coreSettings.defaultServerName'),
   serverDescription: '',
   timeZone: 'UTC',
   theme: 'white',
@@ -85,7 +85,7 @@ const currentIp = ref<string>('');
 const localTld = ref<string>('local'); // Store localTld for hostname computation
 
 const currentHostname = computed(() => {
-  const name = serverName.value || 'Tower';
+  const name = serverName.value || t('onboarding.coreSettings.defaultServerName');
   const tld = localTld.value || 'local';
   return `${name.toLowerCase()}.${tld}`;
 });
@@ -320,12 +320,12 @@ watch(
 );
 
 // --- Theme Logic ---
-const themeItems = [
-  { value: 'white', label: 'White' },
-  { value: 'black', label: 'Black' },
-  { value: 'gray', label: 'Gray' },
-  { value: 'azure', label: 'Azure' },
-];
+const themeItems = computed(() => [
+  { value: 'white', label: t('onboarding.coreSettings.themeOptions.white') },
+  { value: 'black', label: t('onboarding.coreSettings.themeOptions.black') },
+  { value: 'gray', label: t('onboarding.coreSettings.themeOptions.gray') },
+  { value: 'azure', label: t('onboarding.coreSettings.themeOptions.azure') },
+]);
 
 const {
   result: languagesResult,
@@ -352,7 +352,7 @@ const languageItems = computed(() => {
 
   // Ensure en_US is there if fetch failed or weird input
   if (!items.find((i) => i.value === 'en_US')) {
-    items.unshift({ value: 'en_US', label: 'English' });
+    items.unshift({ value: 'en_US', label: t('onboarding.coreSettings.englishLanguageLabel') });
   }
   return items;
 });
@@ -466,7 +466,7 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
           <div class="space-y-1">
             <UInput
               v-model="serverName"
-              placeholder="Tower"
+              :placeholder="t('onboarding.coreSettings.serverNamePlaceholder')"
               maxlength="15"
               :disabled="isBusy"
               size="lg"
@@ -597,7 +597,7 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
         >
           <img
             :src="themeImages[selectedTheme] || themeImages['white']"
-            :alt="selectedTheme + ' theme preview'"
+            :alt="t('onboarding.coreSettings.themePreviewAlt', { theme: selectedTheme })"
             class="h-auto w-full object-cover"
           />
         </div>
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index cc18df85aa..2845f153b5 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -76,7 +76,7 @@ const BOOT_SIZE_PRESETS_MIB = [16384, 32768, 65536, 131072];
 
 const formatBytes = (bytes: number) => {
   if (!Number.isFinite(bytes) || bytes <= 0) {
-    return 'Unknown';
+    return t('onboarding.internalBootStep.unknownSize');
   }
 
   const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
@@ -271,19 +271,19 @@ const isPrimaryActionLoading = computed(
 
 const loadStatusMessage = computed(() => {
   if (contextError.value) {
-    return 'Unable to load internal boot options from API.';
+    return t('onboarding.internalBootStep.status.apiError');
   }
   if (isAlreadyOnInternalBoot.value) {
-    return 'Internal boot is already configured on this server.';
+    return t('onboarding.internalBootStep.status.alreadyConfigured');
   }
   if (!isArrayStopped.value) {
-    return 'Internal boot setup is only available while the array is stopped.';
+    return t('onboarding.internalBootStep.status.arrayNotStopped');
   }
   if (!isBootPoolEligible.value) {
-    return 'This server is not currently eligible for internal boot setup.';
+    return t('onboarding.internalBootStep.status.notEligible');
   }
   if (deviceOptions.value.length === 0) {
-    return 'No eligible devices were detected for internal boot setup.';
+    return t('onboarding.internalBootStep.status.noDevices');
   }
   return '';
 });
@@ -343,7 +343,10 @@ const visiblePresetOptions = computed(() => {
 
   return filtered.map((value) => ({
     value: String(value),
-    label: value === 0 ? 'Whole drive' : `${Math.round(value / 1024)} GB`,
+    label:
+      value === 0
+        ? t('onboarding.internalBootStep.bootSize.wholeDrive')
+        : t('onboarding.internalBootStep.bootSize.gbLabel', { size: Math.round(value / 1024) }),
   }));
 });
 
@@ -365,9 +368,9 @@ const bootSizeMiB = computed(() => {
 
 const bootSizeHelpText = computed(() => {
   if (maxCustomBootSizeGb.value === null) {
-    return 'Minimum is 4 GB.';
+    return t('onboarding.internalBootStep.bootSize.helpMinOnly');
   }
-  return `Minimum is 4 GB; maximum is ${maxCustomBootSizeGb.value} GB (50% of the smallest selected drive).`;
+  return t('onboarding.internalBootStep.bootSize.helpRange', { max: maxCustomBootSizeGb.value });
 });
 
 const normalizeSelectedDevices = (count: number) => {
@@ -450,59 +453,59 @@ const isDeviceDisabled = (deviceId: string, index: number) => {
 const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
   const normalizedPoolName = poolName.value.trim();
   if (!normalizedPoolName) {
-    formError.value = 'Pool name is required.';
+    formError.value = t('onboarding.internalBootStep.validation.poolRequired');
     return null;
   }
 
   if (reservedNames.value.has(normalizedPoolName)) {
-    formError.value = 'Do not use reserved names.';
+    formError.value = t('onboarding.internalBootStep.validation.poolReserved');
     return null;
   }
 
   if (shareNames.value.has(normalizedPoolName)) {
-    formError.value = 'Do not use user share names.';
+    formError.value = t('onboarding.internalBootStep.validation.poolShareName');
     return null;
   }
 
   if (existingPoolNames.value.has(normalizedPoolName)) {
-    formError.value = 'Pool name already exists.';
+    formError.value = t('onboarding.internalBootStep.validation.poolExists');
     return null;
   }
 
   const poolNamePattern = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
   if (!poolNamePattern.test(normalizedPoolName)) {
-    formError.value = 'Use only lowercase with no special characters or leading/trailing digits.';
+    formError.value = t('onboarding.internalBootStep.validation.poolFormat');
     return null;
   }
 
   if (slotCount.value < 1 || slotCount.value > 2) {
-    formError.value = 'Select 1 or 2 slots.';
+    formError.value = t('onboarding.internalBootStep.validation.slotCount');
     return null;
   }
 
   const devices = selectedDevices.value.slice(0, slotCount.value);
   if (devices.length !== slotCount.value || devices.some((device) => !device)) {
-    formError.value = 'Select a device for each slot.';
+    formError.value = t('onboarding.internalBootStep.validation.devicePerSlot');
     return null;
   }
 
   const uniqueDevices = new Set(devices);
   if (uniqueDevices.size !== devices.length) {
-    formError.value = 'Each selected device must be unique.';
+    formError.value = t('onboarding.internalBootStep.validation.uniqueDevices');
     return null;
   }
 
   const selectedBootSizeMiB = bootSizeMiB.value;
   if (selectedBootSizeMiB === null || !Number.isFinite(selectedBootSizeMiB)) {
-    formError.value = 'Select a valid boot reserved size.';
+    formError.value = t('onboarding.internalBootStep.validation.bootSizeRequired');
     return null;
   }
   if (selectedBootSizeMiB < 4096) {
-    formError.value = 'Boot reserved size must be at least 4 GB.';
+    formError.value = t('onboarding.internalBootStep.validation.bootSizeMin');
     return null;
   }
   if (maxBootSizeMiB.value !== null && selectedBootSizeMiB > maxBootSizeMiB.value) {
-    formError.value = 'Boot reserved size cannot exceed 50% of the smallest selected drive.';
+    formError.value = t('onboarding.internalBootStep.validation.bootSizeMax');
     return null;
   }
 
@@ -588,7 +591,7 @@ const handlePrimaryAction = () => {
   }
 
   if (!canConfigure.value) {
-    formError.value = loadStatusMessage.value || 'Internal boot setup is not available right now.';
+    formError.value = loadStatusMessage.value || t('onboarding.internalBootStep.status.unavailable');
     return;
   }
 
@@ -601,7 +604,7 @@ const handlePrimaryAction = () => {
   props.onComplete();
 };
 
-const primaryButtonText = computed(() => 'Continue');
+const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.continue'));
 </script>
 
 <template>
@@ -611,11 +614,12 @@ const primaryButtonText = computed(() => 'Continue');
         <div class="space-y-2">
           <div class="flex items-center gap-3">
             <CircleStackIcon class="text-primary h-8 w-8" />
-            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">Setup Boot</h2>
+            <h2 class="text-highlighted text-3xl font-extrabold tracking-tight uppercase">
+              {{ t('onboarding.internalBootStep.title') }}
+            </h2>
           </div>
           <p class="text-muted text-lg">
-            Choose how Unraid boots: USB/Flash Drive (default) or Storage Drive(s). You can switch to
-            Storage Drive boot later in the Unraid Dashboard.
+            {{ t('onboarding.internalBootStep.description') }}
           </p>
         </div>
       </div>
@@ -632,7 +636,9 @@ const primaryButtonText = computed(() => 'Continue');
             :disabled="isStepLocked"
           />
           <div class="space-y-1">
-            <p class="text-highlighted text-sm font-semibold">Use USB/Flash Drive to boot Unraid</p>
+            <p class="text-highlighted text-sm font-semibold">
+              {{ t('onboarding.internalBootStep.options.usb') }}
+            </p>
           </div>
         </label>
         <label
@@ -646,7 +652,9 @@ const primaryButtonText = computed(() => 'Continue');
             :disabled="isStepLocked"
           />
           <div class="space-y-1">
-            <p class="text-highlighted text-sm font-semibold">Use Storage Drive(s) to boot Unraid</p>
+            <p class="text-highlighted text-sm font-semibold">
+              {{ t('onboarding.internalBootStep.options.storage') }}
+            </p>
           </div>
         </label>
       </div>
@@ -657,7 +665,9 @@ const primaryButtonText = computed(() => 'Continue');
       >
         <div class="flex items-start gap-2">
           <ExclamationTriangleIcon class="mt-0.5 h-6 w-6 flex-shrink-0 text-yellow-700" />
-          <p class="text-sm leading-relaxed text-yellow-900">All selected devices will be formatted.</p>
+          <p class="text-sm leading-relaxed text-yellow-900">
+            {{ t('onboarding.internalBootStep.warning.selectedDevicesFormatted') }}
+          </p>
         </div>
       </blockquote>
 
@@ -665,7 +675,7 @@ const primaryButtonText = computed(() => 'Continue');
         v-if="isStorageBootSelected && isLoading"
         class="text-muted rounded-lg border border-dashed p-4 text-sm"
       >
-        Loading internal boot options...
+        {{ t('onboarding.internalBootStep.loadingOptions') }}
       </div>
 
       <div
@@ -678,7 +688,9 @@ const primaryButtonText = computed(() => 'Continue');
       <div v-else-if="isStorageBootSelected" class="space-y-5">
         <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
           <label class="space-y-2">
-            <span class="text-muted text-sm font-medium">Pool name</span>
+            <span class="text-muted text-sm font-medium">
+              {{ t('onboarding.internalBootStep.fields.poolName') }}
+            </span>
             <input
               v-model="poolName"
               type="text"
@@ -689,7 +701,9 @@ const primaryButtonText = computed(() => 'Continue');
           </label>
 
           <label class="space-y-2">
-            <span class="text-muted text-sm font-medium">Slots</span>
+            <span class="text-muted text-sm font-medium">
+              {{ t('onboarding.internalBootStep.fields.slots') }}
+            </span>
             <select
               v-model.number="slotCount"
               class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
@@ -701,15 +715,19 @@ const primaryButtonText = computed(() => 'Continue');
         </div>
 
         <div class="space-y-3">
-          <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Devices</h3>
+          <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">
+            {{ t('onboarding.internalBootStep.fields.devices') }}
+          </h3>
           <div v-for="index in slotCount" :key="index" class="space-y-2">
-            <label class="text-muted text-sm font-medium">Device {{ index }}</label>
+            <label class="text-muted text-sm font-medium">{{
+              t('onboarding.internalBootStep.fields.deviceSlot', { index })
+            }}</label>
             <select
               v-model="selectedDevices[index - 1]"
               class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
               :disabled="isBusy"
             >
-              <option value="">Select device</option>
+              <option value="">{{ t('onboarding.internalBootStep.fields.selectDevice') }}</option>
               <option
                 v-for="option in deviceOptions"
                 :key="option.value"
@@ -724,7 +742,9 @@ const primaryButtonText = computed(() => 'Continue');
 
         <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
           <label class="space-y-2">
-            <span class="text-muted text-sm font-medium">Boot reserved size</span>
+            <span class="text-muted text-sm font-medium">
+              {{ t('onboarding.internalBootStep.fields.bootReservedSize') }}
+            </span>
             <select
               v-model="bootSizePreset"
               class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
@@ -733,12 +753,14 @@ const primaryButtonText = computed(() => 'Continue');
               <option v-for="option in visiblePresetOptions" :key="option.value" :value="option.value">
                 {{ option.label }}
               </option>
-              <option value="custom">User defined</option>
+              <option value="custom">{{ t('onboarding.internalBootStep.bootSize.custom') }}</option>
             </select>
           </label>
 
           <label class="space-y-2">
-            <span class="text-muted text-sm font-medium">Custom size (GB)</span>
+            <span class="text-muted text-sm font-medium">
+              {{ t('onboarding.internalBootStep.fields.customSizeGb') }}
+            </span>
             <input
               v-model="customBootSizeGb"
               type="number"
@@ -759,14 +781,15 @@ const primaryButtonText = computed(() => 'Continue');
             class="accent-primary h-4 w-4"
             :disabled="isBusy"
           />
-          <span class="text-highlighted font-medium">Update BIOS boot order</span>
+          <span class="text-highlighted font-medium">{{
+            t('onboarding.internalBootStep.fields.updateBios')
+          }}</span>
         </label>
         <blockquote v-if="updateBios" class="border-s-4 border-yellow-500 bg-yellow-100 p-4">
           <div class="flex items-start gap-2">
             <ExclamationTriangleIcon class="mt-0.5 h-5 w-5 flex-shrink-0 text-yellow-700" />
             <p class="text-sm leading-relaxed text-yellow-900">
-              On some systems, you may need to manually change the BIOS boot order from the USB device to
-              the storage drive.
+              {{ t('onboarding.internalBootStep.warning.updateBios') }}
             </p>
           </div>
         </blockquote>
diff --git a/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue b/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue
index 2ad75e1e45..4140e24ab2 100644
--- a/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue
@@ -191,7 +191,11 @@ const doSkip = () => {
             }}</span>
             <div class="flex w-full items-center gap-2">
               <span class="text-highlighted truncate font-mono text-sm font-bold tracking-wide">
-                {{ isCodeRevealed ? activationCode?.code || 'None' : '••••••••••••••••' }}
+                {{
+                  isCodeRevealed
+                    ? activationCode?.code || lt('onboarding.licenseStep.labels.none', 'None')
+                    : '••••••••••••••••'
+                }}
               </span>
               <button
                 @click.stop="toggleCodeReveal"
@@ -279,7 +283,9 @@ const doSkip = () => {
 
       <!-- Panel -->
       <div class="bg-elevated border-muted relative w-full max-w-md rounded-xl border p-6 shadow-xl">
-        <h3 class="text-highlighted mb-2 text-lg font-bold">Contact Support</h3>
+        <h3 class="text-highlighted mb-2 text-lg font-bold">
+          {{ lt('onboarding.licenseStep.help.title', 'Contact Support') }}
+        </h3>
         <div class="text-muted space-y-4 text-sm">
           <p>
             {{
@@ -296,7 +302,7 @@ const doSkip = () => {
               target="_blank"
               rel="noopener noreferrer"
               class="text-primary hover:underline"
-              >unraid.net/support</a
+              >{{ lt('onboarding.licenseStep.help.supportUrlLabel', 'unraid.net/support') }}</a
             >
           </p>
           <div v-if="hasActivationCode">
@@ -351,8 +357,12 @@ const doSkip = () => {
           <!-- Message if user HAS a code -->
           <blockquote v-if="hasActivationCode" class="border-primary bg-primary/10 mb-4 border-l-4 p-4">
             <p class="text-highlighted text-sm leading-relaxed font-medium">
-              It appears you already have a license associated with this server. You can activate it now
-              for free to unlock all features.
+              {{
+                lt(
+                  'onboarding.licenseStep.skipDialog.licenseDetected',
+                  'It appears you already have a license associated with this server. You can activate it now for free to unlock all features.'
+                )
+              }}
             </p>
           </blockquote>
 
diff --git a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
index 93ba17159e..ab567c9734 100644
--- a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
@@ -50,7 +50,9 @@ const hasExtraLinks = computed(() => (partnerInfo.value?.partner?.extraLinks?.le
 const hasAnyPartnerContent = computed(() => hasCoreDocsLinks.value || hasExtraLinks.value);
 const showRebootButton = computed(() => draftStore.internalBootApplySucceeded);
 const primaryButtonText = computed(() =>
-  showRebootButton.value ? 'Reboot' : t('onboarding.nextSteps.continueToDashboard')
+  showRebootButton.value
+    ? t('onboarding.nextSteps.reboot')
+    : t('onboarding.nextSteps.continueToDashboard')
 );
 const showRebootWarningDialog = ref(false);
 
@@ -331,7 +333,7 @@ const handleCancelReboot = () => {
           <!-- Additional Links -->
           <div v-if="hasExtraLinks" class="border-primary/10 border-t pt-4">
             <p class="text-muted mb-2 text-xs font-bold tracking-wide uppercase opacity-70">
-              Additional Links
+              {{ t('onboarding.nextSteps.additionalLinks') }}
             </p>
             <ul class="space-y-1.5">
               <li v-for="link in partnerInfo?.partner?.extraLinks" :key="link.title">
@@ -360,15 +362,13 @@ const handleCancelReboot = () => {
       >
         <div class="space-y-6 p-2">
           <div class="space-y-2">
-            <h3 class="text-lg font-semibold">Confirm Reboot</h3>
+            <h3 class="text-lg font-semibold">{{ t('onboarding.nextSteps.confirmReboot.title') }}</h3>
             <p class="text-muted-foreground text-sm">
-              On some systems, you may need to manually change the BIOS boot order from the USB device to
-              the storage drive.
+              {{ t('onboarding.nextSteps.confirmReboot.description') }}
             </p>
             <blockquote class="border-s-4 border-yellow-500 bg-yellow-100 p-3">
               <p class="text-sm leading-relaxed text-yellow-900">
-                Please do NOT remove your Unraid flash drive until your server has finished rebooting
-                into Unraid again.
+                {{ t('onboarding.nextSteps.confirmReboot.warning') }}
               </p>
             </blockquote>
           </div>
@@ -378,14 +378,14 @@ const handleCancelReboot = () => {
               class="border-muted hover:bg-muted rounded-md border px-4 py-2 text-sm font-medium"
               @click="handleCancelReboot"
             >
-              Cancel
+              {{ t('common.cancel') }}
             </button>
             <button
               type="button"
               class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
               @click="handleConfirmReboot"
             >
-              I Understand
+              {{ t('onboarding.nextSteps.confirmReboot.confirm') }}
             </button>
           </div>
         </div>
diff --git a/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue b/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue
index 04cd390a67..880ca03d90 100644
--- a/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue
@@ -78,8 +78,8 @@ const graphicSrc = computed(() =>
 
 const graphicAlt = computed(() =>
   isPartnerLogo.value && !partnerGraphicLoadFailed.value
-    ? (partnerInfo.value?.partner?.name ?? 'Partner Logo')
-    : 'Limitless Possibilities'
+    ? (partnerInfo.value?.partner?.name ?? t('onboarding.overviewStep.partnerLogoAlt'))
+    : t('onboarding.overviewStep.defaultGraphicAlt')
 );
 
 const defaultWelcomeTitle = computed(() => {
@@ -317,7 +317,7 @@ const openDocs = () => {
             class="text-muted hover:text-toned text-sm font-medium transition-colors"
             :disabled="isBusy"
           >
-            Skip Setup
+            {{ t('onboarding.overviewStep.skipSetup') }}
           </button>
 
           <BrandButton
diff --git a/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue b/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
index 8aeccf92f7..a27359be92 100644
--- a/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
@@ -23,13 +23,6 @@ const props = defineProps<Props>();
 const { t } = useI18n();
 const draftStore = useOnboardingDraftStore();
 
-interface Plugin {
-  id: string;
-  name: string;
-  description: string;
-  url: string;
-}
-
 const normalizePluginFileName = (value: string) => value.trim().toLowerCase();
 
 const getPluginFileName = (url: string) => {
@@ -37,32 +30,35 @@ const getPluginFileName = (url: string) => {
   return parts[parts.length - 1] ?? url;
 };
 
-const availablePlugins: Plugin[] = [
-  {
-    id: 'community-apps',
-    name: 'Community Apps',
-    description: 'The essential app store for Unraid. Access thousands of applications.',
-    url: 'https://raw.githubusercontent.com/unraid/community.applications/master/plugins/community.applications.plg',
-  },
-  {
-    id: 'fix-common-problems',
-    name: 'Fix Common Problems',
-    description: 'Diagnostic tool to help you identify and resolve configuration issues.',
-    url: 'https://raw.githubusercontent.com/unraid/fix.common.problems/master/plugins/fix.common.problems.plg',
-  },
-  {
-    id: 'tailscale',
-    name: 'Tailscale',
-    description: 'Zero-config VPN. Securely access your server from anywhere.',
-    url: 'https://raw.githubusercontent.com/unraid/unraid-tailscale/main/plugin/tailscale.plg',
-  },
-];
+const availablePlugins = computed(
+  () =>
+    [
+      {
+        id: 'community-apps',
+        name: t('onboarding.pluginsStep.plugins.communityApps.name'),
+        description: t('onboarding.pluginsStep.plugins.communityApps.description'),
+        url: 'https://raw.githubusercontent.com/unraid/community.applications/master/plugins/community.applications.plg',
+      },
+      {
+        id: 'fix-common-problems',
+        name: t('onboarding.pluginsStep.plugins.fixCommonProblems.name'),
+        description: t('onboarding.pluginsStep.plugins.fixCommonProblems.description'),
+        url: 'https://raw.githubusercontent.com/unraid/fix.common.problems/master/plugins/fix.common.problems.plg',
+      },
+      {
+        id: 'tailscale',
+        name: t('onboarding.pluginsStep.plugins.tailscale.name'),
+        description: t('onboarding.pluginsStep.plugins.tailscale.description'),
+        url: 'https://raw.githubusercontent.com/unraid/unraid-tailscale/main/plugin/tailscale.plg',
+      },
+    ] as const
+);
 
-const pluginInstalledFileAliases: Partial<Record<Plugin['id'], string[]>> = {
+const pluginInstalledFileAliases: Partial<Record<string, string[]>> = {
   tailscale: ['tailscale-preview.plg'],
 };
 
-const getPluginInstallDetectionFileNames = (plugin: Plugin): Set<string> => {
+const getPluginInstallDetectionFileNames = (plugin: { id: string; url: string }): Set<string> => {
   const fileNames = new Set<string>([normalizePluginFileName(getPluginFileName(plugin.url))]);
   const aliases = pluginInstalledFileAliases[plugin.id] ?? [];
   for (const alias of aliases) {
@@ -99,7 +95,7 @@ const applyInstalledPlugins = (installedPlugins: string[] | null | undefined) =>
   const installedFiles = new Set(installedPlugins.map((name) => normalizePluginFileName(name)));
   const nextInstalledIds = new Set<string>();
 
-  for (const plugin of availablePlugins) {
+  for (const plugin of availablePlugins.value) {
     const fileNames = getPluginInstallDetectionFileNames(plugin);
     const hasMatch = Array.from(fileNames).some((fileName) => installedFiles.has(fileName));
     if (hasMatch) {
@@ -157,7 +153,7 @@ const handlePrimaryAction = async () => {
   props.onComplete();
 };
 
-const primaryButtonText = computed(() => 'Next Step');
+const primaryButtonText = computed(() => t('onboarding.pluginsStep.nextStep'));
 </script>
 
 <template>
@@ -218,7 +214,9 @@ const primaryButtonText = computed(() => 'Next Step');
               'focus:ring-primary relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
             ]"
           >
-            <span class="sr-only">Enable {{ plugin.name }}</span>
+            <span class="sr-only">{{
+              t('onboarding.pluginsStep.enablePluginAria', { name: plugin.name })
+            }}</span>
             <span
               aria-hidden="true"
               :class="[
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 490586b0e4..d673fce79c 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -110,7 +110,11 @@ const currentTimeZone = computed(() => {
 });
 
 const serverName = computed(() => {
-  return draftStore.serverName || coreSettingsResult.value?.vars?.name || 'Tower';
+  return (
+    draftStore.serverName ||
+    coreSettingsResult.value?.vars?.name ||
+    t('onboarding.coreSettings.defaultServerName')
+  );
 });
 
 const activationSystemModel = computed(() => activationCode.value?.system?.model?.trim() || undefined);
@@ -131,7 +135,9 @@ const selectedBootMode = computed(() =>
   draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
 );
 const bootModeLabel = computed(() =>
-  selectedBootMode.value === 'storage' ? 'Storage Drive(s)' : 'USB/Flash Drive'
+  selectedBootMode.value === 'storage'
+    ? t('onboarding.summaryStep.bootConfig.bootMethodStorage')
+    : t('onboarding.summaryStep.bootConfig.bootMethodUsb')
 );
 
 const internalBootSelection = computed(() => {
@@ -145,14 +151,14 @@ const hasInternalBootSelection = computed(() => Boolean(internalBootSelection.va
 
 const formatBootSize = (bootSizeMiB: number) => {
   if (bootSizeMiB === 0) {
-    return 'Whole drive';
+    return t('onboarding.internalBootStep.bootSize.wholeDrive');
   }
-  return `${Math.round(bootSizeMiB / 1024)} GB`;
+  return t('onboarding.internalBootStep.bootSize.gbLabel', { size: Math.round(bootSizeMiB / 1024) });
 };
 
 const formatBytes = (bytes: number) => {
   if (!Number.isFinite(bytes) || bytes <= 0) {
-    return 'Unknown';
+    return t('onboarding.internalBootStep.unknownSize');
   }
 
   const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
@@ -253,6 +259,8 @@ const showBootDriveWarningDialog = ref(false);
 const applyResultTitle = ref('');
 const applyResultMessage = ref('');
 const applyResultSeverity = ref<'success' | 'warning' | 'error'>('success');
+const summaryT = (key: string, values?: Record<string, unknown>) =>
+  t(`onboarding.summaryStep.${key}`, values ?? {});
 
 const addLog = (
   message: string,
@@ -277,7 +285,7 @@ const getErrorMessage = (caughtError: unknown) => {
     }
   }
 
-  return 'Unknown error';
+  return summaryT('errors.unknownError');
 };
 
 interface OnboardingErrorLogContext {
@@ -359,7 +367,7 @@ const normalizeThemeName = (value?: string | null): ThemeName => {
 };
 
 const TRUSTED_DEFAULT_PROFILE = Object.freeze({
-  serverName: 'Tower',
+  serverName: t('onboarding.coreSettings.defaultServerName'),
   serverDescription: '',
   timeZone: 'UTC',
   theme: ThemeName.WHITE,
@@ -400,15 +408,15 @@ type OnboardingPluginDetails = {
 const pluginMap: Record<string, OnboardingPluginDetails> = {
   'community-apps': {
     url: 'https://raw.githubusercontent.com/unraid/community.applications/master/plugins/community.applications.plg',
-    name: 'Community Apps',
+    name: t('onboarding.pluginsStep.plugins.communityApps.name'),
   },
   'fix-common-problems': {
     url: 'https://raw.githubusercontent.com/unraid/fix.common.problems/master/plugins/fix.common.problems.plg',
-    name: 'Fix Common Problems',
+    name: t('onboarding.pluginsStep.plugins.fixCommonProblems.name'),
   },
   tailscale: {
     url: 'https://raw.githubusercontent.com/unraid/unraid-tailscale/main/plugin/tailscale.plg',
-    name: 'Tailscale',
+    name: t('onboarding.pluginsStep.plugins.tailscale.name'),
     installedFileAliases: ['tailscale-preview.plg'],
   },
 };
@@ -526,7 +534,7 @@ const activationStatus = computed(() => {
 
   if (state === 'ENOKEYFILE') {
     return {
-      label: 'Unregistered',
+      label: summaryT('activation.unregistered'),
       valid: false,
       icon: ExclamationTriangleIcon,
       color: 'text-yellow-500',
@@ -535,15 +543,15 @@ const activationStatus = computed(() => {
 
   // Error Mappings
   const errorMap: Record<string, string> = {
-    ENOKEYFILE1: 'Key Missing',
-    ENOKEYFILE2: 'Validation Error',
-    EGUID: 'GUID Mismatch',
-    EEXPIRED: 'Trial Expired',
-    EBLACKLISTED: 'Blacklisted',
+    ENOKEYFILE1: summaryT('activation.errors.keyMissing'),
+    ENOKEYFILE2: summaryT('activation.errors.validationError'),
+    EGUID: summaryT('activation.errors.guidMismatch'),
+    EEXPIRED: summaryT('activation.errors.trialExpired'),
+    EBLACKLISTED: summaryT('activation.errors.blacklisted'),
   };
 
   if (typeof state === 'string' && state.startsWith('E')) {
-    const label = errorMap[state] || `Error: ${state}`;
+    const label = errorMap[state] || summaryT('activation.errors.generic', { state });
     return {
       label,
       valid: false,
@@ -553,7 +561,7 @@ const activationStatus = computed(() => {
   }
 
   return {
-    label: state || 'Unknown',
+    label: state || summaryT('activation.unknown'),
     valid: false,
     icon: ExclamationCircleIcon,
     color: 'text-gray-400',
@@ -566,7 +574,7 @@ const handleComplete = async () => {
   }
   showBootDriveWarningDialog.value = false;
   if (!canApply.value) {
-    error.value = 'Settings are still loading. Please wait a moment and try again.';
+    error.value = summaryT('status.settingsStillLoading');
     return;
   }
 
@@ -577,10 +585,10 @@ const handleComplete = async () => {
   error.value = null;
   logs.value = []; // Clear logs
 
-  addLog('Starting configuration...', 'info');
+  addLog(summaryT('logs.startingConfiguration'), 'info');
   draftStore.setInternalBootApplySucceeded(false);
   if (showApplyReadinessWarning.value) {
-    addLog('Baseline settings unavailable. Continuing in best-effort mode.', 'info');
+    addLog(summaryT('logs.baselineUnavailable'), 'info');
   }
 
   try {
@@ -623,13 +631,10 @@ const handleComplete = async () => {
 
     if (!baselineLoaded) {
       hadWarnings = true;
-      addLog(
-        'Baseline settings unavailable. Applying trusted defaults + draft values without diff checks.',
-        'info'
-      );
+      addLog(summaryT('logs.baselineFallback'), 'info');
     }
     if (shouldApplyPartnerSysModel) {
-      addLog('Applying partner customizations...', 'info');
+      addLog(summaryT('logs.applyingPartnerCustomizations'), 'info');
     }
 
     const shouldApplyTimeZone = baselineLoaded ? targetCoreSettings.timeZone !== currentTimezone : true;
@@ -643,18 +648,18 @@ const handleComplete = async () => {
     const shouldApplySsh = baselineLoaded ? targetCoreSettings.useSsh !== currentSsh : true;
 
     if (!hasAnyChangesToApply.value) {
-      addLog('No settings changed. Skipping configuration mutations.', 'info');
+      addLog(summaryT('logs.noChanges'), 'info');
     }
 
     if (shouldApplyTimeZone) {
-      addLog(`Setting TimeZone to ${targetCoreSettings.timeZone}...`, 'info');
+      addLog(summaryT('logs.settingTimezone', { timeZone: targetCoreSettings.timeZone }), 'info');
       promises.push(
         updateSystemTime({ input: { timeZone: targetCoreSettings.timeZone } })
-          .then(() => addLog('TimeZone updated.', 'success'))
+          .then(() => addLog(summaryT('logs.timezoneUpdated'), 'success'))
           .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addErrorLog('TimeZone request returned an error, continuing', caughtError, {
+            addErrorLog(summaryT('logs.timezoneErrorContinue'), caughtError, {
               operation: 'UpdateSystemTime',
               variables: {
                 input: {
@@ -667,18 +672,18 @@ const handleComplete = async () => {
     }
 
     if (shouldApplyServerIdentity) {
-      addLog(`Updating Server Identity to ${targetCoreSettings.serverName}...`, 'info');
+      addLog(summaryT('logs.updatingServerIdentity', { name: targetCoreSettings.serverName }), 'info');
       promises.push(
         updateServerIdentity({
           name: targetCoreSettings.serverName,
           comment: targetCoreSettings.serverDescription,
           sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
         })
-          .then(() => addLog('Server Identity updated.', 'success'))
+          .then(() => addLog(summaryT('logs.serverIdentityUpdated'), 'success'))
           .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addErrorLog('Server identity request returned an error, continuing', caughtError, {
+            addErrorLog(summaryT('logs.serverIdentityErrorContinue'), caughtError, {
               operation: 'UpdateServerIdentity',
               variables: {
                 name: targetCoreSettings.serverName,
@@ -691,14 +696,14 @@ const handleComplete = async () => {
     }
 
     if (shouldApplyTheme) {
-      addLog(`Setting Theme to ${targetCoreSettings.theme}...`, 'info');
+      addLog(summaryT('logs.settingTheme', { theme: targetCoreSettings.theme }), 'info');
       promises.push(
         setTheme({ theme: targetCoreSettings.theme })
-          .then(() => addLog('Theme updated.', 'success'))
+          .then(() => addLog(summaryT('logs.themeUpdated'), 'success'))
           .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addErrorLog('Theme request returned an error, continuing', caughtError, {
+            addErrorLog(summaryT('logs.themeErrorContinue'), caughtError, {
               operation: 'SetTheme',
               variables: {
                 theme: targetCoreSettings.theme,
@@ -714,13 +719,13 @@ const handleComplete = async () => {
     if (shouldApplyLocale) {
       const targetLocale = targetCoreSettings.locale;
       if (targetLocale === 'en_US') {
-        addLog(`Setting Language to ${targetLocale}...`, 'info');
+        addLog(summaryT('logs.settingLanguage', { locale: targetLocale }), 'info');
         await setLocale({ locale: targetLocale })
-          .then(() => addLog('Language updated.', 'success'))
+          .then(() => addLog(summaryT('logs.languageUpdated'), 'success'))
           .catch((caughtError: unknown) => {
             hadNonOptimisticFailures = true;
             hadWarnings = true;
-            addErrorLog('Language request returned an error, continuing', caughtError, {
+            addErrorLog(summaryT('logs.languageErrorContinue'), caughtError, {
               operation: 'SetLocale',
               variables: {
                 locale: targetLocale,
@@ -738,10 +743,10 @@ const handleComplete = async () => {
           hadNonOptimisticFailures = true;
           hadWarnings = true;
           addLog(
-            `Language pack metadata for ${targetLocale} is unavailable. Skipping locale change.`,
+            summaryT('logs.languageMetadataUnavailable', { locale: targetLocale }),
             'error',
             buildOnboardingErrorDiagnostics(
-              new Error(`Language pack metadata for ${targetLocale} is unavailable`),
+              new Error(summaryT('logs.languageMetadataUnavailable', { locale: targetLocale })),
               {
                 operation: 'AvailableLanguages',
                 variables: {
@@ -751,7 +756,7 @@ const handleComplete = async () => {
             )
           );
         } else {
-          addLog(`Installing language pack for ${language.name}...`, 'info');
+          addLog(summaryT('logs.installingLanguagePack', { name: language.name }), 'info');
           try {
             const installResult = await installLanguage({
               forced: false,
@@ -763,7 +768,7 @@ const handleComplete = async () => {
               hadNonOptimisticFailures = true;
               hadWarnings = true;
               addLog(
-                `Language pack installation did not succeed for ${language.name}. Keeping current locale.`,
+                summaryT('logs.languageInstallDidNotSucceed', { name: language.name }),
                 'error',
                 buildOnboardingErrorDiagnostics(
                   {
@@ -784,14 +789,14 @@ const handleComplete = async () => {
                 )
               );
             } else {
-              addLog(`Language pack installed for ${language.name}.`, 'success');
-              addLog(`Setting Language to ${targetLocale}...`, 'info');
+              addLog(summaryT('logs.languagePackInstalled', { name: language.name }), 'success');
+              addLog(summaryT('logs.settingLanguage', { locale: targetLocale }), 'info');
               await setLocale({ locale: targetLocale })
-                .then(() => addLog('Language updated.', 'success'))
+                .then(() => addLog(summaryT('logs.languageUpdated'), 'success'))
                 .catch((caughtError: unknown) => {
                   hadNonOptimisticFailures = true;
                   hadWarnings = true;
-                  addErrorLog('Language request returned an error, continuing', caughtError, {
+                  addErrorLog(summaryT('logs.languageErrorContinue'), caughtError, {
                     operation: 'SetLocale',
                     variables: {
                       locale: targetLocale,
@@ -804,7 +809,7 @@ const handleComplete = async () => {
             hadWarnings = true;
             hadInstallTimeout = hadInstallTimeout || isInstallTimeoutError(caughtError);
             addErrorLog(
-              `Language pack installation failed for ${language.name}. Keeping current locale`,
+              summaryT('logs.languageInstallFailedKeepLocale', { name: language.name }),
               caughtError,
               {
                 operation: 'InstallLanguage',
@@ -825,18 +830,14 @@ const handleComplete = async () => {
       await refetchInstalledPlugins();
     } catch (caughtError: unknown) {
       hadWarnings = true;
-      addErrorLog(
-        'Could not refresh installed plugins list. Continuing with current plugin state.',
-        caughtError,
-        {
-          operation: 'InstalledUnraidPlugins',
-        }
-      );
+      addErrorLog(summaryT('logs.refreshPluginsFailedContinue'), caughtError, {
+        operation: 'InstalledUnraidPlugins',
+      });
     }
 
     const pluginsToInstall = pluginIdsToInstall.value;
     if (pluginsToInstall.length > 0) {
-      addLog(`Installing ${pluginsToInstall.length} plugins...`, 'info');
+      addLog(summaryT('logs.installingPlugins', { count: pluginsToInstall.length }), 'info');
 
       for (const pluginId of pluginsToInstall) {
         const details = pluginMap[pluginId];
@@ -846,11 +847,11 @@ const handleComplete = async () => {
             installedPluginFileNames.value.has(fileName)
           );
           if (isInstalled) {
-            addLog(`${details.name} is already installed. Skipping.`, 'info');
+            addLog(summaryT('logs.pluginAlreadyInstalled', { name: details.name }), 'info');
             continue;
           }
 
-          addLog(`Installing ${details.name}...`, 'info');
+          addLog(summaryT('logs.installingPlugin', { name: details.name }), 'info');
           try {
             const installResult = await installPlugin({
               url: details.url,
@@ -861,12 +862,12 @@ const handleComplete = async () => {
               },
             });
             if (installResult.status === PluginInstallStatus.SUCCEEDED) {
-              addLog(`${details.name} installed.`, 'success');
+              addLog(summaryT('logs.pluginInstalled', { name: details.name }), 'success');
             } else {
               hadNonOptimisticFailures = true;
               hadWarnings = true;
               addLog(
-                `${details.name} installation failed. Continuing.`,
+                summaryT('logs.pluginInstallFailedContinue', { name: details.name }),
                 'error',
                 buildOnboardingErrorDiagnostics(
                   {
@@ -892,7 +893,7 @@ const handleComplete = async () => {
             hadWarnings = true;
             hadInstallTimeout = hadInstallTimeout || isInstallTimeoutError(caughtError);
             addErrorLog(
-              `Plugin install reported an error for ${details.name}, continuing`,
+              summaryT('logs.pluginInstallErrorContinue', { name: details.name }),
               caughtError,
               {
                 operation: 'InstallPlugin',
@@ -912,10 +913,10 @@ const handleComplete = async () => {
     // 3. Internal boot setup
     if (internalBootSelection.value) {
       const selection = internalBootSelection.value;
-      addLog('Starting internal boot setup. This might take a while...', 'info');
-      addLog('Configuring internal boot pool...', 'info');
+      addLog(summaryT('logs.internalBootStart'), 'info');
+      addLog(summaryT('logs.internalBootConfiguring'), 'info');
       const internalBootProgressTimer = setInterval(() => {
-        addLog('Still setting up internal boot...', 'info');
+        addLog(summaryT('logs.internalBootStillRunning'), 'info');
       }, 10000);
       try {
         const result = await submitInternalBootCreation(
@@ -930,12 +931,12 @@ const handleComplete = async () => {
 
         if (result.ok) {
           draftStore.setInternalBootApplySucceeded(true);
-          addLog('Internal boot pool configured.', 'success');
+          addLog(summaryT('logs.internalBootConfigured'), 'success');
         } else {
           hadNonOptimisticFailures = true;
           hadWarnings = true;
           addLog(
-            `Internal boot setup returned an error: ${result.output}`,
+            summaryT('logs.internalBootReturnedError', { output: result.output }),
             'error',
             buildOnboardingErrorDiagnostics(
               {
@@ -962,7 +963,7 @@ const handleComplete = async () => {
       } catch (caughtError: unknown) {
         hadNonOptimisticFailures = true;
         hadWarnings = true;
-        addErrorLog('Internal boot setup failed', caughtError, {
+        addErrorLog(summaryT('logs.internalBootFailed'), caughtError, {
           operation: 'CreateInternalBootPool',
           variables: {
             poolName: selection.poolName,
@@ -979,7 +980,7 @@ const handleComplete = async () => {
 
     // 4. SSH (Run separately and optimistically)
     if (shouldApplySsh) {
-      addLog(`Updating SSH Settings...`, 'info');
+      addLog(summaryT('logs.updatingSshSettings'), 'info');
       try {
         const sshUpdateResult = await updateSshSettings({
           enabled: targetCoreSettings.useSsh,
@@ -988,43 +989,36 @@ const handleComplete = async () => {
         const sshVars = getSshVarsFromMutationResult(sshUpdateResult);
 
         if (isSshStateVerified(sshVars, targetCoreSettings.useSsh, 22)) {
-          addLog('SSH settings verified.', 'success');
+          addLog(summaryT('logs.sshVerified'), 'success');
         } else {
           hadWarnings = true;
           hadSshVerificationUncertainty = true;
-          addLog(
-            'SSH update submitted, but final SSH state could not be verified yet. Continuing.',
-            'info'
-          );
+          addLog(summaryT('logs.sshVerificationPendingContinue'), 'info');
         }
       } catch (caughtError: unknown) {
         hadWarnings = true;
         hadSshVerificationUncertainty = true;
-        addErrorLog(
-          'SSH update request returned an error, continuing (service may have restarted).',
-          caughtError,
-          {
-            operation: 'UpdateSshSettings',
-            variables: {
-              enabled: targetCoreSettings.useSsh,
-              port: 22,
-            },
-          }
-        );
+        addErrorLog(summaryT('logs.sshErrorContinue'), caughtError, {
+          operation: 'UpdateSshSettings',
+          variables: {
+            enabled: targetCoreSettings.useSsh,
+            port: 22,
+          },
+        });
       }
     }
 
     // 5. Mark Complete
-    addLog('Finalizing setup...', 'info');
+    addLog(summaryT('logs.finalizingSetup'), 'info');
 
     try {
       await completeOnboarding();
       completionMarked = true;
       cleanupOnboardingStorage({ clearTemporaryBypassSessionState: true });
-      addLog('Setup complete!', 'success');
+      addLog(summaryT('logs.setupComplete'), 'success');
     } catch (caughtError: unknown) {
       hadWarnings = true;
-      addErrorLog('Could not mark onboarding complete right now (API may be offline)', caughtError, {
+      addErrorLog(summaryT('logs.completeOnboardingFailed'), caughtError, {
         operation: 'CompleteOnboarding',
       });
     }
@@ -1044,63 +1038,57 @@ const handleComplete = async () => {
         ]);
       } catch (caughtError: unknown) {
         hadWarnings = true;
-        addErrorLog('Could not refresh onboarding state right now. Continuing.', caughtError, {
+        addErrorLog(summaryT('logs.refreshOnboardingFailedContinue'), caughtError, {
           operation: 'OnboardingQuery',
         });
       }
     } else {
       hadWarnings = true;
-      addLog('Skipping onboarding state refresh while API is unavailable.', 'info');
+      addLog(summaryT('logs.skipRefreshApiUnavailable'), 'info');
     }
 
     if (!completionMarked) {
       applyResultSeverity.value = 'warning';
-      applyResultTitle.value = 'Setup Saved in Best-Effort Mode';
-      applyResultMessage.value =
-        'We applied what we could, but some results could not be verified because the API is offline. You can review and update settings anytime from the Unraid Dashboard.';
+      applyResultTitle.value = summaryT('result.bestEffortTitle');
+      applyResultMessage.value = summaryT('result.bestEffortApiOffline');
     } else if (hadInstallTimeout) {
       applyResultSeverity.value = 'warning';
-      applyResultTitle.value = 'Setup Continued After Timeout';
-      applyResultMessage.value =
-        'One or more install operations timed out. Some settings may have been applied. You can verify and adjust settings later from the Unraid Dashboard.';
+      applyResultTitle.value = summaryT('result.timeoutTitle');
+      applyResultMessage.value = summaryT('result.timeoutMessage');
     } else if (hadNonOptimisticFailures) {
       applyResultSeverity.value = 'warning';
-      applyResultTitle.value = 'Setup Applied with Warnings';
-      applyResultMessage.value =
-        'Some settings could not be fully applied or verified. You can review and change any setting later from the Unraid Dashboard.';
+      applyResultTitle.value = summaryT('result.warningsTitle');
+      applyResultMessage.value = summaryT('result.warningsMessage');
     } else if (hadSshVerificationUncertainty) {
       applyResultSeverity.value = 'warning';
-      applyResultTitle.value = 'Setup Saved in Best-Effort Mode';
-      applyResultMessage.value =
-        'Your SSH setting update was submitted, but final state could not be verified yet. You can verify and adjust it later from the Unraid Dashboard.';
+      applyResultTitle.value = summaryT('result.bestEffortTitle');
+      applyResultMessage.value = summaryT('result.sshUnverifiedMessage');
     } else if (hadWarnings) {
       applyResultSeverity.value = 'warning';
-      applyResultTitle.value = 'Setup Saved in Best-Effort Mode';
-      applyResultMessage.value =
-        'Your onboarding settings were applied. Some operations are best-effort and may take a moment to reflect. You can adjust settings later from the Unraid Dashboard.';
+      applyResultTitle.value = summaryT('result.bestEffortTitle');
+      applyResultMessage.value = summaryT('result.bestEffortMessage');
     } else {
       applyResultSeverity.value = 'success';
-      applyResultTitle.value = 'Setup Applied';
-      applyResultMessage.value = 'Your onboarding settings were applied successfully.';
+      applyResultTitle.value = summaryT('result.successTitle');
+      applyResultMessage.value = summaryT('result.successMessage');
     }
 
     isProcessing.value = false;
     showApplyResultDialog.value = true;
   } catch (err: unknown) {
     console.error('Failed to complete onboarding:', err);
-    error.value = 'An error occurred during setup. Please check the logs.';
+    error.value = summaryT('status.setupErrorCheckLogs');
     isProcessing.value = false;
     addLog(
-      'Setup failed.',
+      summaryT('logs.setupFailed'),
       'error',
       buildOnboardingErrorDiagnostics(err, {
         operation: 'ConfirmAndApply',
       })
     );
     applyResultSeverity.value = 'error';
-    applyResultTitle.value = 'Setup Failed';
-    applyResultMessage.value =
-      'An unexpected error interrupted onboarding. Review the logs below and share them with support.';
+    applyResultTitle.value = summaryT('result.failedTitle');
+    applyResultMessage.value = summaryT('result.failedMessage');
     showApplyResultDialog.value = true;
   }
 };
@@ -1178,13 +1166,13 @@ const handleBack = () => {
               <span class="text-highlighted font-medium break-all sm:text-right">{{ serverName }}</span>
             </div>
             <div class="bg-elevated flex flex-col rounded text-sm" v-if="draftStore.serverDescription">
-              <span class="text-muted">Server Description</span>
+              <span class="text-muted">{{ t('onboarding.coreSettings.serverDescription') }}</span>
               <span class="text-highlighted font-medium break-all">{{
                 draftStore.serverDescription
               }}</span>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Activation</span>
+              <span class="text-muted">{{ t('onboarding.summaryStep.activationLabel') }}</span>
               <div class="flex items-center gap-1.5 sm:justify-end">
                 <component :is="activationStatus.icon" :class="['h-4 w-4', activationStatus.color]" />
                 <span class="text-highlighted font-medium break-all">{{ activationStatus.label }}</span>
@@ -1197,7 +1185,9 @@ const handleBack = () => {
         <div class="border-muted bg-bg/50 rounded-lg border p-5">
           <div class="mb-4 flex items-center gap-2">
             <GlobeAltIcon class="text-primary h-5 w-5" />
-            <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Configuration</h3>
+            <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">
+              {{ t('onboarding.summaryStep.configuration') }}
+            </h3>
           </div>
           <div class="space-y-3">
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
@@ -1222,14 +1212,14 @@ const handleBack = () => {
             </div>
             <!-- Theme & Language -->
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Theme</span>
+              <span class="text-muted">{{ t('onboarding.coreSettings.theme') }}</span>
               <div class="flex items-center gap-1.5 sm:justify-end">
                 <SwatchIcon class="text-muted h-4 w-4" />
                 <span class="text-highlighted font-medium break-all capitalize">{{ displayTheme }}</span>
               </div>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Language</span>
+              <span class="text-muted">{{ t('onboarding.coreSettings.language') }}</span>
               <div class="flex items-center gap-1.5 sm:justify-end">
                 <LanguageIcon class="text-muted h-4 w-4" />
                 <span class="text-highlighted font-medium break-all">{{ displayLanguage }}</span>
@@ -1257,15 +1247,17 @@ const handleBack = () => {
                 <h3 class="text-highlighted mb-0.5 text-sm font-bold uppercase">
                   {{ t('onboarding.pluginsStep.title') }}
                 </h3>
-                <p class="text-muted text-xs">{{ draftPluginsCount }} plugins selected</p>
+                <p class="text-muted text-xs">
+                  {{ t('onboarding.summaryStep.pluginsSelected', { count: draftPluginsCount }) }}
+                </p>
               </div>
             </div>
             <div
               v-if="draftPluginsCount > 0"
               class="text-primary hover:text-primary/80 flex items-center gap-2 text-sm font-medium transition-colors"
             >
-              <span v-if="!open">View Selected</span>
-              <span v-else>Hide Selected</span>
+              <span v-if="!open">{{ t('onboarding.summaryStep.viewSelected') }}</span>
+              <span v-else>{{ t('onboarding.summaryStep.hideSelected') }}</span>
               <ChevronDownIcon
                 :class="[
                   open ? 'rotate-180 transform' : '',
@@ -1285,7 +1277,7 @@ const handleBack = () => {
             <DisclosurePanel class="px-5 pt-0 pb-5">
               <div class="border-muted space-y-2 border-t pt-4">
                 <div v-if="draftPluginsCount === 0" class="text-muted text-sm italic">
-                  No plugins selected.
+                  {{ t('onboarding.summaryStep.noPluginsSelected') }}
                 </div>
                 <div
                   v-else
@@ -1325,41 +1317,45 @@ const handleBack = () => {
       <div class="border-muted bg-bg/50 mt-6 rounded-lg border p-5">
         <div class="mb-4 flex items-center gap-2">
           <CircleStackIcon class="text-primary h-5 w-5" />
-          <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">Boot Configuration</h3>
+          <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">
+            {{ t('onboarding.summaryStep.bootConfig.title') }}
+          </h3>
         </div>
         <div class="space-y-3">
           <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-            <span class="text-muted">Boot Method</span>
+            <span class="text-muted">{{ t('onboarding.summaryStep.bootConfig.bootMethod') }}</span>
             <span class="text-highlighted font-medium break-all sm:text-right">{{ bootModeLabel }}</span>
           </div>
 
           <template v-if="internalBootSummary">
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Pool</span>
+              <span class="text-muted">{{ t('onboarding.summaryStep.bootConfig.pool') }}</span>
               <span class="text-highlighted font-medium break-all sm:text-right">{{
                 internalBootSummary.poolName
               }}</span>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Slots</span>
+              <span class="text-muted">{{ t('onboarding.summaryStep.bootConfig.slots') }}</span>
               <span class="text-highlighted font-medium break-all sm:text-right">{{
                 internalBootSummary.slotCount
               }}</span>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Boot Reserved</span>
+              <span class="text-muted">{{ t('onboarding.summaryStep.bootConfig.bootReserved') }}</span>
               <span class="text-highlighted font-medium break-all sm:text-right">{{
                 internalBootSummary.bootReservedSize
               }}</span>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Update BIOS</span>
+              <span class="text-muted">{{ t('onboarding.summaryStep.bootConfig.updateBios') }}</span>
               <span class="text-highlighted font-medium break-all sm:text-right">{{
-                internalBootSummary.updateBios ? 'Yes' : 'No'
+                internalBootSummary.updateBios
+                  ? t('onboarding.summaryStep.yes')
+                  : t('onboarding.summaryStep.no')
               }}</span>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
-              <span class="text-muted">Devices</span>
+              <span class="text-muted">{{ t('onboarding.summaryStep.bootConfig.devices') }}</span>
               <div class="flex flex-wrap gap-2 sm:justify-end">
                 <span
                   v-for="device in selectedBootDevices"
@@ -1376,7 +1372,7 @@ const handleBack = () => {
 
       <!-- Processing / Error Status -->
       <div v-if="showConsole" class="mt-6">
-        <OnboardingConsole :logs="logs" title="System Setup Log" />
+        <OnboardingConsole :logs="logs" :title="t('onboarding.summaryStep.systemSetupLog')" />
       </div>
 
       <div
@@ -1392,8 +1388,7 @@ const handleBack = () => {
         class="mt-6 rounded-lg border border-yellow-200 bg-yellow-50 p-4 dark:border-yellow-800 dark:bg-yellow-900/10"
       >
         <p class="text-center text-sm font-medium text-yellow-700 dark:text-yellow-300">
-          We couldn't verify current settings from the server. You can still continue, but setup will
-          apply changes in best-effort mode.
+          {{ t('onboarding.summaryStep.readinessWarning') }}
         </p>
       </div>
 
@@ -1407,8 +1402,10 @@ const handleBack = () => {
       >
         <div class="space-y-6 p-2">
           <div class="space-y-3">
-            <h3 class="text-lg font-semibold">Confirm Drive Wipe</h3>
-            <p class="text-muted-foreground text-sm">You've selected drives:</p>
+            <h3 class="text-lg font-semibold">{{ t('onboarding.summaryStep.driveWipe.title') }}</h3>
+            <p class="text-muted-foreground text-sm">
+              {{ t('onboarding.summaryStep.driveWipe.selectedDrives') }}
+            </p>
             <div class="flex flex-wrap gap-2">
               <span
                 v-for="device in selectedBootDevices"
@@ -1418,7 +1415,9 @@ const handleBack = () => {
                 {{ device.label }}
               </span>
             </div>
-            <p class="text-muted-foreground text-sm">Are you sure you want to continue?</p>
+            <p class="text-muted-foreground text-sm">
+              {{ t('onboarding.summaryStep.driveWipe.confirmPrompt') }}
+            </p>
           </div>
           <div class="flex justify-end gap-3">
             <button
@@ -1426,14 +1425,14 @@ const handleBack = () => {
               class="border-muted hover:bg-muted rounded-md border px-4 py-2 text-sm font-medium"
               @click="handleBootDriveWarningCancel"
             >
-              Cancel
+              {{ t('common.cancel') }}
             </button>
             <button
               type="button"
               class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
               @click="handleBootDriveWarningConfirm"
             >
-              Continue
+              {{ t('onboarding.summaryStep.driveWipe.continue') }}
             </button>
           </div>
         </div>
@@ -1456,8 +1455,10 @@ const handleBack = () => {
           </div>
 
           <div v-if="showDiagnosticLogsInResultDialog" class="space-y-3">
-            <h4 class="text-sm font-semibold tracking-wide uppercase">Diagnostic Logs</h4>
-            <OnboardingConsole :logs="logs" title="Onboarding Diagnostics" />
+            <h4 class="text-sm font-semibold tracking-wide uppercase">
+              {{ t('onboarding.summaryStep.diagnosticLogs') }}
+            </h4>
+            <OnboardingConsole :logs="logs" :title="t('onboarding.summaryStep.onboardingDiagnostics')" />
           </div>
 
           <div class="flex justify-end gap-3">
@@ -1466,7 +1467,7 @@ const handleBack = () => {
               class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
               @click="handleApplyResultConfirm"
             >
-              OK
+              {{ t('onboarding.summaryStep.ok') }}
             </button>
           </div>
         </div>
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 848437392f..650a5554b2 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -112,6 +112,202 @@
   "onboarding.nextSteps.manual": "System Manual",
   "onboarding.nextSteps.hardwareSpecs": "Hardware Specifications",
   "onboarding.nextSteps.support": "Manufacturer Support",
+  "onboarding.nextSteps.reboot": "Reboot",
+  "onboarding.nextSteps.additionalLinks": "Additional Links",
+  "onboarding.nextSteps.confirmReboot.title": "Confirm Reboot",
+  "onboarding.nextSteps.confirmReboot.description": "On some systems, you may need to manually change the BIOS boot order from the USB device to the storage drive.",
+  "onboarding.nextSteps.confirmReboot.warning": "Please do NOT remove your Unraid flash drive until your server has finished rebooting into Unraid again.",
+  "onboarding.nextSteps.confirmReboot.confirm": "I Understand",
+  "onboarding.stepper.stepLabel": "Step {number}",
+  "onboarding.console.title": "Setup Console",
+  "onboarding.console.waiting": "Waiting...",
+  "onboarding.console.technicalDetails": "Technical details",
+  "onboarding.modal.closeAriaLabel": "Close onboarding",
+  "onboarding.modal.exit.title": "Exit onboarding?",
+  "onboarding.modal.exit.description": "You can skip setup now and continue from the dashboard later.",
+  "onboarding.modal.exit.keepOnboarding": "Keep onboarding",
+  "onboarding.modal.exit.confirm": "Exit setup",
+  "onboarding.overviewStep.partnerLogoAlt": "Partner Logo",
+  "onboarding.overviewStep.defaultGraphicAlt": "Limitless Possibilities",
+  "onboarding.overviewStep.skipSetup": "Skip Setup",
+  "onboarding.coreSettings.defaultServerName": "Tower",
+  "onboarding.coreSettings.serverNamePlaceholder": "Tower",
+  "onboarding.coreSettings.englishLanguageLabel": "English",
+  "onboarding.coreSettings.themePreviewAlt": "{theme} theme preview",
+  "onboarding.coreSettings.themeOptions.white": "White",
+  "onboarding.coreSettings.themeOptions.black": "Black",
+  "onboarding.coreSettings.themeOptions.gray": "Gray",
+  "onboarding.coreSettings.themeOptions.azure": "Azure",
+  "onboarding.pluginsStep.nextStep": "Next Step",
+  "onboarding.pluginsStep.enablePluginAria": "Enable {name}",
+  "onboarding.pluginsStep.plugins.communityApps.name": "Community Apps",
+  "onboarding.pluginsStep.plugins.communityApps.description": "The essential app store for Unraid. Access thousands of applications.",
+  "onboarding.pluginsStep.plugins.fixCommonProblems.name": "Fix Common Problems",
+  "onboarding.pluginsStep.plugins.fixCommonProblems.description": "Diagnostic tool to help you identify and resolve configuration issues.",
+  "onboarding.pluginsStep.plugins.tailscale.name": "Tailscale",
+  "onboarding.pluginsStep.plugins.tailscale.description": "Zero-config VPN. Securely access your server from anywhere.",
+  "onboarding.internalBootStep.stepTitle": "Setup Boot",
+  "onboarding.internalBootStep.stepDescription": "Choose USB or storage drive boot",
+  "onboarding.internalBootStep.title": "Setup Boot",
+  "onboarding.internalBootStep.description": "Choose how Unraid boots: USB/Flash Drive (default) or Storage Drive(s). You can switch to Storage Drive boot later in the Unraid Dashboard.",
+  "onboarding.internalBootStep.options.usb": "Use USB/Flash Drive to boot Unraid",
+  "onboarding.internalBootStep.options.storage": "Use Storage Drive(s) to boot Unraid",
+  "onboarding.internalBootStep.loadingOptions": "Loading internal boot options...",
+  "onboarding.internalBootStep.unknownSize": "Unknown",
+  "onboarding.internalBootStep.warning.selectedDevicesFormatted": "All selected devices will be formatted.",
+  "onboarding.internalBootStep.warning.updateBios": "On some systems, you may need to manually change the BIOS boot order from the USB device to the storage drive.",
+  "onboarding.internalBootStep.fields.poolName": "Pool name",
+  "onboarding.internalBootStep.fields.slots": "Slots",
+  "onboarding.internalBootStep.fields.devices": "Devices",
+  "onboarding.internalBootStep.fields.deviceSlot": "Device {index}",
+  "onboarding.internalBootStep.fields.selectDevice": "Select device",
+  "onboarding.internalBootStep.fields.bootReservedSize": "Boot reserved size",
+  "onboarding.internalBootStep.fields.customSizeGb": "Custom size (GB)",
+  "onboarding.internalBootStep.fields.updateBios": "Update BIOS boot order",
+  "onboarding.internalBootStep.bootSize.wholeDrive": "Whole drive",
+  "onboarding.internalBootStep.bootSize.gbLabel": "{size} GB",
+  "onboarding.internalBootStep.bootSize.custom": "User defined",
+  "onboarding.internalBootStep.bootSize.helpMinOnly": "Minimum is 4 GB.",
+  "onboarding.internalBootStep.bootSize.helpRange": "Minimum is 4 GB; maximum is {max} GB (50% of the smallest selected drive).",
+  "onboarding.internalBootStep.status.apiError": "Unable to load internal boot options from API.",
+  "onboarding.internalBootStep.status.alreadyConfigured": "Internal boot is already configured on this server.",
+  "onboarding.internalBootStep.status.arrayNotStopped": "Internal boot setup is only available while the array is stopped.",
+  "onboarding.internalBootStep.status.notEligible": "This server is not currently eligible for internal boot setup.",
+  "onboarding.internalBootStep.status.noDevices": "No eligible devices were detected for internal boot setup.",
+  "onboarding.internalBootStep.status.unavailable": "Internal boot setup is not available right now.",
+  "onboarding.internalBootStep.validation.poolRequired": "Pool name is required.",
+  "onboarding.internalBootStep.validation.poolReserved": "Do not use reserved names.",
+  "onboarding.internalBootStep.validation.poolShareName": "Do not use user share names.",
+  "onboarding.internalBootStep.validation.poolExists": "Pool name already exists.",
+  "onboarding.internalBootStep.validation.poolFormat": "Use only lowercase with no special characters or leading/trailing digits.",
+  "onboarding.internalBootStep.validation.slotCount": "Select 1 or 2 slots.",
+  "onboarding.internalBootStep.validation.devicePerSlot": "Select a device for each slot.",
+  "onboarding.internalBootStep.validation.uniqueDevices": "Each selected device must be unique.",
+  "onboarding.internalBootStep.validation.bootSizeRequired": "Select a valid boot reserved size.",
+  "onboarding.internalBootStep.validation.bootSizeMin": "Boot reserved size must be at least 4 GB.",
+  "onboarding.internalBootStep.validation.bootSizeMax": "Boot reserved size cannot exceed 50% of the smallest selected drive.",
+  "onboarding.internalBootStep.actions.continue": "Continue",
+  "onboarding.summaryStep.activationLabel": "Activation",
+  "onboarding.summaryStep.configuration": "Configuration",
+  "onboarding.summaryStep.pluginsSelected": "{count} plugins selected",
+  "onboarding.summaryStep.viewSelected": "View Selected",
+  "onboarding.summaryStep.hideSelected": "Hide Selected",
+  "onboarding.summaryStep.noPluginsSelected": "No plugins selected.",
+  "onboarding.summaryStep.bootConfig.title": "Boot Configuration",
+  "onboarding.summaryStep.bootConfig.bootMethod": "Boot Method",
+  "onboarding.summaryStep.bootConfig.bootMethodStorage": "Storage Drive(s)",
+  "onboarding.summaryStep.bootConfig.bootMethodUsb": "USB/Flash Drive",
+  "onboarding.summaryStep.bootConfig.pool": "Pool",
+  "onboarding.summaryStep.bootConfig.slots": "Slots",
+  "onboarding.summaryStep.bootConfig.bootReserved": "Boot Reserved",
+  "onboarding.summaryStep.bootConfig.updateBios": "Update BIOS",
+  "onboarding.summaryStep.bootConfig.devices": "Devices",
+  "onboarding.summaryStep.systemSetupLog": "System Setup Log",
+  "onboarding.summaryStep.readinessWarning": "We couldn't verify current settings from the server. You can still continue, but setup will apply changes in best-effort mode.",
+  "onboarding.summaryStep.driveWipe.title": "Confirm Drive Wipe",
+  "onboarding.summaryStep.driveWipe.selectedDrives": "You've selected drives:",
+  "onboarding.summaryStep.driveWipe.confirmPrompt": "Are you sure you want to continue?",
+  "onboarding.summaryStep.driveWipe.continue": "Continue",
+  "onboarding.summaryStep.diagnosticLogs": "Diagnostic Logs",
+  "onboarding.summaryStep.onboardingDiagnostics": "Onboarding Diagnostics",
+  "onboarding.summaryStep.yes": "Yes",
+  "onboarding.summaryStep.no": "No",
+  "onboarding.summaryStep.ok": "OK",
+  "onboarding.summaryStep.errors.unknownError": "Unknown error",
+  "onboarding.summaryStep.status.settingsStillLoading": "Settings are still loading. Please wait a moment and try again.",
+  "onboarding.summaryStep.status.setupErrorCheckLogs": "An error occurred during setup. Please check the logs.",
+  "onboarding.summaryStep.activation.unregistered": "Unregistered",
+  "onboarding.summaryStep.activation.unknown": "Unknown",
+  "onboarding.summaryStep.activation.errors.keyMissing": "Key Missing",
+  "onboarding.summaryStep.activation.errors.validationError": "Validation Error",
+  "onboarding.summaryStep.activation.errors.guidMismatch": "GUID Mismatch",
+  "onboarding.summaryStep.activation.errors.trialExpired": "Trial Expired",
+  "onboarding.summaryStep.activation.errors.blacklisted": "Blacklisted",
+  "onboarding.summaryStep.activation.errors.generic": "Error: {state}",
+  "onboarding.summaryStep.logs.startingConfiguration": "Starting configuration...",
+  "onboarding.summaryStep.logs.baselineUnavailable": "Baseline settings unavailable. Continuing in best-effort mode.",
+  "onboarding.summaryStep.logs.baselineFallback": "Baseline settings unavailable. Applying trusted defaults + draft values without diff checks.",
+  "onboarding.summaryStep.logs.applyingPartnerCustomizations": "Applying partner customizations...",
+  "onboarding.summaryStep.logs.noChanges": "No settings changed. Skipping configuration mutations.",
+  "onboarding.summaryStep.logs.settingTimezone": "Setting TimeZone to {timeZone}...",
+  "onboarding.summaryStep.logs.timezoneUpdated": "TimeZone updated.",
+  "onboarding.summaryStep.logs.timezoneErrorContinue": "TimeZone request returned an error, continuing",
+  "onboarding.summaryStep.logs.updatingServerIdentity": "Updating Server Identity to {name}...",
+  "onboarding.summaryStep.logs.serverIdentityUpdated": "Server Identity updated.",
+  "onboarding.summaryStep.logs.serverIdentityErrorContinue": "Server identity request returned an error, continuing",
+  "onboarding.summaryStep.logs.settingTheme": "Setting Theme to {theme}...",
+  "onboarding.summaryStep.logs.themeUpdated": "Theme updated.",
+  "onboarding.summaryStep.logs.themeErrorContinue": "Theme request returned an error, continuing",
+  "onboarding.summaryStep.logs.settingLanguage": "Setting Language to {locale}...",
+  "onboarding.summaryStep.logs.languageUpdated": "Language updated.",
+  "onboarding.summaryStep.logs.languageErrorContinue": "Language request returned an error, continuing",
+  "onboarding.summaryStep.logs.languageMetadataUnavailable": "Language pack metadata for {locale} is unavailable. Skipping locale change.",
+  "onboarding.summaryStep.logs.installingLanguagePack": "Installing language pack for {name}...",
+  "onboarding.summaryStep.logs.languageInstallDidNotSucceed": "Language pack installation did not succeed for {name}. Keeping current locale.",
+  "onboarding.summaryStep.logs.languagePackInstalled": "Language pack installed for {name}.",
+  "onboarding.summaryStep.logs.languageInstallFailedKeepLocale": "Language pack installation failed for {name}. Keeping current locale",
+  "onboarding.summaryStep.logs.refreshPluginsFailedContinue": "Could not refresh installed plugins list. Continuing with current plugin state.",
+  "onboarding.summaryStep.logs.installingPlugins": "Installing {count} plugins...",
+  "onboarding.summaryStep.logs.pluginAlreadyInstalled": "{name} is already installed. Skipping.",
+  "onboarding.summaryStep.logs.installingPlugin": "Installing {name}...",
+  "onboarding.summaryStep.logs.pluginInstalled": "{name} installed.",
+  "onboarding.summaryStep.logs.pluginInstallFailedContinue": "{name} installation failed. Continuing.",
+  "onboarding.summaryStep.logs.pluginInstallErrorContinue": "Plugin install reported an error for {name}, continuing",
+  "onboarding.summaryStep.logs.internalBootStart": "Starting internal boot setup. This might take a while...",
+  "onboarding.summaryStep.logs.internalBootConfiguring": "Configuring internal boot pool...",
+  "onboarding.summaryStep.logs.internalBootStillRunning": "Still setting up internal boot...",
+  "onboarding.summaryStep.logs.internalBootConfigured": "Internal boot pool configured.",
+  "onboarding.summaryStep.logs.internalBootReturnedError": "Internal boot setup returned an error: {output}",
+  "onboarding.summaryStep.logs.internalBootFailed": "Internal boot setup failed",
+  "onboarding.summaryStep.logs.updatingSshSettings": "Updating SSH Settings...",
+  "onboarding.summaryStep.logs.sshVerified": "SSH settings verified.",
+  "onboarding.summaryStep.logs.sshVerificationPendingContinue": "SSH update submitted, but final SSH state could not be verified yet. Continuing.",
+  "onboarding.summaryStep.logs.sshErrorContinue": "SSH update request returned an error, continuing (service may have restarted).",
+  "onboarding.summaryStep.logs.finalizingSetup": "Finalizing setup...",
+  "onboarding.summaryStep.logs.setupComplete": "Setup complete!",
+  "onboarding.summaryStep.logs.completeOnboardingFailed": "Could not mark onboarding complete right now (API may be offline)",
+  "onboarding.summaryStep.logs.refreshOnboardingFailedContinue": "Could not refresh onboarding state right now. Continuing.",
+  "onboarding.summaryStep.logs.skipRefreshApiUnavailable": "Skipping onboarding state refresh while API is unavailable.",
+  "onboarding.summaryStep.logs.setupFailed": "Setup failed.",
+  "onboarding.summaryStep.result.bestEffortTitle": "Setup Saved in Best-Effort Mode",
+  "onboarding.summaryStep.result.bestEffortApiOffline": "We applied what we could, but some results could not be verified because the API is offline. You can review and update settings anytime from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.timeoutTitle": "Setup Continued After Timeout",
+  "onboarding.summaryStep.result.timeoutMessage": "One or more install operations timed out. Some settings may have been applied. You can verify and adjust settings later from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.warningsTitle": "Setup Applied with Warnings",
+  "onboarding.summaryStep.result.warningsMessage": "Some settings could not be fully applied or verified. You can review and change any setting later from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.sshUnverifiedMessage": "Your SSH setting update was submitted, but final state could not be verified yet. You can verify and adjust it later from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.bestEffortMessage": "Your onboarding settings were applied. Some operations are best-effort and may take a moment to reflect. You can adjust settings later from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.successTitle": "Setup Applied",
+  "onboarding.summaryStep.result.successMessage": "Your onboarding settings were applied successfully.",
+  "onboarding.summaryStep.result.failedTitle": "Setup Failed",
+  "onboarding.summaryStep.result.failedMessage": "An unexpected error interrupted onboarding. Review the logs below and share them with support.",
+  "onboarding.licenseStep.title": "Unraid OS License",
+  "onboarding.licenseStep.description": "Ready for activation. Click below to manage your license and server registration in the Unraid Account App.",
+  "onboarding.licenseStep.status.registered": "Registered",
+  "onboarding.licenseStep.status.unregistered": "Unregistered",
+  "onboarding.licenseStep.labels.status": "Status",
+  "onboarding.licenseStep.labels.activationCode": "Activation Code",
+  "onboarding.licenseStep.labels.none": "None",
+  "onboarding.licenseStep.actions.manageLicense": "Manage License",
+  "onboarding.licenseStep.actions.activateServer": "Activate Server",
+  "onboarding.licenseStep.actions.nextStep": "NEXT STEP",
+  "onboarding.licenseStep.actions.skipForNow": "Skip for now",
+  "onboarding.licenseStep.actions.refreshStatus": "Refresh Status",
+  "onboarding.licenseStep.actions.hideCode": "Hide",
+  "onboarding.licenseStep.actions.showCode": "Show",
+  "onboarding.licenseStep.actions.contactSupport": "Having trouble? Contact Support",
+  "onboarding.licenseStep.actions.close": "Close",
+  "onboarding.licenseStep.actions.cancel": "Cancel",
+  "onboarding.licenseStep.actions.iUnderstand": "I UNDERSTAND",
+  "onboarding.licenseStep.help.title": "Contact Support",
+  "onboarding.licenseStep.help.contactSupportDescription": "If you are experiencing issues with activation, please contact our support team.",
+  "onboarding.licenseStep.help.supportLabel": "Support:",
+  "onboarding.licenseStep.help.supportUrlLabel": "unraid.net/support",
+  "onboarding.licenseStep.help.activationCodeHint": "Please include your Activation Code (copied below) in your email for faster service.",
+  "onboarding.licenseStep.skipDialog.title": "Are you sure?",
+  "onboarding.licenseStep.skipDialog.licenseDetected": "It appears you already have a license associated with this server. You can activate it now for free to unlock all features.",
+  "onboarding.licenseStep.skipDialog.warningLine1": "Skipping activation will severely limit system functionality.",
+  "onboarding.licenseStep.skipDialog.warningLine2": "You can always activate your server again later through the Unraid dashboard.",
   "apiKey.apiKeyCreate.createApiKey": "Create API Key",
   "apiKey.apiKeyCreate.editApiKey": "Edit API Key",
   "auth.login.login": "Login",
@@ -130,6 +326,7 @@
   "common.installing": "Installing",
   "common.learnMore": "Learn More",
   "common.retry": "Retry",
+  "common.loading": "Loading...",
   "common.loading2": "Loading…",
   "common.skip": "Skip",
   "common.skipForNow": "Skip for now",

From 9fc123bad301c8256e41df7d4ff55713bcc00729 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 16:07:33 -0500
Subject: [PATCH 36/53] fix(onboarding): stabilize modal gating test fixtures

- Purpose of this change: stabilize onboarding modal gating tests and keep onboarding fixtures consistent across related checks.

- Behavior before: modal gating tests could fail when onboarding completion refs were missing, and related fixtures drifted across test/debug paths.

- Why that was a problem: failures were noisy and made onboarding validation less reliable in CI and local verification.

- What this change accomplishes: ensures modal gating tests run deterministically and aligns dependent onboarding fixture payloads/expectations.

- How it works: adds the missing onboarding store mock ref for gating tests and updates linked onboarding fixture data used by related tests and override flows.
---
 .../resolvers/servers/server.service.spec.ts  |   4 +-
 .../OnboardingCoreSettingsStep.test.ts        |  16 +-
 .../Onboarding/OnboardingOverviewStep.test.ts |   6 +-
 .../store/activationCodeModal.test.ts         |  11 +
 .../OnboardingAdminPanel.standalone.vue       | 195 +++++++-----------
 5 files changed, 104 insertions(+), 128 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts b/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts
index f91faf5c63..b8f8eb266e 100644
--- a/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts
@@ -132,14 +132,14 @@ describe('ServerService', () => {
     });
 
     it('includes SYS_MODEL when provided', async () => {
-        await service.updateServerIdentity('Tower', 'Primary host', 'Storinator');
+        await service.updateServerIdentity('Tower', 'Primary host', 'Model X200');
 
         expect(emcmd).toHaveBeenCalledWith(
             {
                 changeNames: 'Apply',
                 NAME: 'Tower',
                 COMMENT: 'Primary host',
-                SYS_MODEL: 'Storinator',
+                SYS_MODEL: 'Model X200',
             },
             { waitForToken: true }
         );
diff --git a/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts b/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts
index feb395ca56..5830012531 100644
--- a/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts
@@ -349,7 +349,7 @@ describe('OnboardingCoreSettingsStep', () => {
       data: {
         customization: {
           activationCode: {
-            system: { serverName: 'Storinator45', comment: 'Primary storage node' },
+            system: { serverName: 'Server01', comment: 'Primary storage node' },
           },
         },
         server: { name: 'Tower', comment: 'Media server' },
@@ -366,7 +366,7 @@ describe('OnboardingCoreSettingsStep', () => {
 
     expect(setCoreSettingsMock).toHaveBeenCalledTimes(1);
     expect(setCoreSettingsMock.mock.calls[0][0]).toMatchObject({
-      serverName: 'Storinator45',
+      serverName: 'Server01',
       serverDescription: 'Primary storage node',
     });
     expect(onComplete).toHaveBeenCalledTimes(1);
@@ -383,7 +383,7 @@ describe('OnboardingCoreSettingsStep', () => {
       data: {
         customization: {
           activationCode: {
-            system: { serverName: 'Storinator45' },
+            system: { serverName: 'Server01' },
           },
         },
         server: { name: 'Tower', comment: 'Media server' },
@@ -400,7 +400,7 @@ describe('OnboardingCoreSettingsStep', () => {
 
     expect(setCoreSettingsMock).toHaveBeenCalledTimes(1);
     expect(setCoreSettingsMock.mock.calls[0][0]).toMatchObject({
-      serverName: 'Storinator45',
+      serverName: 'Server01',
       serverDescription: '',
     });
     expect(onComplete).toHaveBeenCalledTimes(1);
@@ -417,7 +417,7 @@ describe('OnboardingCoreSettingsStep', () => {
       data: {
         customization: {
           activationCode: {
-            system: { serverName: 'Storinator45', comment: 'Primary storage node' },
+            system: { serverName: 'Server01', comment: 'Primary storage node' },
           },
         },
         server: { name: '', comment: '' },
@@ -452,7 +452,7 @@ describe('OnboardingCoreSettingsStep', () => {
       data: {
         customization: {
           activationCode: {
-            system: { serverName: 'Storinator45', comment: 'Partner-provided comment' },
+            system: { serverName: 'Server01', comment: 'Partner-provided comment' },
           },
         },
         server: { name: 'TowerFromServer', comment: 'Comment from API' },
@@ -486,7 +486,7 @@ describe('OnboardingCoreSettingsStep', () => {
       data: {
         customization: {
           activationCode: {
-            system: { serverName: 'Storinator45', comment: 'Partner-provided comment' },
+            system: { serverName: 'Server01', comment: 'Partner-provided comment' },
           },
         },
         server: { name: 'TowerFromServer', comment: '' },
@@ -520,7 +520,7 @@ describe('OnboardingCoreSettingsStep', () => {
       data: {
         customization: {
           activationCode: {
-            system: { serverName: 'Storinator45', comment: 'Partner-provided comment' },
+            system: { serverName: 'Server01', comment: 'Partner-provided comment' },
           },
         },
         server: { name: 'TowerFromServer', comment: 'Comment from API' },
diff --git a/web/__test__/components/Onboarding/OnboardingOverviewStep.test.ts b/web/__test__/components/Onboarding/OnboardingOverviewStep.test.ts
index 8e7ab5b4b9..8f35e84131 100644
--- a/web/__test__/components/Onboarding/OnboardingOverviewStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingOverviewStep.test.ts
@@ -20,7 +20,7 @@ const {
   refetchOnboardingMock: vi.fn().mockResolvedValue({}),
   partnerInfoRef: {
     value: {
-      partner: { name: '45Drives' },
+      partner: { name: 'Partner' },
       branding: {
         hasPartnerLogo: true,
         partnerLogoLightUrl: 'data:image/png;base64,AAA=',
@@ -97,7 +97,7 @@ describe('OnboardingOverviewStep', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     partnerInfoRef.value = {
-      partner: { name: '45Drives' },
+      partner: { name: 'Partner' },
       branding: {
         hasPartnerLogo: true,
         partnerLogoLightUrl: 'data:image/png;base64,AAA=',
@@ -127,7 +127,7 @@ describe('OnboardingOverviewStep', () => {
 
     expect(img.exists()).toBe(true);
     expect(img.attributes('src')).toBe('data:image/png;base64,AAA=');
-    expect(img.attributes('alt')).toBe('45Drives');
+    expect(img.attributes('alt')).toBe('Partner');
   });
 
   it('falls back to default overview image when partner logo fails to load', async () => {
diff --git a/web/__test__/store/activationCodeModal.test.ts b/web/__test__/store/activationCodeModal.test.ts
index 9baf27d25c..0cc113019a 100644
--- a/web/__test__/store/activationCodeModal.test.ts
+++ b/web/__test__/store/activationCodeModal.test.ts
@@ -9,6 +9,7 @@ import type { App } from 'vue';
 
 import { useActivationCodeDataStore } from '~/components/Onboarding/store/activationCodeData';
 import { useActivationCodeModalStore } from '~/components/Onboarding/store/activationCodeModal';
+import { useOnboardingStore } from '~/components/Onboarding/store/upgradeOnboarding';
 import { useCallbackActionsStore } from '~/store/callbackActions';
 import { useServerStore } from '~/store/server';
 
@@ -28,11 +29,16 @@ vi.mock('~/store/server', () => ({
   useServerStore: vi.fn(),
 }));
 
+vi.mock('~/components/Onboarding/store/upgradeOnboarding', () => ({
+  useOnboardingStore: vi.fn(),
+}));
+
 describe('ActivationCodeModal Store', () => {
   let store: ReturnType<typeof useActivationCodeModalStore>;
   let mockIsHidden: ReturnType<typeof ref>;
   let mockTemporaryBypassState: ReturnType<typeof ref>;
   let mockIsFreshInstall: ReturnType<typeof ref>;
+  let mockCompleted: ReturnType<typeof ref>;
   let mockCallbackData: ReturnType<typeof ref>;
   let mockUptime: ReturnType<typeof ref>;
   let app: App<Element> | null = null;
@@ -63,6 +69,7 @@ describe('ActivationCodeModal Store', () => {
     mockIsHidden = ref(null);
     mockTemporaryBypassState = ref(null);
     mockIsFreshInstall = ref(false);
+    mockCompleted = ref(false);
     mockCallbackData = ref(null);
     mockUptime = ref(3600);
 
@@ -81,6 +88,10 @@ describe('ActivationCodeModal Store', () => {
       isFreshInstall: mockIsFreshInstall,
     } as unknown as ReturnType<typeof useActivationCodeDataStore>);
 
+    vi.mocked(useOnboardingStore).mockReturnValue({
+      completed: mockCompleted,
+    } as unknown as ReturnType<typeof useOnboardingStore>);
+
     vi.mocked(useCallbackActionsStore).mockReturnValue({
       callbackData: mockCallbackData,
     } as unknown as ReturnType<typeof useCallbackActionsStore>);
diff --git a/web/src/components/Onboarding/standalone/OnboardingAdminPanel.standalone.vue b/web/src/components/Onboarding/standalone/OnboardingAdminPanel.standalone.vue
index 17fef3a40a..718ff63175 100644
--- a/web/src/components/Onboarding/standalone/OnboardingAdminPanel.standalone.vue
+++ b/web/src/components/Onboarding/standalone/OnboardingAdminPanel.standalone.vue
@@ -76,14 +76,10 @@ type PartnerConfigPayload = {
 };
 
 type BrandingConfigPayload = {
-  header?: string;
-  headermetacolor?: string;
-  background?: string;
-  showBannerGradient?: boolean;
-  theme?: 'azure' | 'black' | 'gray' | 'white';
+  bannerImage?: string;
+  caseModelImage?: string;
   partnerLogoLightUrl?: string;
   partnerLogoDarkUrl?: string;
-  hasPartnerLogo?: boolean;
   onboardingTitle?: string;
   onboardingSubtitle?: string;
   onboardingTitleFreshInstall?: string;
@@ -128,6 +124,41 @@ type Preset = {
   overrides: OnboardingOverridePayload;
 };
 
+const genericPartnerConfig: PartnerConfigPayload = {
+  name: 'Partner',
+  url: 'https://example.com/partner',
+  hardwareSpecsUrl: 'https://example.com/partner/specs/model-x200',
+  manualUrl: 'https://example.com/partner/docs/model-x200-manual',
+  supportUrl: 'https://example.com/partner/support',
+  extraLinks: [
+    { title: 'Warranty', url: 'https://example.com/partner/warranty' },
+    { title: 'Knowledge Base', url: 'https://example.com/partner/kb' },
+  ],
+};
+
+const genericBrandingConfig: BrandingConfigPayload = {
+  bannerImage: './assets/banner.png',
+  caseModelImage: './assets/case-model.png',
+  partnerLogoLightUrl: './assets/partner-logo-light.svg',
+  partnerLogoDarkUrl: './assets/partner-logo-dark.svg',
+  onboardingTitle: 'Welcome',
+  onboardingSubtitle: "Let's get your system configured.",
+  onboardingTitleFreshInstall: 'Welcome to your new server',
+  onboardingSubtitleFreshInstall: "We'll walk through first-time setup.",
+  onboardingTitleUpgrade: 'Thanks for upgrading',
+  onboardingSubtitleUpgrade: 'Review changes and continue setup.',
+  onboardingTitleDowngrade: 'Welcome back',
+  onboardingSubtitleDowngrade: "We'll re-check a few settings.",
+  onboardingTitleIncomplete: 'Finish setup',
+  onboardingSubtitleIncomplete: 'Pick up where you left off.',
+};
+
+const genericSystemConfig: SystemConfigPayload = {
+  serverName: 'Server01',
+  model: 'Model X200',
+  comment: 'Preconfigured by partner',
+};
+
 // Made reactive to allow adding new presets in session
 const presets = ref<Preset[]>([
   // ============ REGULAR USER STATES ============
@@ -192,7 +223,7 @@ const presets = ref<Preset[]>([
     },
   },
 
-  // ============ PARTNER USER STATES (e.g., 45Drives) ============
+  // ============ PARTNER USER STATES (generic example) ============
   // Note: partnerInfo is automatically derived from activationCode by the API
   // So we only need to set activationCode - no duplication needed!
   {
@@ -207,34 +238,10 @@ const presets = ref<Preset[]>([
         completedAtVersion: null,
       },
       activationCode: {
-        code: 'DEMO-PARTNER-CODE-123',
-        partner: {
-          name: '45Drives',
-          url: 'https://45drives.com',
-          hardwareSpecsUrl: 'https://45drives.com/specs/storinator-s45',
-          manualUrl: 'https://45drives.com/docs/storinator-manual',
-          supportUrl: 'https://45drives.com/support',
-          extraLinks: [
-            { title: 'Community Forums', url: 'https://45drives.com/forums' },
-            { title: 'Knowledge Base', url: 'https://45drives.com/kb' },
-          ],
-        },
-        branding: {
-          theme: 'azure',
-          hasPartnerLogo: true,
-          partnerLogoLightUrl: '/config/activate/45drives-logo-light.png',
-          partnerLogoDarkUrl: '/config/activate/45drives-logo-dark.png',
-          onboardingTitle: 'Welcome to Storinator',
-          onboardingSubtitle: 'Unleash your massive storage',
-          onboardingTitleFreshInstall: 'Welcome to your new Storinator',
-          onboardingSubtitleFreshInstall: 'Let us get your storage stack configured.',
-          onboardingTitleIncomplete: 'Finish Storinator setup',
-          onboardingSubtitleIncomplete: 'Pick up right where you left off.',
-        },
-        system: {
-          serverName: 'Storinator S45',
-          model: 'Storinator',
-        },
+        code: 'UNRAID-PARTNER-2026-ABC123',
+        partner: { ...genericPartnerConfig },
+        branding: { ...genericBrandingConfig },
+        system: { ...genericSystemConfig },
       },
     },
   },
@@ -250,34 +257,10 @@ const presets = ref<Preset[]>([
         completedAtVersion: '7.1.0',
       },
       activationCode: {
-        code: 'DEMO-PARTNER-CODE-456',
-        partner: {
-          name: '45Drives',
-          url: 'https://45drives.com',
-          hardwareSpecsUrl: 'https://45drives.com/specs/storinator-av15',
-          manualUrl: 'https://45drives.com/docs/storinator-manual',
-          supportUrl: 'https://45drives.com/support',
-        },
-        branding: {
-          theme: 'azure',
-          hasPartnerLogo: true,
-          partnerLogoLightUrl: '/config/activate/45drives-logo-light.png',
-          partnerLogoDarkUrl: '/config/activate/45drives-logo-dark.png',
-          onboardingTitle: 'Welcome to Storinator',
-          onboardingSubtitle: 'Your powerful storage solution',
-          onboardingTitleFreshInstall: 'Welcome to your Storinator',
-          onboardingSubtitleFreshInstall: 'We will walk through first-time setup.',
-          onboardingTitleUpgrade: 'Thanks for upgrading Storinator',
-          onboardingSubtitleUpgrade: 'Review the latest updates and continue.',
-          onboardingTitleDowngrade: 'Welcome back to Storinator',
-          onboardingSubtitleDowngrade: 'You are on an earlier release. Let us re-check setup.',
-          onboardingTitleIncomplete: 'Finish Storinator setup',
-          onboardingSubtitleIncomplete: 'Pick up right where you left off.',
-        },
-        system: {
-          serverName: 'Storinator AV15',
-          model: 'Storinator',
-        },
+        code: 'UNRAID-PARTNER-2026-ABC456',
+        partner: { ...genericPartnerConfig },
+        branding: { ...genericBrandingConfig },
+        system: { ...genericSystemConfig },
       },
     },
   },
@@ -293,31 +276,10 @@ const presets = ref<Preset[]>([
         completedAtVersion: '9.0.0',
       },
       activationCode: {
-        code: 'DEMO-PARTNER-CODE-654',
-        partner: {
-          name: '45Drives',
-          url: 'https://45drives.com',
-        },
-        branding: {
-          theme: 'azure',
-          hasPartnerLogo: true,
-          partnerLogoLightUrl: '/config/activate/45drives-logo-light.png',
-          partnerLogoDarkUrl: '/config/activate/45drives-logo-dark.png',
-          onboardingTitle: 'Welcome to Storinator',
-          onboardingSubtitle: 'High-performance storage',
-          onboardingTitleFreshInstall: 'Welcome to your Storinator',
-          onboardingSubtitleFreshInstall: 'Let us configure the essentials.',
-          onboardingTitleUpgrade: 'Thanks for upgrading Storinator',
-          onboardingSubtitleUpgrade: 'Review updates before continuing.',
-          onboardingTitleDowngrade: 'Welcome back to Storinator',
-          onboardingSubtitleDowngrade: 'You are on an earlier release. Let us re-check setup.',
-          onboardingTitleIncomplete: 'Finish Storinator setup',
-          onboardingSubtitleIncomplete: 'Complete the remaining steps.',
-        },
-        system: {
-          serverName: 'Storinator X',
-          model: 'Storinator',
-        },
+        code: 'UNRAID-PARTNER-2026-ABC654',
+        partner: { ...genericPartnerConfig },
+        branding: { ...genericBrandingConfig },
+        system: { ...genericSystemConfig },
       },
     },
   },
@@ -333,31 +295,10 @@ const presets = ref<Preset[]>([
         completedAtVersion: null,
       },
       activationCode: {
-        code: 'DEMO-PARTNER-CODE-789',
-        partner: {
-          name: '45Drives',
-          url: 'https://45drives.com',
-        },
-        branding: {
-          theme: 'azure',
-          hasPartnerLogo: true,
-          partnerLogoLightUrl: '/config/activate/45drives-logo-light.png',
-          partnerLogoDarkUrl: '/config/activate/45drives-logo-dark.png',
-          onboardingTitle: 'Welcome to Storinator',
-          onboardingSubtitle: 'High-performance storage',
-          onboardingTitleFreshInstall: 'Welcome to your Storinator',
-          onboardingSubtitleFreshInstall: 'Get your system configured in minutes.',
-          onboardingTitleUpgrade: 'Thanks for upgrading Storinator',
-          onboardingSubtitleUpgrade: 'Let us review what changed.',
-          onboardingTitleDowngrade: 'Welcome back to Storinator',
-          onboardingSubtitleDowngrade: 'You are on an earlier release. Let us re-check setup.',
-          onboardingTitleIncomplete: 'Finish Storinator setup',
-          onboardingSubtitleIncomplete: 'Complete the final setup items.',
-        },
-        system: {
-          serverName: 'Storinator Q30',
-          model: 'Storinator',
-        },
+        code: 'UNRAID-PARTNER-2026-ABC789',
+        partner: { ...genericPartnerConfig },
+        branding: { ...genericBrandingConfig },
+        system: { ...genericSystemConfig },
       },
     },
   },
@@ -1030,6 +971,24 @@ const currentRegistrationState = computed({
                 Array of {title, url} for custom partner links (optional)
               </td>
             </tr>
+            <tr>
+              <td class="py-2 pr-4 font-mono text-cyan-500">activationCode.branding.bannerImage</td>
+              <td class="py-2 pr-4">
+                <code class="bg-muted rounded px-1">*.activationcode</code>
+              </td>
+              <td class="text-muted-foreground py-2">
+                Banner image source (optional): relative path, URL, data URI, or base64
+              </td>
+            </tr>
+            <tr>
+              <td class="py-2 pr-4 font-mono text-cyan-500">activationCode.branding.caseModelImage</td>
+              <td class="py-2 pr-4">
+                <code class="bg-muted rounded px-1">*.activationcode</code>
+              </td>
+              <td class="text-muted-foreground py-2">
+                Case/model image source (optional): relative path, URL, data URI, or base64
+              </td>
+            </tr>
             <tr>
               <td class="py-2 pr-4 font-mono text-cyan-500">
                 activationCode.branding.partnerLogoLightUrl
@@ -1037,7 +996,7 @@ const currentRegistrationState = computed({
               <td class="py-2 pr-4">
                 <code class="bg-muted rounded px-1">*.activationcode</code>
               </td>
-              <td class="text-muted-foreground py-2">Partner logo URL used for azure/white themes</td>
+              <td class="text-muted-foreground py-2">Light theme logo source (optional)</td>
             </tr>
             <tr>
               <td class="py-2 pr-4 font-mono text-cyan-500">
@@ -1046,7 +1005,7 @@ const currentRegistrationState = computed({
               <td class="py-2 pr-4">
                 <code class="bg-muted rounded px-1">*.activationcode</code>
               </td>
-              <td class="text-muted-foreground py-2">Partner logo URL used for black/gray themes</td>
+              <td class="text-muted-foreground py-2">Dark theme logo source (optional)</td>
             </tr>
             <tr>
               <td class="py-2 pr-4 font-mono text-purple-500">
@@ -1100,6 +1059,12 @@ const currentRegistrationState = computed({
           <code class="bg-muted rounded px-1">activationCode.*</code> fields. The API automatically
           derives <code class="bg-muted rounded px-1">partnerInfo</code> from it!
         </p>
+        <p>
+          <strong class="text-foreground">Image paths:</strong> local paths such as
+          <code class="bg-muted rounded px-1">./assets/partner-logo-light.svg</code> are resolved
+          relative to the activate folder where the
+          <code class="bg-muted rounded px-1">.activationcode</code> file lives.
+        </p>
       </div>
     </div>
   </div>

From 881e10461111145177e34633d86c04d2b755e92b Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 16:38:02 -0500
Subject: [PATCH 37/53] fix(onboarding): prevent TLS churn during onboarding
 apply

- Purpose: stabilize onboarding GraphQL operations in HTTPS sessions on Firefox by avoiding unnecessary identity writes and deferring identity mutation timing.
- Before: onboarding could run UpdateServerIdentity early, and server identity writes executed emcmd even when name/comment/sysModel were unchanged.
- Why this was a problem: identity writes can trigger Unraid web identity/certificate regeneration or nginx cert reload paths; Firefox then sees a different presented certificate for the same IP, invalidates prior trust state, and blocks subsequent /graphql requests until the user re-accepts the new cert.
- What this change accomplishes: prevents avoidable cert rotation events and prevents mid-flow TLS breakage while language/plugin mutations are running.
- How it works:
  - Add a no-op guard in ServerService.updateServerIdentity to skip emcmd when identity fields are unchanged.
  - Reuse a shared response builder for both no-op and updated paths.
  - Add unit tests covering unchanged identity/sysModel no-op behavior.
  - Move onboarding identity apply to the end of summary execution so plugin/language/finalization calls complete before any potential cert-affecting identity change.
---
 .../resolvers/servers/server.service.spec.ts  | 29 ++++++++
 .../graph/resolvers/servers/server.service.ts | 67 ++++++++++++-------
 .../steps/OnboardingSummaryStep.vue           | 52 +++++++-------
 3 files changed, 99 insertions(+), 49 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts b/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts
index b8f8eb266e..f2f5e0807e 100644
--- a/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/servers/server.service.spec.ts
@@ -131,6 +131,35 @@ describe('ServerService', () => {
         });
     });
 
+    it('skips emcmd when identity values are unchanged', async () => {
+        const result = await service.updateServerIdentity('Tower', 'Tower comment');
+
+        expect(emcmd).not.toHaveBeenCalled();
+        expect(result).toMatchObject({
+            name: 'Tower',
+            comment: 'Tower comment',
+            lanip: '192.168.1.10',
+        });
+    });
+
+    it('skips emcmd when sysModel is unchanged', async () => {
+        vi.mocked(getters.emhttp).mockReturnValue({
+            var: {
+                name: 'Tower',
+                fsState: 'Stopped',
+                regGuid: 'GUID-123',
+                port: '80',
+                comment: 'Tower comment',
+                sysModel: 'Model X200',
+            },
+            networks: [{ ipaddr: ['192.168.1.10'] }],
+        } as unknown as ReturnType<typeof getters.emhttp>);
+
+        await service.updateServerIdentity('Tower', 'Tower comment', 'Model X200');
+
+        expect(emcmd).not.toHaveBeenCalled();
+    });
+
     it('includes SYS_MODEL when provided', async () => {
         await service.updateServerIdentity('Tower', 'Primary host', 'Model X200');
 
diff --git a/api/src/unraid-api/graph/resolvers/servers/server.service.ts b/api/src/unraid-api/graph/resolvers/servers/server.service.ts
index 9ff0b875ce..aa2b4f0cff 100644
--- a/api/src/unraid-api/graph/resolvers/servers/server.service.ts
+++ b/api/src/unraid-api/graph/resolvers/servers/server.service.ts
@@ -14,6 +14,36 @@ import {
 export class ServerService {
     private readonly logger = new Logger(ServerService.name);
 
+    private buildServerResponse(
+        emhttpState: ReturnType<typeof getters.emhttp>,
+        name: string,
+        comment: string
+    ): Server {
+        const guid = emhttpState.var?.regGuid ?? '';
+        const lanip = emhttpState.networks?.[0]?.ipaddr?.[0] ?? '';
+        const port = emhttpState.var?.port ?? '';
+        const owner: ProfileModel = {
+            id: 'local',
+            username: 'root',
+            url: '',
+            avatar: '',
+        };
+
+        return {
+            id: 'local',
+            owner,
+            guid,
+            apikey: '',
+            name,
+            comment,
+            status: ServerStatus.ONLINE,
+            wanip: '',
+            lanip,
+            localurl: lanip ? `http://${lanip}:${port}` : '',
+            remoteurl: '',
+        };
+    }
+
     /**
      * Updates the server identity (name and comment/description).
      * The array must be stopped to change the server name.
@@ -58,7 +88,16 @@ export class ServerService {
         // Actually, UI only disables it if array is not stopped.
         // Let's check current name.
         const currentEmhttp = getters.emhttp();
-        const currentName = currentEmhttp.var?.name;
+        const currentName = currentEmhttp.var?.name ?? '';
+        const currentComment = currentEmhttp.var?.comment ?? '';
+        const currentSysModel = currentEmhttp.var?.sysModel ?? '';
+        const nextComment = comment ?? currentComment;
+        const nextSysModel = sysModel ?? currentSysModel;
+
+        if (name === currentName && nextComment === currentComment && nextSysModel === currentSysModel) {
+            this.logger.log('Server identity unchanged; skipping emcmd update.');
+            return this.buildServerResponse(currentEmhttp, currentName, currentComment);
+        }
 
         if (name !== currentName) {
             const fsState = currentEmhttp.var?.fsState;
@@ -83,30 +122,8 @@ export class ServerService {
             await emcmd(params, { waitForToken: true });
             this.logger.log('Server identity updated successfully via emcmd.');
             const latestEmhttp = getters.emhttp();
-            const guid = latestEmhttp.var?.regGuid ?? '';
-            const lanip = latestEmhttp.networks?.[0]?.ipaddr?.[0] ?? '';
-            const port = latestEmhttp.var?.port ?? '';
-            const nextComment = comment ?? latestEmhttp.var?.comment;
-            const owner: ProfileModel = {
-                id: 'local',
-                username: 'root',
-                url: '',
-                avatar: '',
-            };
-
-            return {
-                id: 'local',
-                owner,
-                guid,
-                apikey: '',
-                name,
-                comment: nextComment,
-                status: ServerStatus.ONLINE,
-                wanip: '',
-                lanip,
-                localurl: lanip ? `http://${lanip}:${port}` : '',
-                remoteurl: '',
-            };
+            const responseComment = comment ?? latestEmhttp.var?.comment ?? currentComment;
+            return this.buildServerResponse(latestEmhttp, name, responseComment);
         } catch (error) {
             this.logger.error('Failed to update server identity', error);
             throw new GraphQLError('Failed to update server identity');
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index d673fce79c..5fb06170f6 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -646,6 +646,32 @@ const handleComplete = async () => {
     const shouldApplyTheme = baselineLoaded ? targetCoreSettings.theme !== currentTheme : true;
     const shouldApplyLocale = baselineLoaded ? targetCoreSettings.locale !== currentLocale : true;
     const shouldApplySsh = baselineLoaded ? targetCoreSettings.useSsh !== currentSsh : true;
+    const applyServerIdentityAtEnd = async () => {
+      if (!shouldApplyServerIdentity) {
+        return;
+      }
+
+      addLog(summaryT('logs.updatingServerIdentity', { name: targetCoreSettings.serverName }), 'info');
+      try {
+        await updateServerIdentity({
+          name: targetCoreSettings.serverName,
+          comment: targetCoreSettings.serverDescription,
+          sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
+        });
+        addLog(summaryT('logs.serverIdentityUpdated'), 'success');
+      } catch (caughtError: unknown) {
+        hadNonOptimisticFailures = true;
+        hadWarnings = true;
+        addErrorLog(summaryT('logs.serverIdentityErrorContinue'), caughtError, {
+          operation: 'UpdateServerIdentity',
+          variables: {
+            name: targetCoreSettings.serverName,
+            comment: targetCoreSettings.serverDescription,
+            sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
+          },
+        });
+      }
+    };
 
     if (!hasAnyChangesToApply.value) {
       addLog(summaryT('logs.noChanges'), 'info');
@@ -671,30 +697,6 @@ const handleComplete = async () => {
       );
     }
 
-    if (shouldApplyServerIdentity) {
-      addLog(summaryT('logs.updatingServerIdentity', { name: targetCoreSettings.serverName }), 'info');
-      promises.push(
-        updateServerIdentity({
-          name: targetCoreSettings.serverName,
-          comment: targetCoreSettings.serverDescription,
-          sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
-        })
-          .then(() => addLog(summaryT('logs.serverIdentityUpdated'), 'success'))
-          .catch((caughtError: unknown) => {
-            hadNonOptimisticFailures = true;
-            hadWarnings = true;
-            addErrorLog(summaryT('logs.serverIdentityErrorContinue'), caughtError, {
-              operation: 'UpdateServerIdentity',
-              variables: {
-                name: targetCoreSettings.serverName,
-                comment: targetCoreSettings.serverDescription,
-                sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
-              },
-            });
-          })
-      );
-    }
-
     if (shouldApplyTheme) {
       addLog(summaryT('logs.settingTheme', { theme: targetCoreSettings.theme }), 'info');
       promises.push(
@@ -1047,6 +1049,8 @@ const handleComplete = async () => {
       addLog(summaryT('logs.skipRefreshApiUnavailable'), 'info');
     }
 
+    await applyServerIdentityAtEnd();
+
     if (!completionMarked) {
       applyResultSeverity.value = 'warning';
       applyResultTitle.value = summaryT('result.bestEffortTitle');

From 4658449ca728b87dacffea1428d0301f8f31b80c Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 17:34:25 -0500
Subject: [PATCH 38/53] fix(onboarding): align completion logs with identity
 apply

- Purpose: correct misleading onboarding completion sequencing in the summary log and improve server description presentation.
- Before: the console could show "Finalizing setup" and "Setup complete" before the late identity mutation ran, which looked like completion happened early.
- Why that was a problem: users interpreted onboarding as finished while a remaining identity operation was still pending.
- What this change accomplishes: setup completion is now logged only after the identity step is attempted, and server description is displayed in a read-only textbox-style block on the summary card.
- How it works:
  - Move finalization logging to the end phase, immediately before the deferred identity apply.
  - Emit "Setup complete" only after the identity apply attempt when onboarding completion was marked.
  - Add a computed  fallback and render it in a non-editable input-like container.
---
 .../steps/OnboardingSummaryStep.vue           | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 5fb06170f6..2f867b6bc7 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -130,6 +130,9 @@ const displayTheme = computed(() => {
 const displayLanguage = computed(() => {
   return draftStore.selectedLanguage || coreSettingsResult.value?.display?.locale || 'en_US';
 });
+const summaryServerDescription = computed(
+  () => draftStore.serverDescription || coreSettingsResult.value?.server?.comment || ''
+);
 
 const selectedBootMode = computed(() =>
   draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
@@ -1011,13 +1014,10 @@ const handleComplete = async () => {
     }
 
     // 5. Mark Complete
-    addLog(summaryT('logs.finalizingSetup'), 'info');
-
     try {
       await completeOnboarding();
       completionMarked = true;
       cleanupOnboardingStorage({ clearTemporaryBypassSessionState: true });
-      addLog(summaryT('logs.setupComplete'), 'success');
     } catch (caughtError: unknown) {
       hadWarnings = true;
       addErrorLog(summaryT('logs.completeOnboardingFailed'), caughtError, {
@@ -1049,7 +1049,11 @@ const handleComplete = async () => {
       addLog(summaryT('logs.skipRefreshApiUnavailable'), 'info');
     }
 
+    addLog(summaryT('logs.finalizingSetup'), 'info');
     await applyServerIdentityAtEnd();
+    if (completionMarked) {
+      addLog(summaryT('logs.setupComplete'), 'success');
+    }
 
     if (!completionMarked) {
       applyResultSeverity.value = 'warning';
@@ -1169,11 +1173,14 @@ const handleBack = () => {
               <span class="text-muted">{{ t('onboarding.coreSettings.serverName') }}</span>
               <span class="text-highlighted font-medium break-all sm:text-right">{{ serverName }}</span>
             </div>
-            <div class="bg-elevated flex flex-col rounded text-sm" v-if="draftStore.serverDescription">
+            <div v-if="summaryServerDescription" class="space-y-1">
               <span class="text-muted">{{ t('onboarding.coreSettings.serverDescription') }}</span>
-              <span class="text-highlighted font-medium break-all">{{
-                draftStore.serverDescription
-              }}</span>
+              <div
+                class="border-muted bg-default text-highlighted min-h-10 w-full rounded-md border px-3 py-2 text-sm font-medium break-all"
+                aria-readonly="true"
+              >
+                {{ summaryServerDescription }}
+              </div>
             </div>
             <div class="flex flex-col gap-1 text-sm sm:flex-row sm:items-start sm:justify-between">
               <span class="text-muted">{{ t('onboarding.summaryStep.activationLabel') }}</span>

From 121f5d884dcca89356c34030b0e01522e4725aa5 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Thu, 5 Mar 2026 19:06:30 -0500
Subject: [PATCH 39/53] fix(web): infer boot mode from internal context

- Purpose: ensure OnboardingSummaryStep shows the correct boot method in summary state.

- Before: boot mode defaulted to USB unless draft boot selections were already set in store state.

- Problem: internal-boot flows with persisted context could render a USB label even when a storage boot device exists.

- Change: selectedBootMode now falls back to internal boot context array.boot.device to detect storage mode.

- Implementation: keep existing store checks first, then inspect context device string and treat non-empty values as storage; also align server description styling with accented summary field visuals.
---
 .../Onboarding/steps/OnboardingSummaryStep.vue   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 2f867b6bc7..6c2bc1637b 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -134,9 +134,17 @@ const summaryServerDescription = computed(
   () => draftStore.serverDescription || coreSettingsResult.value?.server?.comment || ''
 );
 
-const selectedBootMode = computed(() =>
-  draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection) ? 'storage' : 'usb'
-);
+const selectedBootMode = computed(() => {
+  if (draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection)) {
+    return 'storage';
+  }
+
+  const context = internalBootContextResult.value as {
+    array?: { boot?: { device?: string | null } | null } | null;
+  } | null;
+  const bootDevice = context?.array?.boot?.device;
+  return typeof bootDevice === 'string' && bootDevice.trim().length > 0 ? 'storage' : 'usb';
+});
 const bootModeLabel = computed(() =>
   selectedBootMode.value === 'storage'
     ? t('onboarding.summaryStep.bootConfig.bootMethodStorage')
@@ -1176,7 +1184,7 @@ const handleBack = () => {
             <div v-if="summaryServerDescription" class="space-y-1">
               <span class="text-muted">{{ t('onboarding.coreSettings.serverDescription') }}</span>
               <div
-                class="border-muted bg-default text-highlighted min-h-10 w-full rounded-md border px-3 py-2 text-sm font-medium break-all"
+                class="border-muted bg-accented text-toned mt-1 min-h-10 w-full rounded-md border px-3 py-2 text-sm font-medium break-all"
                 aria-readonly="true"
               >
                 {{ summaryServerDescription }}

From 7909059c48b66d408a43451172b57b92894b7761 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 10:32:49 -0500
Subject: [PATCH 40/53] fix(onboarding): surface BIOS update outcome in apply
 logs

- Purpose: expose BIOS boot update success/failure in user-visible onboarding logs while preserving successful internal boot setup behavior.

- Before:  could return  even when  steps failed, but onboarding success logs only showed a generic success line and hid BIOS-specific outcomes.

- Problem: users could not tell whether BIOS boot order updates were applied automatically or required manual intervention.

- Change: track  failures during BIOS update flow, append explicit API output summary lines for BIOS success vs warning, and surface those lines (plus failure lines) in onboarding summary logs.

- Result: internal boot remains successful when BIOS update is best-effort, but UI now clearly reports BIOS update status and classifies warning outcomes appropriately.

- Verification: updated API and web tests to cover BIOS success/warning output propagation and visible-log rendering.
---
 .../onboarding-internal-boot.service.spec.ts  | 36 +++++++++++++++++
 .../onboarding-internal-boot.service.ts       | 24 ++++++++++--
 .../Onboarding/OnboardingSummaryStep.test.ts  | 39 +++++++++++++++++++
 .../steps/OnboardingSummaryStep.vue           | 33 ++++++++++++++++
 4 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
index 368827955e..a57700b50a 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
@@ -127,6 +127,7 @@ describe('OnboardingInternalBootService', () => {
 
         expect(result.ok).toBe(true);
         expect(result.code).toBe(0);
+        expect(result.output).toContain('BIOS boot entry updates completed successfully.');
         expect(vi.mocked(emcmd)).toHaveBeenCalledTimes(4);
         expect(vi.mocked(loadStateFileSync)).not.toHaveBeenCalled();
         expect(vi.mocked(execa)).toHaveBeenNthCalledWith(1, 'efibootmgr', [], { reject: false });
@@ -164,6 +165,41 @@ describe('OnboardingInternalBootService', () => {
         );
     });
 
+    it('returns success and warning output when efibootmgr updates fail', async () => {
+        vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
+        vi.mocked(execa)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: 'Permission denied',
+                exitCode: 1,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: 'No such file or directory',
+                exitCode: 1,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: '',
+                exitCode: 1,
+            } as Awaited<ReturnType<typeof execa>>);
+        const service = new OnboardingInternalBootService();
+
+        const result = await service.createInternalBootPool({
+            poolName: 'cache',
+            devices: ['disk-1'],
+            bootSizeMiB: 16384,
+            updateBios: true,
+        });
+
+        expect(result.ok).toBe(true);
+        expect(result.code).toBe(0);
+        expect(result.output).toContain('efibootmgr failed for');
+        expect(result.output).toContain(
+            'BIOS boot entry updates completed with warnings; manual BIOS boot order changes may still be required.'
+        );
+    });
+
     it('returns validation error for duplicate devices', async () => {
         const service = new OnboardingInternalBootService();
 
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
index 913784f791..4be13e2934 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -154,7 +154,11 @@ export class OnboardingInternalBootService {
         return null;
     }
 
-    private async updateBiosBootEntries(devices: string[], output: string[]): Promise<void> {
+    private async updateBiosBootEntries(
+        devices: string[],
+        output: string[]
+    ): Promise<{ hadFailures: boolean }> {
+        let hadFailures = false;
         this.ensureEmhttpBootContext();
         const devsById = this.getDeviceMapFromEmhttpState();
 
@@ -167,6 +171,7 @@ export class OnboardingInternalBootService {
         for (const bootNumber of bootLabelMap.values()) {
             const deleteResult = await this.runEfiBootMgr(['-b', bootNumber, '-B'], output);
             if (deleteResult.exitCode !== 0) {
+                hadFailures = true;
                 output.push(
                     `efibootmgr failed to delete boot entry ${bootNumber} (rc=${deleteResult.exitCode})`
                 );
@@ -201,6 +206,7 @@ export class OnboardingInternalBootService {
                 output
             );
             if (createResult.exitCode !== 0) {
+                hadFailures = true;
                 output.push(
                     `efibootmgr failed for ${this.shellQuote(devicePath)} (rc=${createResult.exitCode})`
                 );
@@ -216,13 +222,15 @@ export class OnboardingInternalBootService {
                 output
             );
             if (flashResult.exitCode !== 0) {
+                hadFailures = true;
                 output.push(`efibootmgr failed for flash (rc=${flashResult.exitCode})`);
             }
         }
 
         const currentEntries = await this.runEfiBootMgr([], output);
         if (currentEntries.exitCode !== 0) {
-            return;
+            hadFailures = true;
+            return { hadFailures };
         }
 
         const labelMap = this.parseBootLabelMap(currentEntries.lines);
@@ -247,7 +255,7 @@ export class OnboardingInternalBootService {
 
         const uniqueOrder = [...new Set(desiredOrder.filter((entry) => entry.length > 0))];
         if (uniqueOrder.length === 0) {
-            return;
+            return { hadFailures };
         }
 
         const nextBoot = uniqueOrder[0];
@@ -258,8 +266,11 @@ export class OnboardingInternalBootService {
 
         const orderResult = await this.runEfiBootMgr(orderArgs, output);
         if (orderResult.exitCode !== 0) {
+            hadFailures = true;
             output.push(`efibootmgr failed to set boot order (rc=${orderResult.exitCode})`);
         }
+
+        return { hadFailures };
     }
 
     async createInternalBootPool(
@@ -324,7 +335,12 @@ export class OnboardingInternalBootService {
 
             if (input.updateBios) {
                 output.push('Applying BIOS boot entry updates...');
-                await this.updateBiosBootEntries(input.devices, output);
+                const biosUpdateResult = await this.updateBiosBootEntries(input.devices, output);
+                output.push(
+                    biosUpdateResult.hadFailures
+                        ? 'BIOS boot entry updates completed with warnings; manual BIOS boot order changes may still be required.'
+                        : 'BIOS boot entry updates completed successfully.'
+                );
             }
 
             return {
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 7759d73e23..3155ec59ba 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -1047,6 +1047,13 @@ describe('OnboardingSummaryStep', () => {
       updateBios: true,
     };
     draftStore.internalBootSkipped = false;
+    submitInternalBootCreationMock.mockResolvedValue({
+      ok: true,
+      output: [
+        'Applying BIOS boot entry updates...',
+        'BIOS boot entry updates completed successfully.',
+      ].join('\n'),
+    });
 
     const { wrapper } = mountComponent();
     await clickApply(wrapper);
@@ -1062,6 +1069,9 @@ describe('OnboardingSummaryStep', () => {
     );
     expect(setInternalBootApplySucceededMock).toHaveBeenCalledWith(true);
     expect(wrapper.text()).toContain('Internal boot pool configured.');
+    expect(wrapper.text()).toContain('BIOS boot entry updates completed successfully.');
+    expect(wrapper.text()).toContain('Setup Applied');
+    expect(wrapper.text()).not.toContain('Setup Applied with Warnings');
   });
 
   it('continues with warnings when internal boot setup returns an error', async () => {
@@ -1085,4 +1095,33 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('Internal boot setup returned an error: mkbootpool failed');
     expect(wrapper.text()).toContain('Setup Applied with Warnings');
   });
+
+  it('surfaces BIOS update warnings in visible logs while keeping internal boot successful', async () => {
+    draftStore.bootMode = 'storage';
+    draftStore.internalBootSelection = {
+      poolName: 'cache',
+      slotCount: 1,
+      devices: ['diskA'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    };
+    submitInternalBootCreationMock.mockResolvedValue({
+      ok: true,
+      output: [
+        'Applying BIOS boot entry updates...',
+        "efibootmgr failed for '/dev/sda' (rc=1)",
+        'BIOS boot entry updates completed with warnings; manual BIOS boot order changes may still be required.',
+      ].join('\n'),
+    });
+
+    const { wrapper } = mountComponent();
+    await clickApply(wrapper);
+
+    expect(setInternalBootApplySucceededMock).toHaveBeenCalledWith(true);
+    expect(wrapper.text()).toContain(
+      'BIOS boot entry updates completed with warnings; manual BIOS boot order changes may still be required.'
+    );
+    expect(wrapper.text()).toContain("efibootmgr failed for '/dev/sda' (rc=1)");
+    expect(wrapper.text()).toContain('Setup Applied with Warnings');
+  });
 });
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 6c2bc1637b..9361835a49 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -312,6 +312,23 @@ const addErrorLog = (message: string, caughtError: unknown, context: OnboardingE
   );
 };
 
+interface InternalBootBiosLogSummary {
+  summaryLine: string | null;
+  failureLines: string[];
+}
+
+const summarizeInternalBootBiosLogs = (output: string): InternalBootBiosLogSummary => {
+  const lines = output
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0);
+  const summaryLine = lines.find((line) => line.startsWith('BIOS boot entry updates completed')) ?? null;
+  const failureLines = Array.from(
+    new Set(lines.filter((line) => line.toLowerCase().includes('efibootmgr failed')))
+  );
+  return { summaryLine, failureLines };
+};
+
 const showDiagnosticLogsInResultDialog = computed(
   () => applyResultSeverity.value !== 'success' && logs.value.length > 0
 );
@@ -945,6 +962,22 @@ const handleComplete = async () => {
         if (result.ok) {
           draftStore.setInternalBootApplySucceeded(true);
           addLog(summaryT('logs.internalBootConfigured'), 'success');
+          if (selection.updateBios) {
+            const biosLogSummary = summarizeInternalBootBiosLogs(result.output);
+            const hadBiosWarnings =
+              biosLogSummary.failureLines.length > 0 ||
+              Boolean(biosLogSummary.summaryLine?.toLowerCase().includes('with warnings'));
+            if (hadBiosWarnings) {
+              hadWarnings = true;
+              hadNonOptimisticFailures = true;
+            }
+            if (biosLogSummary.summaryLine) {
+              addLog(biosLogSummary.summaryLine, hadBiosWarnings ? 'error' : 'success');
+            }
+            for (const failureLine of biosLogSummary.failureLines) {
+              addLog(failureLine, 'error');
+            }
+          }
         } else {
           hadNonOptimisticFailures = true;
           hadWarnings = true;

From 8a7e2abbf1dbb79a4c1920414548bc03f7ee4337 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 10:53:19 -0500
Subject: [PATCH 41/53] refactor(disks): drop onboarding emhttp sector fields

- Purpose: remove redundant emhttp-derived  and  fields from  and onboarding usage while keeping .

- Before: the API exposed  and , and onboarding queried aliases (, ) to compute size bytes.

- Problem: those values duplicate existing size data for onboarding, increase schema surface area, and are not consumed by .

- After: onboarding uses the existing  value and the API no longer resolves or exposes emhttp sector fields.

- How: removed fields from the  model/service, updated onboarding GraphQL query and Vue consumers, and regenerated API/web GraphQL typings and schema artifacts.
---
 api/generated-schema.graphql                  |  8 +-----
 api/src/unraid-api/cli/generated/graphql.ts   |  4 ---
 .../graph/resolvers/disks/disks.model.ts      | 16 -----------
 .../resolvers/disks/disks.service.spec.ts     |  2 --
 .../graph/resolvers/disks/disks.service.ts    | 27 -------------------
 .../graphql/getInternalBootContext.query.ts   |  2 --
 .../steps/OnboardingInternalBootStep.vue      | 22 +--------------
 .../steps/OnboardingSummaryStep.vue           | 22 +--------------
 web/src/composables/gql/gql.ts                |  6 ++---
 web/src/composables/gql/graphql.ts            |  8 ++----
 10 files changed, 8 insertions(+), 109 deletions(-)

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 780bee08c5..a17ae1ee06 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -343,12 +343,6 @@ type Disk implements Node {
   """
   emhttpDeviceId: String
 
-  """Sector count from emhttp devs.ini for this device"""
-  sectors: Float
-
-  """Sector size in bytes from emhttp devs.ini for this device"""
-  sectorSize: Float
-
   """The interface type of the disk"""
   interfaceType: DiskInterfaceType!
 
@@ -3559,4 +3553,4 @@ type Subscription {
   systemMetricsTemperature: TemperatureMetrics
   upsUpdates: UPSDevice!
   pluginInstallUpdates(operationId: ID!): PluginInstallEvent!
-}
\ No newline at end of file
+}
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index 47606cefc4..b299c1b8d5 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -723,10 +723,6 @@ export type Disk = Node & {
   name: Scalars['String']['output'];
   /** The partitions on the disk */
   partitions: Array<DiskPartition>;
-  /** Sector size in bytes from emhttp devs.ini for this device */
-  sectorSize?: Maybe<Scalars['Float']['output']>;
-  /** Sector count from emhttp devs.ini for this device */
-  sectors?: Maybe<Scalars['Float']['output']>;
   /** The number of sectors per track */
   sectorsPerTrack: Scalars['Float']['output'];
   /** The serial number of the disk */
diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.model.ts b/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
index 0942acf05b..ee30bce0e6 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
@@ -131,22 +131,6 @@ export class Disk extends Node {
     @IsString()
     emhttpDeviceId?: string;
 
-    @Field(() => Number, {
-        nullable: true,
-        description: 'Sector count from emhttp devs.ini for this device',
-    })
-    @IsOptional()
-    @IsNumber()
-    sectors?: number;
-
-    @Field(() => Number, {
-        nullable: true,
-        description: 'Sector size in bytes from emhttp devs.ini for this device',
-    })
-    @IsOptional()
-    @IsNumber()
-    sectorSize?: number;
-
     @Field(() => DiskInterfaceType, { description: 'The interface type of the disk' })
     @IsEnum(DiskInterfaceType)
     interfaceType!: DiskInterfaceType;
diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts b/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
index 775ed60b76..1668933fc5 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
@@ -396,8 +396,6 @@ describe('DisksService', () => {
             expect(spinningDisk?.isSpinning).toBe(true); // From state
             expect(spinningDisk?.interfaceType).toBe(DiskInterfaceType.SATA);
             expect(spinningDisk?.emhttpDeviceId).toBe('WD-WCC7K7YL9876');
-            expect(spinningDisk?.sectors).toBe(7814037168);
-            expect(spinningDisk?.sectorSize).toBe(512);
 
             // Check spun down disk
             const spunDownDisk = disks.find((d) => d.id === 'WD-SPUNDOWN123');
diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
index 03bbc11f7c..85ee1b1fdf 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
@@ -44,32 +44,13 @@ const SmartDataSchema = z.object({
 interface EmhttpDevice {
     id?: string;
     device?: string;
-    sectors?: number;
-    sectorSize?: number;
 }
 
 interface EmhttpDeviceRecord {
     id?: unknown;
     device?: unknown;
-    sectors?: unknown;
-    sector_size?: unknown;
 }
 
-const parseNumeric = (value: unknown): number | undefined => {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-        return value;
-    }
-
-    if (typeof value === 'string' && value.trim().length > 0) {
-        const parsed = Number(value);
-        if (Number.isFinite(parsed)) {
-            return parsed;
-        }
-    }
-
-    return undefined;
-};
-
 const normalizeDeviceName = (value: string | undefined): string => {
     if (!value) {
         return '';
@@ -93,8 +74,6 @@ export class DisksService {
             const record = raw as EmhttpDeviceRecord;
             const id = typeof record.id === 'string' ? record.id.trim() : '';
             const device = typeof record.device === 'string' ? record.device.trim() : '';
-            const sectors = parseNumeric(record.sectors);
-            const sectorSize = parseNumeric(record.sector_size);
 
             if (!id || !device) {
                 continue;
@@ -103,8 +82,6 @@ export class DisksService {
             emhttpDevices.push({
                 id,
                 device: normalizeDeviceName(device),
-                sectors,
-                sectorSize,
             });
         }
 
@@ -238,15 +215,11 @@ export class DisksService {
 
         const arrayDisk = arrayDisks.find((d) => d.id.trim() === disk.serialNum.trim());
         const emhttpDevice = this.findEmhttpDevice(disk, emhttpDevices);
-        const sectors = emhttpDevice?.sectors;
-        const sectorSize = emhttpDevice?.sectorSize;
 
         return {
             ...disk,
             id: disk.serialNum, // Ensure id is set
             emhttpDeviceId: emhttpDevice?.id,
-            sectors,
-            sectorSize,
             smartStatus:
                 DiskSmartStatus[disk.smartStatus?.toUpperCase() as keyof typeof DiskSmartStatus] ??
                 DiskSmartStatus.UNKNOWN,
diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index 5a5fa7f4e5..80c69b4ab8 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -31,8 +31,6 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
       device
       size
       emhttpDeviceId
-      emhttpSectors: sectors
-      emhttpSectorSize: sectorSize
     }
   }
 `;
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 2845f153b5..b7e8a4189b 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -66,8 +66,6 @@ interface InternalBootContext {
     device: string;
     size: number;
     emhttpDeviceId?: string | null;
-    emhttpSectors?: number | null;
-    emhttpSectorSize?: number | null;
   }[];
 }
 
@@ -109,24 +107,6 @@ const normalizeDeviceName = (value: string | null | undefined): string => {
   return trimmed;
 };
 
-const deriveDeviceSizeBytes = (
-  sectors: number | null | undefined,
-  sectorSize: number | null | undefined,
-  fallbackSize: number
-) => {
-  if (
-    typeof sectors === 'number' &&
-    Number.isFinite(sectors) &&
-    sectors > 0 &&
-    typeof sectorSize === 'number' &&
-    Number.isFinite(sectorSize) &&
-    sectorSize > 0
-  ) {
-    return sectors * sectorSize;
-  }
-  return fallbackSize;
-};
-
 const {
   result: contextResult,
   loading: contextLoading,
@@ -186,7 +166,7 @@ const templateData = computed<InternalBootTemplateData | null>(() => {
       const device = normalizeDeviceName(disk.device);
       const emhttpDeviceId = disk.emhttpDeviceId?.trim() || '';
       const optionValue = emhttpDeviceId || device;
-      const sizeBytes = deriveDeviceSizeBytes(disk.emhttpSectors, disk.emhttpSectorSize, disk.size);
+      const sizeBytes = disk.size;
       const sizeMiB = toSizeMiB(sizeBytes);
       const sizeLabel = formatBytes(sizeBytes);
       return {
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 9361835a49..9481537bc0 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -195,30 +195,10 @@ const normalizeDeviceName = (value: string | null | undefined): string => {
   return trimmed;
 };
 
-const deriveDeviceSizeBytes = (
-  sectors: number | null | undefined,
-  sectorSize: number | null | undefined,
-  fallbackSize: number
-) => {
-  if (
-    typeof sectors === 'number' &&
-    Number.isFinite(sectors) &&
-    sectors > 0 &&
-    typeof sectorSize === 'number' &&
-    Number.isFinite(sectorSize) &&
-    sectorSize > 0
-  ) {
-    return sectors * sectorSize;
-  }
-  return fallbackSize;
-};
-
 interface InternalBootContextDisk {
   device: string;
   size: number;
   emhttpDeviceId?: string | null;
-  emhttpSectors?: number | null;
-  emhttpSectorSize?: number | null;
 }
 
 const internalBootDeviceLabelById = computed(() => {
@@ -234,7 +214,7 @@ const internalBootDeviceLabelById = computed(() => {
 
     const emhttpDeviceId = disk.emhttpDeviceId?.trim() || '';
     const optionValue = emhttpDeviceId || device;
-    const sizeBytes = deriveDeviceSizeBytes(disk.emhttpSectors, disk.emhttpSectorSize, disk.size);
+    const sizeBytes = disk.size;
     const sizeLabel = formatBytes(sizeBytes);
     const label = `${optionValue} - ${sizeLabel} (${device})`;
 
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 39b60ee474..9eed549c67 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -74,7 +74,7 @@ type Documents = {
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": typeof types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": typeof types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
@@ -159,7 +159,7 @@ const documents: Documents = {
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
@@ -441,7 +441,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n      emhttpSectors: sectors\n      emhttpSectorSize: sectorSize\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index a4145ff892..c95d2f011b 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -723,10 +723,6 @@ export type Disk = Node & {
   name: Scalars['String']['output'];
   /** The partitions on the disk */
   partitions: Array<DiskPartition>;
-  /** Sector size in bytes from emhttp devs.ini for this device */
-  sectorSize?: Maybe<Scalars['Float']['output']>;
-  /** Sector count from emhttp devs.ini for this device */
-  sectors?: Maybe<Scalars['Float']['output']>;
   /** The number of sectors per track */
   sectorsPerTrack: Scalars['Float']['output'];
   /** The serial number of the disk */
@@ -3901,7 +3897,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null, emhttpSectors?: number | null, emhttpSectorSize?: number | null }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null }> };
 
 export type GetInternalBootStepVisibilityQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -4092,7 +4088,7 @@ export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"Oper
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const CreateInternalBootPoolDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateInternalBootPool"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateInternalBootPoolInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createInternalBootPool"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}},{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<CreateInternalBootPoolMutation, CreateInternalBootPoolMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}},{"kind":"Field","alias":{"kind":"Name","value":"emhttpSectors"},"name":{"kind":"Name","value":"sectors"}},{"kind":"Field","alias":{"kind":"Name","value":"emhttpSectorSize"},"name":{"kind":"Name","value":"sectorSize"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const GetInternalBootStepVisibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootStepVisibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootStepVisibilityQuery, GetInternalBootStepVisibilityQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;

From 71f67f79e96d513d3983a933f2447880d9c483ed Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 11:24:44 -0500
Subject: [PATCH 42/53] fix(web-onboarding): apply CodeRabbit fixes for
 onboarding flow

- Purpose: address CodeRabbit findings in onboarding web flow around validation safety, failure handling, visibility defaults, and type drift.

- Before: pool-name validation used a risky regex, mutation errors could reject instead of returning structured failures, internal boot step defaulted open on unknown visibility, persisted booleans used loose coercion, and step IDs were duplicated across components.

- Problem: this created safety/UX risks (ReDoS and unstructured failures), incorrect visibility behavior for destructive flow, incorrect restored draft flags, and maintenance drift from duplicated step unions.

- New behavior: pool-name validation is linear-safe, internal boot mutation exceptions return typed failure results, internal boot step fails closed unless explicitly enabled, persisted booleans parse strictly, and  is centralized in .

- How: updated onboarding components/composables/store, unified shared step typing, and stabilized associated onboarding tests to assert durable behavior instead of long-copy literals.
---
 .../OnboardingNextStepsStep.test.ts           |  4 +-
 .../Onboarding/OnboardingSummaryStep.test.ts  |  3 +-
 .../Onboarding/internalBoot.test.ts           | 19 +++++--
 .../components/Onboarding/OnboardingModal.vue | 19 ++-----
 .../components/Onboarding/OnboardingSteps.vue | 12 +----
 .../Onboarding/composables/internalBoot.ts    | 52 +++++++++++--------
 web/src/components/Onboarding/stepRegistry.ts | 16 +++++-
 .../steps/OnboardingInternalBootStep.vue      |  5 +-
 .../Onboarding/store/onboardingDraft.ts       | 43 ++++++++++++---
 9 files changed, 110 insertions(+), 63 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
index 0e5bb6e43e..0b51cc787d 100644
--- a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
@@ -94,9 +94,7 @@ describe('OnboardingNextStepsStep', () => {
     await flushPromises();
 
     expect(wrapper.text()).toContain('Confirm Reboot');
-    expect(wrapper.text()).toContain(
-      'On some systems, you may need to manually change the BIOS boot order from the USB device to the storage drive.'
-    );
+    expect(wrapper.text()).toContain('Please do NOT remove your Unraid flash drive');
     expect(submitInternalBootRebootMock).not.toHaveBeenCalled();
     expect(onComplete).not.toHaveBeenCalled();
 
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 3155ec59ba..ec02ab7b78 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -1092,7 +1092,8 @@ describe('OnboardingSummaryStep', () => {
     await clickApply(wrapper);
 
     expect(setInternalBootApplySucceededMock).not.toHaveBeenCalledWith(true);
-    expect(wrapper.text()).toContain('Internal boot setup returned an error: mkbootpool failed');
+    expect(wrapper.text()).toContain('Internal boot setup returned an error');
+    expect(wrapper.text()).toContain('mkbootpool failed');
     expect(wrapper.text()).toContain('Setup Applied with Warnings');
   });
 
diff --git a/web/__test__/components/Onboarding/internalBoot.test.ts b/web/__test__/components/Onboarding/internalBoot.test.ts
index 5668036dc5..6061f59958 100644
--- a/web/__test__/components/Onboarding/internalBoot.test.ts
+++ b/web/__test__/components/Onboarding/internalBoot.test.ts
@@ -92,10 +92,23 @@ describe('internalBoot composable', () => {
       updateBios: true,
     });
 
-    expect(result).toEqual({
-      ok: false,
-      output: 'Internal boot setup request failed: empty API response.',
+    expect(result.ok).toBe(false);
+    expect(result.output).toContain('Internal boot setup request failed');
+  });
+
+  it('returns structured failure when mutation throws', async () => {
+    mutateMock.mockRejectedValue(new Error('network down'));
+
+    const result = await submitInternalBootCreation({
+      poolName: 'cache',
+      devices: ['disk-1'],
+      bootSizeMiB: 16384,
+      updateBios: true,
     });
+
+    expect(result.ok).toBe(false);
+    expect(result.output).toContain('Internal boot setup request failed');
+    expect(result.output).toContain('network down');
   });
 
   it('passes reboot flag when requested', async () => {
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index c3ce2a7afa..d898821d2e 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -11,6 +11,7 @@ import { GET_INTERNAL_BOOT_STEP_VISIBILITY_QUERY } from '@/components/Onboarding
 import { DOCS_URL_ACCOUNT, DOCS_URL_LICENSING_FAQ } from '~/consts';
 
 import type { BrandButtonProps } from '@unraid/ui';
+import type { StepId } from '~/components/Onboarding/stepRegistry';
 import type { Component } from 'vue';
 
 import OnboardingSteps from '~/components/Onboarding/OnboardingSteps.vue';
@@ -63,16 +64,6 @@ const showKeyfileHint = computed(() => activationRequired.value && hasKeyfile.va
 const activateHref = computed(() => purchaseStore.generateUrl('activate'));
 const activateExternal = computed(() => purchaseStore.openInNewTab);
 
-// Hardcoded step IDs matching the actual step flow
-type StepId =
-  | 'OVERVIEW'
-  | 'CONFIGURE_SETTINGS'
-  | 'CONFIGURE_BOOT'
-  | 'ADD_PLUGINS'
-  | 'ACTIVATE_LICENSE'
-  | 'SUMMARY'
-  | 'NEXT_STEPS';
-
 // Hardcoded step definitions - order matters for UI flow
 const HARDCODED_STEPS: Array<{ id: StepId; required: boolean }> = [
   { id: 'OVERVIEW', required: false },
@@ -98,9 +89,9 @@ const { result: internalBootVisibilityResult } = useQuery(
   }
 );
 
-const hideInternalBootStep = computed(() => {
-  const setting = internalBootVisibilityResult.value?.vars?.enableBootTransfer?.trim().toLowerCase();
-  return setting === 'no';
+const showInternalBootStep = computed(() => {
+  const setting = internalBootVisibilityResult.value?.vars?.enableBootTransfer;
+  return typeof setting === 'string' && setting.trim().toLowerCase() === 'yes';
 });
 
 // Determine which steps to show based on user state
@@ -110,7 +101,7 @@ const visibleHardcodedSteps = computed(() =>
       if (step.id !== 'CONFIGURE_BOOT') {
         return true;
       }
-      return !isPartnerBuild.value && !hideInternalBootStep.value;
+      return !isPartnerBuild.value && showInternalBootStep.value;
     }
   )
 );
diff --git a/web/src/components/Onboarding/OnboardingSteps.vue b/web/src/components/Onboarding/OnboardingSteps.vue
index 8920103ae4..f417e5eba0 100644
--- a/web/src/components/Onboarding/OnboardingSteps.vue
+++ b/web/src/components/Onboarding/OnboardingSteps.vue
@@ -2,20 +2,10 @@
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import type { StepMetadataEntry } from '~/components/Onboarding/stepRegistry';
+import type { StepId, StepMetadataEntry } from '~/components/Onboarding/stepRegistry';
 
 import { stepMetadata } from '~/components/Onboarding/stepRegistry';
 
-// Hardcoded step type matching OnboardingModal
-type StepId =
-  | 'OVERVIEW'
-  | 'CONFIGURE_SETTINGS'
-  | 'CONFIGURE_BOOT'
-  | 'ADD_PLUGINS'
-  | 'ACTIVATE_LICENSE'
-  | 'SUMMARY'
-  | 'NEXT_STEPS';
-
 type HardcodedStep = { id: StepId; required: boolean };
 
 const props = withDefaults(
diff --git a/web/src/components/Onboarding/composables/internalBoot.ts b/web/src/components/Onboarding/composables/internalBoot.ts
index f417a8686a..1313b02af6 100644
--- a/web/src/components/Onboarding/composables/internalBoot.ts
+++ b/web/src/components/Onboarding/composables/internalBoot.ts
@@ -33,33 +33,43 @@ export const submitInternalBootCreation = async (
   options: SubmitInternalBootOptions = {}
 ): Promise<InternalBootSubmitResult> => {
   const apolloClient = useApolloClient().client;
-  const { data } = await apolloClient.mutate({
-    mutation: CREATE_INTERNAL_BOOT_POOL_MUTATION,
-    variables: {
-      input: {
-        poolName: selection.poolName,
-        devices: selection.devices,
-        bootSizeMiB: selection.bootSizeMiB,
-        updateBios: selection.updateBios,
-        reboot: Boolean(options.reboot),
+  try {
+    const { data } = await apolloClient.mutate({
+      mutation: CREATE_INTERNAL_BOOT_POOL_MUTATION,
+      variables: {
+        input: {
+          poolName: selection.poolName,
+          devices: selection.devices,
+          bootSizeMiB: selection.bootSizeMiB,
+          updateBios: selection.updateBios,
+          reboot: Boolean(options.reboot),
+        },
       },
-    },
-    fetchPolicy: 'no-cache',
-  });
+      fetchPolicy: 'no-cache',
+    });
 
-  const result = data?.onboarding?.createInternalBootPool;
-  if (!result) {
+    const result = data?.onboarding?.createInternalBootPool;
+    if (!result) {
+      return {
+        ok: false,
+        output: 'Internal boot setup request failed: empty API response.',
+      };
+    }
+
+    return {
+      ok: result.ok,
+      code: result.code ?? undefined,
+      output: result.output?.trim() || 'No output',
+    };
+  } catch (error) {
     return {
       ok: false,
-      output: 'Internal boot setup request failed: empty API response.',
+      output:
+        error instanceof Error
+          ? `Internal boot setup request failed: ${error.message}`
+          : 'Internal boot setup request failed.',
     };
   }
-
-  return {
-    ok: result.ok,
-    code: result.code ?? undefined,
-    output: result.output?.trim() || 'No output',
-  };
 };
 
 export const submitInternalBootReboot = () => {
diff --git a/web/src/components/Onboarding/stepRegistry.ts b/web/src/components/Onboarding/stepRegistry.ts
index ce0a9c054e..1399877372 100644
--- a/web/src/components/Onboarding/stepRegistry.ts
+++ b/web/src/components/Onboarding/stepRegistry.ts
@@ -8,7 +8,19 @@ import OnboardingOverviewStep from '~/components/Onboarding/steps/OnboardingOver
 import OnboardingPluginsStep from '~/components/Onboarding/steps/OnboardingPluginsStep.vue';
 import OnboardingSummaryStep from '~/components/Onboarding/steps/OnboardingSummaryStep.vue';
 
-export const stepComponents: Record<string, Component> = {
+export const STEP_IDS = [
+  'OVERVIEW',
+  'CONFIGURE_SETTINGS',
+  'CONFIGURE_BOOT',
+  'ADD_PLUGINS',
+  'ACTIVATE_LICENSE',
+  'SUMMARY',
+  'NEXT_STEPS',
+] as const;
+
+export type StepId = (typeof STEP_IDS)[number];
+
+export const stepComponents: Record<StepId, Component> = {
   OVERVIEW: OnboardingOverviewStep,
   CONFIGURE_SETTINGS: OnboardingCoreSettingsStep,
   CONFIGURE_BOOT: OnboardingInternalBootStep,
@@ -24,7 +36,7 @@ export type StepMetadataEntry = {
   icon: string;
 };
 
-export const stepMetadata: Record<string, StepMetadataEntry> = {
+export const stepMetadata: Record<StepId, StepMetadataEntry> = {
   OVERVIEW: {
     titleKey: 'onboarding.overviewStep.welcomeToUnraid',
     descriptionKey: 'onboarding.overviewStep.getStartedWithYourNewSystem',
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index b7e8a4189b..09be32294c 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -452,8 +452,9 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
-  const poolNamePattern = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
-  if (!poolNamePattern.test(normalizedPoolName)) {
+  const poolNameHasValidChars = /^[a-z][a-z0-9~._-]*$/.test(normalizedPoolName);
+  const poolNameHasValidEnding = /[a-z_-]$/.test(normalizedPoolName);
+  if (!poolNameHasValidChars || !poolNameHasValidEnding) {
     formError.value = t('onboarding.internalBootStep.validation.poolFormat');
     return null;
   }
diff --git a/web/src/components/Onboarding/store/onboardingDraft.ts b/web/src/components/Onboarding/store/onboardingDraft.ts
index d8d86a049e..b4fee48976 100644
--- a/web/src/components/Onboarding/store/onboardingDraft.ts
+++ b/web/src/components/Onboarding/store/onboardingDraft.ts
@@ -11,6 +11,33 @@ export interface OnboardingInternalBootSelection {
 
 export type OnboardingBootMode = 'usb' | 'storage';
 
+const normalizePersistedBoolean = (value: unknown, fallback = false): boolean => {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+
+  if (typeof value === 'string') {
+    const normalized = value.trim().toLowerCase();
+    if (normalized === 'true') {
+      return true;
+    }
+    if (normalized === 'false') {
+      return false;
+    }
+  }
+
+  if (typeof value === 'number') {
+    if (value === 1) {
+      return true;
+    }
+    if (value === 0) {
+      return false;
+    }
+  }
+
+  return fallback;
+};
+
 const normalizePersistedPlugins = (value: unknown): string[] => {
   if (Array.isArray(value)) {
     return value.filter((item): item is string => typeof item === 'string');
@@ -52,7 +79,7 @@ const normalizePersistedInternalBootSelection = (
     slotCount,
     devices,
     bootSizeMiB,
-    updateBios: Boolean(candidate.updateBios),
+    updateBios: normalizePersistedBoolean(candidate.updateBios, false),
   };
 };
 
@@ -212,16 +239,20 @@ export const useOnboardingDraftStore = defineStore(
             selectedPlugins: new Set(normalizePersistedPlugins(parsed.selectedPlugins)),
             internalBootSelection: normalizedInternalBootSelection,
             bootMode: normalizedBootMode,
-            internalBootInitialized: Boolean(parsed.internalBootInitialized),
+            internalBootInitialized: normalizePersistedBoolean(parsed.internalBootInitialized, false),
             internalBootSkipped:
               parsed.internalBootSkipped !== undefined
-                ? Boolean(parsed.internalBootSkipped)
+                ? normalizePersistedBoolean(parsed.internalBootSkipped, normalizedBootMode === 'usb')
                 : normalizedBootMode === 'usb',
-            internalBootApplySucceeded: Boolean(parsed.internalBootApplySucceeded),
-            coreSettingsInitialized: Boolean(parsed.coreSettingsInitialized || hasLegacyCoreDraft),
+            internalBootApplySucceeded: normalizePersistedBoolean(
+              parsed.internalBootApplySucceeded,
+              false
+            ),
+            coreSettingsInitialized:
+              hasLegacyCoreDraft || normalizePersistedBoolean(parsed.coreSettingsInitialized, false),
             pluginSelectionInitialized: hadLegacyPluginShape
               ? false
-              : Boolean(parsed.pluginSelectionInitialized),
+              : normalizePersistedBoolean(parsed.pluginSelectionInitialized, false),
           };
         },
       },

From 80b4fb20f0dd9fcf29b232fbd80747e219e7633c Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 11:25:01 -0500
Subject: [PATCH 43/53] fix(api-onboarding): apply CodeRabbit hardening in
 resolvers

- Purpose: address CodeRabbit safety and correctness findings across onboarding/disks/server resolvers.

- Before: devices input allowed empty strings, emhttp devices iteration assumed array shape, local URL formatting could emit trailing colon, emhttp device parsing relied on casts, and BIOS cleanup deleted all EFI entries indiscriminately.

- Problem: this allowed invalid mutation payloads, created runtime risks on malformed config, produced malformed local URLs, reduced type safety, and risked deleting non-Unraid boot entries.

- New behavior: onboarding input rejects empty device IDs, emhttp config shape is guarded, local URL appends port only when present, emhttp device parsing uses a type guard, and BIOS cleanup deletes only Unraid-managed EFI entries.

- How: updated resolver/service logic and expanded onboarding internal-boot tests to validate managed-entry deletion behavior while preserving successful-operation semantics for BIOS warnings.
---
 .../graph/resolvers/disks/disks.service.ts    |  3 +-
 .../onboarding-internal-boot.service.spec.ts  | 41 ++++++++++++++++++-
 .../onboarding-internal-boot.service.ts       | 35 ++++++++++++----
 .../resolvers/onboarding/onboarding.model.ts  |  2 +
 .../graph/resolvers/servers/server.service.ts |  2 +-
 5 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
index 85ee1b1fdf..5b2f9096e3 100644
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
@@ -63,7 +63,8 @@ export class DisksService {
     constructor(private readonly configService: ConfigService) {}
 
     private getEmhttpDevices(): EmhttpDevice[] {
-        const rawDevices = this.configService.get<unknown[]>('store.emhttp.devices', []);
+        const rawDevicesValue = this.configService.get<unknown>('store.emhttp.devices', []);
+        const rawDevices = Array.isArray(rawDevicesValue) ? rawDevicesValue : [];
         const emhttpDevices: EmhttpDevice[] = [];
 
         for (const raw of rawDevices) {
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
index a57700b50a..fe629493a6 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
@@ -87,7 +87,7 @@ describe('OnboardingInternalBootService', () => {
         } as unknown as ReturnType<typeof getters.emhttp>);
         vi.mocked(execa)
             .mockResolvedValueOnce({
-                stdout: 'Boot0001* Old Entry',
+                stdout: 'Boot0001* Unraid Internal Boot - stale',
                 stderr: '',
                 exitCode: 0,
             } as Awaited<ReturnType<typeof execa>>)
@@ -165,6 +165,45 @@ describe('OnboardingInternalBootService', () => {
         );
     });
 
+    it('deletes only Unraid-managed EFI entries during BIOS update', async () => {
+        vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
+        vi.mocked(getters.emhttp).mockReturnValue({
+            devices: [{ id: 'disk-1', device: 'sdb' }],
+            disks: [{ type: 'FLASH', device: 'sda' }],
+        } as unknown as ReturnType<typeof getters.emhttp>);
+        vi.mocked(execa)
+            .mockResolvedValueOnce({
+                stdout: 'Boot0001* Windows Boot Manager\nBoot0002* Unraid Internal Boot - stale',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValueOnce({
+                stdout: '',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>)
+            .mockResolvedValue({
+                stdout: '',
+                stderr: '',
+                exitCode: 0,
+            } as Awaited<ReturnType<typeof execa>>);
+        const service = new OnboardingInternalBootService();
+
+        await service.createInternalBootPool({
+            poolName: 'cache',
+            devices: ['disk-1'],
+            bootSizeMiB: 16384,
+            updateBios: true,
+        });
+
+        expect(vi.mocked(execa)).toHaveBeenCalledWith('efibootmgr', ['-b', '0002', '-B'], {
+            reject: false,
+        });
+        expect(vi.mocked(execa)).not.toHaveBeenCalledWith('efibootmgr', ['-b', '0001', '-B'], {
+            reject: false,
+        });
+    });
+
     it('returns success and warning output when efibootmgr updates fail', async () => {
         vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
         vi.mocked(execa)
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
index 4be13e2934..b2e11073b2 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -15,10 +15,21 @@ import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model
 
 const INTERNAL_BOOT_COMMAND_TIMEOUT_MS = 180000;
 const EFI_BOOT_PATH = '\\EFI\\BOOT\\BOOTX64.EFI';
+const UNRAID_INTERNAL_BOOT_LABEL_PREFIX = 'unraid internal boot -';
+const UNRAID_FLASH_LABEL = 'unraid flash';
 
 type EmhttpDeviceRecord = {
-    id?: unknown;
-    device?: unknown;
+    id: string;
+    device: string;
+};
+
+const isEmhttpDeviceRecord = (value: unknown): value is EmhttpDeviceRecord => {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+
+    const record = value as { id?: unknown; device?: unknown };
+    return typeof record.id === 'string' && typeof record.device === 'string';
 };
 
 @Injectable()
@@ -75,6 +86,14 @@ export class OnboardingInternalBootService {
         return labels;
     }
 
+    private isUnraidManagedBootLabel(label: string): boolean {
+        const normalized = label.trim().toLowerCase();
+        return (
+            normalized.startsWith(UNRAID_INTERNAL_BOOT_LABEL_PREFIX) ||
+            normalized.includes(UNRAID_FLASH_LABEL)
+        );
+    }
+
     private async runEfiBootMgr(
         args: string[],
         output: string[]
@@ -122,12 +141,11 @@ export class OnboardingInternalBootService {
         const devicesById = new Map<string, string>();
 
         for (const rawDevice of rawDevices) {
-            if (!rawDevice || typeof rawDevice !== 'object') {
+            if (!isEmhttpDeviceRecord(rawDevice)) {
                 continue;
             }
-            const record = rawDevice as EmhttpDeviceRecord;
-            const id = typeof record.id === 'string' ? record.id.trim() : '';
-            const device = typeof record.device === 'string' ? record.device.trim() : '';
+            const id = rawDevice.id.trim();
+            const device = rawDevice.device.trim();
             if (id.length > 0 && device.length > 0) {
                 devicesById.set(id, device);
             }
@@ -168,7 +186,10 @@ export class OnboardingInternalBootService {
                 ? this.parseBootLabelMap(existingEntries.lines)
                 : new Map<string, string>();
 
-        for (const bootNumber of bootLabelMap.values()) {
+        for (const [label, bootNumber] of bootLabelMap.entries()) {
+            if (!this.isUnraidManagedBootLabel(label)) {
+                continue;
+            }
             const deleteResult = await this.runEfiBootMgr(['-b', bootNumber, '-B'], output);
             if (deleteResult.exitCode !== 0) {
                 hadFailures = true;
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
index 069d1bfd3d..f37f40404c 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
@@ -8,6 +8,7 @@ import {
     IsEnum,
     IsIn,
     IsInt,
+    IsNotEmpty,
     IsOptional,
     IsString,
     Matches,
@@ -289,6 +290,7 @@ export class CreateInternalBootPoolInput {
     @ArrayMinSize(1)
     @ArrayMaxSize(4)
     @IsString({ each: true })
+    @IsNotEmpty({ each: true })
     devices!: string[];
 
     @Field(() => Int)
diff --git a/api/src/unraid-api/graph/resolvers/servers/server.service.ts b/api/src/unraid-api/graph/resolvers/servers/server.service.ts
index aa2b4f0cff..47ea014ed9 100644
--- a/api/src/unraid-api/graph/resolvers/servers/server.service.ts
+++ b/api/src/unraid-api/graph/resolvers/servers/server.service.ts
@@ -39,7 +39,7 @@ export class ServerService {
             status: ServerStatus.ONLINE,
             wanip: '',
             lanip,
-            localurl: lanip ? `http://${lanip}:${port}` : '',
+            localurl: lanip ? `http://${lanip}${port ? `:${port}` : ''}` : '',
             remoteurl: '',
         };
     }

From 6a315d31c3246df37e407ff21b31a31c0cd4877d Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 11:34:05 -0500
Subject: [PATCH 44/53] fix(web-graphql): apply CodeRabbit query/type
 follow-ups

- Purpose: address remaining CodeRabbit feedback for onboarding activation data and ESM test import consistency.

- Before: activation query omitted branding image fields used by admin presets, generated web GraphQL types lacked those fields, and one store test import used extensionless path.

- Problem: refetched activation payload could not carry banner/case-model image values through typed paths, and the extensionless import was inconsistent with ESM guidance.

- New behavior: activation query now includes bannerImage and caseModelImage, generated web GraphQL artifacts reflect the new fields, and the activation-code modal store test uses .js import path.

- How: updated activation query document, regenerated web gql documents/types, and fixed the store test import target; validated with targeted test + web type-check.
---
 web/__test__/store/activationCodeModal.test.ts              | 2 +-
 .../components/Onboarding/graphql/activationCode.query.ts   | 2 ++
 web/src/composables/gql/gql.ts                              | 6 +++---
 web/src/composables/gql/graphql.ts                          | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/__test__/store/activationCodeModal.test.ts b/web/__test__/store/activationCodeModal.test.ts
index 0cc113019a..7d1d92d411 100644
--- a/web/__test__/store/activationCodeModal.test.ts
+++ b/web/__test__/store/activationCodeModal.test.ts
@@ -9,7 +9,7 @@ import type { App } from 'vue';
 
 import { useActivationCodeDataStore } from '~/components/Onboarding/store/activationCodeData';
 import { useActivationCodeModalStore } from '~/components/Onboarding/store/activationCodeModal';
-import { useOnboardingStore } from '~/components/Onboarding/store/upgradeOnboarding';
+import { useOnboardingStore } from '~/components/Onboarding/store/upgradeOnboarding.js';
 import { useCallbackActionsStore } from '~/store/callbackActions';
 import { useServerStore } from '~/store/server';
 
diff --git a/web/src/components/Onboarding/graphql/activationCode.query.ts b/web/src/components/Onboarding/graphql/activationCode.query.ts
index f84b58f616..c55faebaa5 100644
--- a/web/src/components/Onboarding/graphql/activationCode.query.ts
+++ b/web/src/components/Onboarding/graphql/activationCode.query.ts
@@ -22,6 +22,8 @@ export const ACTIVATION_CODE_QUERY = parse(/* GraphQL */ `
           background
           showBannerGradient
           theme
+          bannerImage
+          caseModelImage
           partnerLogoLightUrl
           partnerLogoDarkUrl
           hasPartnerLogo
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 9eed549c67..dd10d07d86 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -65,7 +65,7 @@ type Documents = {
     "\n  subscription NotificationAddedSub {\n    notificationAdded {\n      ...NotificationFragment\n    }\n  }\n": typeof types.NotificationAddedSubDocument,
     "\n  subscription NotificationOverviewSub {\n    notificationsOverview {\n      archive {\n        ...NotificationCountFragment\n      }\n      unread {\n        ...NotificationCountFragment\n      }\n    }\n  }\n": typeof types.NotificationOverviewSubDocument,
     "\n  subscription NotificationsWarningsAndAlertsSub {\n    notificationsWarningsAndAlerts {\n      ...NotificationFragment\n    }\n  }\n": typeof types.NotificationsWarningsAndAlertsSubDocument,
-    "\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n": typeof types.ActivationCodeDocument,
+    "\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          bannerImage\n          caseModelImage\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n": typeof types.ActivationCodeDocument,
     "\n  query Onboarding {\n    customization {\n      onboarding {\n        status\n        isPartnerBuild\n        completed\n        completedAtVersion\n      }\n    }\n  }\n": typeof types.OnboardingDocument,
     "\n  query GetAvailableLanguages {\n    customization {\n      availableLanguages {\n        code\n        name\n        url\n      }\n    }\n  }\n": typeof types.GetAvailableLanguagesDocument,
     "\n  mutation CompleteOnboarding {\n    onboarding {\n      completeOnboarding {\n        status\n        isPartnerBuild\n        completed\n        completedAtVersion\n      }\n    }\n  }\n": typeof types.CompleteOnboardingDocument,
@@ -150,7 +150,7 @@ const documents: Documents = {
     "\n  subscription NotificationAddedSub {\n    notificationAdded {\n      ...NotificationFragment\n    }\n  }\n": types.NotificationAddedSubDocument,
     "\n  subscription NotificationOverviewSub {\n    notificationsOverview {\n      archive {\n        ...NotificationCountFragment\n      }\n      unread {\n        ...NotificationCountFragment\n      }\n    }\n  }\n": types.NotificationOverviewSubDocument,
     "\n  subscription NotificationsWarningsAndAlertsSub {\n    notificationsWarningsAndAlerts {\n      ...NotificationFragment\n    }\n  }\n": types.NotificationsWarningsAndAlertsSubDocument,
-    "\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n": types.ActivationCodeDocument,
+    "\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          bannerImage\n          caseModelImage\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n": types.ActivationCodeDocument,
     "\n  query Onboarding {\n    customization {\n      onboarding {\n        status\n        isPartnerBuild\n        completed\n        completedAtVersion\n      }\n    }\n  }\n": types.OnboardingDocument,
     "\n  query GetAvailableLanguages {\n    customization {\n      availableLanguages {\n        code\n        name\n        url\n      }\n    }\n  }\n": types.GetAvailableLanguagesDocument,
     "\n  mutation CompleteOnboarding {\n    onboarding {\n      completeOnboarding {\n        status\n        isPartnerBuild\n        completed\n        completedAtVersion\n      }\n    }\n  }\n": types.CompleteOnboardingDocument,
@@ -405,7 +405,7 @@ export function graphql(source: "\n  subscription NotificationsWarningsAndAlerts
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          bannerImage\n          caseModelImage\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query ActivationCode {\n    customization {\n      activationCode {\n        code\n        partner {\n          name\n          url\n          hardwareSpecsUrl\n          manualUrl\n          supportUrl\n          extraLinks {\n            title\n            url\n          }\n        }\n        branding {\n          header\n          headermetacolor\n          background\n          showBannerGradient\n          theme\n          bannerImage\n          caseModelImage\n          partnerLogoLightUrl\n          partnerLogoDarkUrl\n          hasPartnerLogo\n          onboardingTitle\n          onboardingSubtitle\n          onboardingTitleFreshInstall\n          onboardingSubtitleFreshInstall\n          onboardingTitleUpgrade\n          onboardingSubtitleUpgrade\n          onboardingTitleDowngrade\n          onboardingSubtitleDowngrade\n          onboardingTitleIncomplete\n          onboardingSubtitleIncomplete\n        }\n        system {\n          serverName\n          model\n        }\n      }\n      onboarding {\n        onboardingState {\n          registrationState\n          isRegistered\n          isFreshInstall\n          hasActivationCode\n          activationRequired\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index c95d2f011b..1cf46fb76c 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3841,7 +3841,7 @@ export type NotificationsWarningsAndAlertsSubSubscription = { __typename?: 'Subs
 export type ActivationCodeQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type ActivationCodeQuery = { __typename?: 'Query', customization?: { __typename?: 'Customization', activationCode?: { __typename?: 'ActivationCode', code?: string | null, partner?: { __typename?: 'PartnerConfig', name?: string | null, url?: string | null, hardwareSpecsUrl?: string | null, manualUrl?: string | null, supportUrl?: string | null, extraLinks?: Array<{ __typename?: 'PartnerLink', title: string, url: string }> | null } | null, branding?: { __typename?: 'BrandingConfig', header?: string | null, headermetacolor?: string | null, background?: string | null, showBannerGradient?: boolean | null, theme?: string | null, partnerLogoLightUrl?: string | null, partnerLogoDarkUrl?: string | null, hasPartnerLogo?: boolean | null, onboardingTitle?: string | null, onboardingSubtitle?: string | null, onboardingTitleFreshInstall?: string | null, onboardingSubtitleFreshInstall?: string | null, onboardingTitleUpgrade?: string | null, onboardingSubtitleUpgrade?: string | null, onboardingTitleDowngrade?: string | null, onboardingSubtitleDowngrade?: string | null, onboardingTitleIncomplete?: string | null, onboardingSubtitleIncomplete?: string | null } | null, system?: { __typename?: 'SystemConfig', serverName?: string | null, model?: string | null } | null } | null, onboarding: { __typename?: 'Onboarding', onboardingState: { __typename?: 'OnboardingState', registrationState?: RegistrationState | null, isRegistered: boolean, isFreshInstall: boolean, hasActivationCode: boolean, activationRequired: boolean } } } | null };
+export type ActivationCodeQuery = { __typename?: 'Query', customization?: { __typename?: 'Customization', activationCode?: { __typename?: 'ActivationCode', code?: string | null, partner?: { __typename?: 'PartnerConfig', name?: string | null, url?: string | null, hardwareSpecsUrl?: string | null, manualUrl?: string | null, supportUrl?: string | null, extraLinks?: Array<{ __typename?: 'PartnerLink', title: string, url: string }> | null } | null, branding?: { __typename?: 'BrandingConfig', header?: string | null, headermetacolor?: string | null, background?: string | null, showBannerGradient?: boolean | null, theme?: string | null, bannerImage?: string | null, caseModelImage?: string | null, partnerLogoLightUrl?: string | null, partnerLogoDarkUrl?: string | null, hasPartnerLogo?: boolean | null, onboardingTitle?: string | null, onboardingSubtitle?: string | null, onboardingTitleFreshInstall?: string | null, onboardingSubtitleFreshInstall?: string | null, onboardingTitleUpgrade?: string | null, onboardingSubtitleUpgrade?: string | null, onboardingTitleDowngrade?: string | null, onboardingSubtitleDowngrade?: string | null, onboardingTitleIncomplete?: string | null, onboardingSubtitleIncomplete?: string | null } | null, system?: { __typename?: 'SystemConfig', serverName?: string | null, model?: string | null } | null } | null, onboarding: { __typename?: 'Onboarding', onboardingState: { __typename?: 'OnboardingState', registrationState?: RegistrationState | null, isRegistered: boolean, isFreshInstall: boolean, hasActivationCode: boolean, activationRequired: boolean } } } | null };
 
 export type OnboardingQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -4079,7 +4079,7 @@ export const NotifyIfUniqueDocument = {"kind":"Document","definitions":[{"kind":
 export const NotificationAddedSubDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"NotificationAddedSub"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"notificationAdded"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"NotificationFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"NotificationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Notification"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"subject"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"importance"}},{"kind":"Field","name":{"kind":"Name","value":"link"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"formattedTimestamp"}}]}}]} as unknown as DocumentNode<NotificationAddedSubSubscription, NotificationAddedSubSubscriptionVariables>;
 export const NotificationOverviewSubDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"NotificationOverviewSub"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"notificationsOverview"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"archive"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"NotificationCountFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"unread"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"NotificationCountFragment"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"NotificationCountFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"NotificationCounts"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"total"}},{"kind":"Field","name":{"kind":"Name","value":"info"}},{"kind":"Field","name":{"kind":"Name","value":"warning"}},{"kind":"Field","name":{"kind":"Name","value":"alert"}}]}}]} as unknown as DocumentNode<NotificationOverviewSubSubscription, NotificationOverviewSubSubscriptionVariables>;
 export const NotificationsWarningsAndAlertsSubDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"NotificationsWarningsAndAlertsSub"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"notificationsWarningsAndAlerts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"NotificationFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"NotificationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Notification"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"subject"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"importance"}},{"kind":"Field","name":{"kind":"Name","value":"link"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"formattedTimestamp"}}]}}]} as unknown as DocumentNode<NotificationsWarningsAndAlertsSubSubscription, NotificationsWarningsAndAlertsSubSubscriptionVariables>;
-export const ActivationCodeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ActivationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"partner"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"hardwareSpecsUrl"}},{"kind":"Field","name":{"kind":"Name","value":"manualUrl"}},{"kind":"Field","name":{"kind":"Name","value":"supportUrl"}},{"kind":"Field","name":{"kind":"Name","value":"extraLinks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"branding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"header"}},{"kind":"Field","name":{"kind":"Name","value":"headermetacolor"}},{"kind":"Field","name":{"kind":"Name","value":"background"}},{"kind":"Field","name":{"kind":"Name","value":"showBannerGradient"}},{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"partnerLogoLightUrl"}},{"kind":"Field","name":{"kind":"Name","value":"partnerLogoDarkUrl"}},{"kind":"Field","name":{"kind":"Name","value":"hasPartnerLogo"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitle"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitle"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleFreshInstall"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleFreshInstall"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleUpgrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleUpgrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleDowngrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleDowngrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleIncomplete"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleIncomplete"}}]}},{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"model"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboardingState"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"registrationState"}},{"kind":"Field","name":{"kind":"Name","value":"isRegistered"}},{"kind":"Field","name":{"kind":"Name","value":"isFreshInstall"}},{"kind":"Field","name":{"kind":"Name","value":"hasActivationCode"}},{"kind":"Field","name":{"kind":"Name","value":"activationRequired"}}]}}]}}]}}]}}]} as unknown as DocumentNode<ActivationCodeQuery, ActivationCodeQueryVariables>;
+export const ActivationCodeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ActivationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"partner"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"hardwareSpecsUrl"}},{"kind":"Field","name":{"kind":"Name","value":"manualUrl"}},{"kind":"Field","name":{"kind":"Name","value":"supportUrl"}},{"kind":"Field","name":{"kind":"Name","value":"extraLinks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"branding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"header"}},{"kind":"Field","name":{"kind":"Name","value":"headermetacolor"}},{"kind":"Field","name":{"kind":"Name","value":"background"}},{"kind":"Field","name":{"kind":"Name","value":"showBannerGradient"}},{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"bannerImage"}},{"kind":"Field","name":{"kind":"Name","value":"caseModelImage"}},{"kind":"Field","name":{"kind":"Name","value":"partnerLogoLightUrl"}},{"kind":"Field","name":{"kind":"Name","value":"partnerLogoDarkUrl"}},{"kind":"Field","name":{"kind":"Name","value":"hasPartnerLogo"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitle"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitle"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleFreshInstall"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleFreshInstall"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleUpgrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleUpgrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleDowngrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleDowngrade"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingTitleIncomplete"}},{"kind":"Field","name":{"kind":"Name","value":"onboardingSubtitleIncomplete"}}]}},{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"model"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboardingState"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"registrationState"}},{"kind":"Field","name":{"kind":"Name","value":"isRegistered"}},{"kind":"Field","name":{"kind":"Name","value":"isFreshInstall"}},{"kind":"Field","name":{"kind":"Name","value":"hasActivationCode"}},{"kind":"Field","name":{"kind":"Name","value":"activationRequired"}}]}}]}}]}}]}}]} as unknown as DocumentNode<ActivationCodeQuery, ActivationCodeQueryVariables>;
 export const OnboardingDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"isPartnerBuild"}},{"kind":"Field","name":{"kind":"Name","value":"completed"}},{"kind":"Field","name":{"kind":"Name","value":"completedAtVersion"}}]}}]}}]}}]} as unknown as DocumentNode<OnboardingQuery, OnboardingQueryVariables>;
 export const GetAvailableLanguagesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAvailableLanguages"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"availableLanguages"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}}]}}]}}]} as unknown as DocumentNode<GetAvailableLanguagesQuery, GetAvailableLanguagesQueryVariables>;
 export const CompleteOnboardingDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CompleteOnboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"completeOnboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"isPartnerBuild"}},{"kind":"Field","name":{"kind":"Name","value":"completed"}},{"kind":"Field","name":{"kind":"Name","value":"completedAtVersion"}}]}}]}}]}}]} as unknown as DocumentNode<CompleteOnboardingMutation, CompleteOnboardingMutationVariables>;

From 2638ad3c8e4009750063c3c78b0b11c03ef27105 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 11:40:28 -0500
Subject: [PATCH 45/53] fix(api-onboarding): restore intended EFI cleanup
 behavior

- Purpose: align internal-boot BIOS update flow with intended behavior described after CodeRabbit pass.

- Before this commit: cleanup was narrowed to only Unraid-managed EFI labels and emhttp device parsing used an explicit type guard.

- Problem: that changed expected behavior; intended flow is to clear existing EFI entries during BIOS update and keep the original parse approach.

- New behavior: BIOS update cleanup again iterates and deletes all discovered EFI boot entries, and emhttp device parsing returns to the prior cast-based path with runtime checks.

- How: removed the managed-label restriction/helper, restored delete-loop over all parsed boot entries, and updated service tests to match original expectations.
---
 .../onboarding-internal-boot.service.spec.ts  | 41 +------------------
 .../onboarding-internal-boot.service.ts       | 35 ++++------------
 2 files changed, 8 insertions(+), 68 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
index fe629493a6..a57700b50a 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.spec.ts
@@ -87,7 +87,7 @@ describe('OnboardingInternalBootService', () => {
         } as unknown as ReturnType<typeof getters.emhttp>);
         vi.mocked(execa)
             .mockResolvedValueOnce({
-                stdout: 'Boot0001* Unraid Internal Boot - stale',
+                stdout: 'Boot0001* Old Entry',
                 stderr: '',
                 exitCode: 0,
             } as Awaited<ReturnType<typeof execa>>)
@@ -165,45 +165,6 @@ describe('OnboardingInternalBootService', () => {
         );
     });
 
-    it('deletes only Unraid-managed EFI entries during BIOS update', async () => {
-        vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
-        vi.mocked(getters.emhttp).mockReturnValue({
-            devices: [{ id: 'disk-1', device: 'sdb' }],
-            disks: [{ type: 'FLASH', device: 'sda' }],
-        } as unknown as ReturnType<typeof getters.emhttp>);
-        vi.mocked(execa)
-            .mockResolvedValueOnce({
-                stdout: 'Boot0001* Windows Boot Manager\nBoot0002* Unraid Internal Boot - stale',
-                stderr: '',
-                exitCode: 0,
-            } as Awaited<ReturnType<typeof execa>>)
-            .mockResolvedValueOnce({
-                stdout: '',
-                stderr: '',
-                exitCode: 0,
-            } as Awaited<ReturnType<typeof execa>>)
-            .mockResolvedValue({
-                stdout: '',
-                stderr: '',
-                exitCode: 0,
-            } as Awaited<ReturnType<typeof execa>>);
-        const service = new OnboardingInternalBootService();
-
-        await service.createInternalBootPool({
-            poolName: 'cache',
-            devices: ['disk-1'],
-            bootSizeMiB: 16384,
-            updateBios: true,
-        });
-
-        expect(vi.mocked(execa)).toHaveBeenCalledWith('efibootmgr', ['-b', '0002', '-B'], {
-            reject: false,
-        });
-        expect(vi.mocked(execa)).not.toHaveBeenCalledWith('efibootmgr', ['-b', '0001', '-B'], {
-            reject: false,
-        });
-    });
-
     it('returns success and warning output when efibootmgr updates fail', async () => {
         vi.mocked(emcmd).mockResolvedValue({ ok: true } as Awaited<ReturnType<typeof emcmd>>);
         vi.mocked(execa)
diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
index b2e11073b2..4be13e2934 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -15,21 +15,10 @@ import { ArrayDiskType } from '@app/unraid-api/graph/resolvers/array/array.model
 
 const INTERNAL_BOOT_COMMAND_TIMEOUT_MS = 180000;
 const EFI_BOOT_PATH = '\\EFI\\BOOT\\BOOTX64.EFI';
-const UNRAID_INTERNAL_BOOT_LABEL_PREFIX = 'unraid internal boot -';
-const UNRAID_FLASH_LABEL = 'unraid flash';
 
 type EmhttpDeviceRecord = {
-    id: string;
-    device: string;
-};
-
-const isEmhttpDeviceRecord = (value: unknown): value is EmhttpDeviceRecord => {
-    if (!value || typeof value !== 'object') {
-        return false;
-    }
-
-    const record = value as { id?: unknown; device?: unknown };
-    return typeof record.id === 'string' && typeof record.device === 'string';
+    id?: unknown;
+    device?: unknown;
 };
 
 @Injectable()
@@ -86,14 +75,6 @@ export class OnboardingInternalBootService {
         return labels;
     }
 
-    private isUnraidManagedBootLabel(label: string): boolean {
-        const normalized = label.trim().toLowerCase();
-        return (
-            normalized.startsWith(UNRAID_INTERNAL_BOOT_LABEL_PREFIX) ||
-            normalized.includes(UNRAID_FLASH_LABEL)
-        );
-    }
-
     private async runEfiBootMgr(
         args: string[],
         output: string[]
@@ -141,11 +122,12 @@ export class OnboardingInternalBootService {
         const devicesById = new Map<string, string>();
 
         for (const rawDevice of rawDevices) {
-            if (!isEmhttpDeviceRecord(rawDevice)) {
+            if (!rawDevice || typeof rawDevice !== 'object') {
                 continue;
             }
-            const id = rawDevice.id.trim();
-            const device = rawDevice.device.trim();
+            const record = rawDevice as EmhttpDeviceRecord;
+            const id = typeof record.id === 'string' ? record.id.trim() : '';
+            const device = typeof record.device === 'string' ? record.device.trim() : '';
             if (id.length > 0 && device.length > 0) {
                 devicesById.set(id, device);
             }
@@ -186,10 +168,7 @@ export class OnboardingInternalBootService {
                 ? this.parseBootLabelMap(existingEntries.lines)
                 : new Map<string, string>();
 
-        for (const [label, bootNumber] of bootLabelMap.entries()) {
-            if (!this.isUnraidManagedBootLabel(label)) {
-                continue;
-            }
+        for (const bootNumber of bootLabelMap.values()) {
             const deleteResult = await this.runEfiBootMgr(['-b', bootNumber, '-B'], output);
             if (deleteResult.exitCode !== 0) {
                 hadFailures = true;

From 46895eea48a549c1d9fa436b0a2f97ffa7f27436 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 11:42:33 -0500
Subject: [PATCH 46/53] refactor(api-onboarding): add CodeRabbit type guard for
 emhttp parse

- Purpose: improve type safety in onboarding internal-boot emhttp device parsing without changing BIOS cleanup behavior.

- Before: device-map parsing used a cast () followed by runtime string checks.

- Problem: casts weaken compile-time guarantees and make accidental unsafe property usage easier in future edits.

- New behavior: parsing now uses  to narrow unknown values before reading uid=501(ajitmehrotra) gid=20(staff) groups=20(staff),12(everyone),61(localaccounts),79(_appserverusr),80(admin),81(_appserveradm),701(com.apple.sharepoint.group.1),33(_appstore),98(_lpadmin),100(_lpoperator),204(_developer),250(_analyticsusers),395(com.apple.access_ftp),398(com.apple.access_screensharing),399(com.apple.access_ssh),400(com.apple.access_remote_ae) and ; non-matching entries are skipped.

- How: introduced a local type guard and updated ; kept the EFI delete loop as-is (delete all parsed entries).
---
 .../onboarding-internal-boot.service.ts       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
index 4be13e2934..ecd35d0f3c 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -17,8 +17,17 @@ const INTERNAL_BOOT_COMMAND_TIMEOUT_MS = 180000;
 const EFI_BOOT_PATH = '\\EFI\\BOOT\\BOOTX64.EFI';
 
 type EmhttpDeviceRecord = {
-    id?: unknown;
-    device?: unknown;
+    id: string;
+    device: string;
+};
+
+const isEmhttpDeviceRecord = (value: unknown): value is EmhttpDeviceRecord => {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+
+    const record = value as { id?: unknown; device?: unknown };
+    return typeof record.id === 'string' && typeof record.device === 'string';
 };
 
 @Injectable()
@@ -122,12 +131,11 @@ export class OnboardingInternalBootService {
         const devicesById = new Map<string, string>();
 
         for (const rawDevice of rawDevices) {
-            if (!rawDevice || typeof rawDevice !== 'object') {
+            if (!isEmhttpDeviceRecord(rawDevice)) {
                 continue;
             }
-            const record = rawDevice as EmhttpDeviceRecord;
-            const id = typeof record.id === 'string' ? record.id.trim() : '';
-            const device = typeof record.device === 'string' ? record.device.trim() : '';
+            const id = rawDevice.id.trim();
+            const device = rawDevice.device.trim();
             if (id.length > 0 && device.length > 0) {
                 devicesById.set(id, device);
             }

From 8628210e610275a6fcd543780579f129e37152af Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 11:44:40 -0500
Subject: [PATCH 47/53] fix(onboarding): stabilize HTTPS flow after SSH updates

- Purpose: keep onboarding mutations reliable when SSH settings are changed during HTTPS onboarding runs.
- Before: updateSshSettings could serialize SSL mode incorrectly, and post-SSH mutations could fail immediately on transient API/TLS restart windows.
- Why this was a problem: onboarding often entered best-effort/offline paths (CompleteOnboarding and UpdateServerIdentity network errors) even when services recovered moments later.
- What this change accomplishes: preserves SSL mode when applying SSH settings and retries transient network failures for post-SSH completion/identity mutations.
- How it works: normalize USE_SSL to yes/no/auto in VarsService payload construction and add bounded transient-network retry logic around CompleteOnboarding and final UpdateServerIdentity in onboarding summary apply flow.
- How it is validated: add/adjust unit coverage in vars.service.spec.ts and OnboardingSummaryStep.test.ts for SSL mode preservation and transient network retry behavior.
---
 .../graph/resolvers/vars/vars.service.spec.ts | 22 ++++-
 .../graph/resolvers/vars/vars.service.ts      | 28 +++++-
 .../Onboarding/OnboardingSummaryStep.test.ts  | 40 +++++++++
 .../steps/OnboardingSummaryStep.vue           | 88 +++++++++++++++++--
 4 files changed, 168 insertions(+), 10 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/vars/vars.service.spec.ts b/api/src/unraid-api/graph/resolvers/vars/vars.service.spec.ts
index 74a48548f4..b24bd0e835 100644
--- a/api/src/unraid-api/graph/resolvers/vars/vars.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/vars/vars.service.spec.ts
@@ -40,7 +40,7 @@ describe('VarsService', () => {
             useTelnet: false,
             porttelnet: 23,
             useUpnp: false,
-            useSsl: 'no',
+            useSsl: true,
             port: 80,
             portssl: 443,
             localTld: 'local',
@@ -97,7 +97,7 @@ describe('VarsService', () => {
                 USE_SSH: 'yes',
                 PORTSSH: '2222',
                 USE_UPNP: 'no',
-                USE_SSL: 'no',
+                USE_SSL: 'yes',
                 PORT: '80',
                 PORTSSL: '443',
                 LOCAL_TLD: 'local',
@@ -139,6 +139,24 @@ describe('VarsService', () => {
         });
     });
 
+    it('preserves auto SSL mode when updating SSH settings', async () => {
+        currentVarState = {
+            ...currentVarState,
+            useSsl: null,
+        };
+
+        await service.updateSshSettings(true, 22);
+
+        expect(emcmd).toHaveBeenCalledWith(
+            expect.objectContaining({
+                USE_SSL: 'auto',
+                USE_SSH: 'yes',
+                PORTSSH: '22',
+            }),
+            { waitForToken: false }
+        );
+    });
+
     it('swallows emcmd errors and returns last observed vars when unverifiable', async () => {
         vi.mocked(emcmd).mockRejectedValue(new Error('connection reset'));
 
diff --git a/api/src/unraid-api/graph/resolvers/vars/vars.service.ts b/api/src/unraid-api/graph/resolvers/vars/vars.service.ts
index b83b8a1010..2ec53dd416 100644
--- a/api/src/unraid-api/graph/resolvers/vars/vars.service.ts
+++ b/api/src/unraid-api/graph/resolvers/vars/vars.service.ts
@@ -74,7 +74,31 @@ export class VarsService {
 
         // Helper to formatting values for emcmd (converting booleans to yes/no)
         const formatBool = (val: boolean | undefined | null) => (val ? 'yes' : 'no');
-        const formatVal = (val: any) => (val !== undefined && val !== null ? String(val) : '');
+        const formatVal = (val: unknown) => (val !== undefined && val !== null ? String(val) : '');
+        const formatSslMode = (val: unknown): string => {
+            if (typeof val === 'string') {
+                const normalized = val.trim().toLowerCase();
+                if (normalized === 'yes' || normalized === 'no' || normalized === 'auto') {
+                    return normalized;
+                }
+                if (normalized === 'true') {
+                    return 'yes';
+                }
+                if (normalized === 'false') {
+                    return 'no';
+                }
+            }
+
+            if (typeof val === 'boolean') {
+                return val ? 'yes' : 'no';
+            }
+
+            if (val === null) {
+                return 'auto';
+            }
+
+            return 'no';
+        };
 
         // Construct parameters based on ManagementAccess.page form fields
         // We preserve existing values for other fields to avoid overwriting them with defaults/empty
@@ -89,7 +113,7 @@ export class VarsService {
             USE_SSH: formatBool(enabled), // New Value
             PORTSSH: formatVal(port), // New Value
             USE_UPNP: formatBool(currentVars.useUpnp), // defaults to 'no'
-            USE_SSL: formatVal(currentVars.useSsl || 'no'),
+            USE_SSL: formatSslMode(currentVars.useSsl),
             PORT: formatVal(currentVars.port || '80'),
             PORTSSL: formatVal(currentVars.portssl || '443'),
             LOCAL_TLD: formatVal(currentVars.localTld || 'local'),
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index ec02ab7b78..431a0d1ff2 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -879,6 +879,46 @@ describe('OnboardingSummaryStep', () => {
     scenario.assertExpected(wrapper);
   });
 
+  it('retries completeOnboarding after transient network errors when SSH changed', async () => {
+    draftStore.useSsh = true;
+    updateSshSettingsMock.mockResolvedValue({
+      data: {
+        updateSshSettings: { id: 'vars', useSsh: true, portssh: 22 },
+      },
+    });
+    completeOnboardingMock
+      .mockRejectedValueOnce(new Error('NetworkError when attempting to fetch resource.'))
+      .mockResolvedValueOnce({});
+
+    const { wrapper } = mountComponent();
+    await clickApply(wrapper);
+
+    expect(completeOnboardingMock).toHaveBeenCalledTimes(2);
+    expect(wrapper.text()).toContain('Setup Applied');
+    expect(wrapper.text()).not.toContain('Could not mark onboarding complete right now');
+  });
+
+  it('retries final identity update after transient network errors when SSH changed', async () => {
+    draftStore.useSsh = true;
+    draftStore.serverDescription = 'Primary host';
+    updateSshSettingsMock.mockResolvedValue({
+      data: {
+        updateSshSettings: { id: 'vars', useSsh: true, portssh: 22 },
+      },
+    });
+    updateServerIdentityMock
+      .mockRejectedValueOnce(new Error('NetworkError when attempting to fetch resource.'))
+      .mockResolvedValueOnce({});
+
+    const { wrapper } = mountComponent();
+    await clickApply(wrapper);
+
+    expect(updateServerIdentityMock).toHaveBeenCalledTimes(2);
+    expect(wrapper.text()).toContain('Server Identity updated.');
+    expect(wrapper.text()).toContain('Setup Applied');
+    expect(wrapper.text()).not.toContain('Server identity request returned an error, continuing');
+  });
+
   it('prefers best-effort result over timeout classification when completion fails', async () => {
     draftStore.selectedPlugins = new Set(['community-apps']);
     const timeoutError = new Error(
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 9481537bc0..9badce78f1 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -332,6 +332,77 @@ const isInstallTimeoutError = (error: unknown): boolean => {
   );
 };
 
+const NETWORK_RECOVERY_MAX_ATTEMPTS = 4;
+const NETWORK_RECOVERY_RETRY_MS = 1000;
+const NETWORK_ERROR_PATTERNS = [
+  'networkerror when attempting to fetch resource',
+  'failed to fetch',
+  'network error',
+  'ns_error_connection_refused',
+  'connection refused',
+];
+
+const hasNetworkLikeMessage = (message: string) => {
+  const normalized = message.toLowerCase();
+  return NETWORK_ERROR_PATTERNS.some((pattern) => normalized.includes(pattern));
+};
+
+const isTransientNetworkError = (error: unknown): boolean => {
+  if (!error || typeof error !== 'object') {
+    return false;
+  }
+
+  const candidate = error as {
+    message?: unknown;
+    networkError?: unknown;
+    cause?: unknown;
+  };
+
+  if (candidate.networkError) {
+    return true;
+  }
+
+  if (typeof candidate.message === 'string' && hasNetworkLikeMessage(candidate.message)) {
+    return true;
+  }
+
+  if (candidate.cause instanceof Error && hasNetworkLikeMessage(candidate.cause.message)) {
+    return true;
+  }
+
+  return false;
+};
+
+const sleepMs = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+const runWithTransientNetworkRetry = async <T,>(
+  operation: () => Promise<T>,
+  enabled: boolean
+): Promise<T> => {
+  if (!enabled) {
+    return operation();
+  }
+
+  let lastError: unknown = null;
+
+  for (let attempt = 1; attempt <= NETWORK_RECOVERY_MAX_ATTEMPTS; attempt += 1) {
+    try {
+      return await operation();
+    } catch (caughtError: unknown) {
+      lastError = caughtError;
+      const shouldRetry =
+        isTransientNetworkError(caughtError) && attempt < NETWORK_RECOVERY_MAX_ATTEMPTS;
+      if (!shouldRetry) {
+        throw caughtError;
+      }
+
+      await sleepMs(NETWORK_RECOVERY_RETRY_MS);
+    }
+  }
+
+  throw lastError;
+};
+
 const isSshStateVerified = (
   vars: { useSsh?: boolean | null; portssh?: number | string | null } | undefined,
   targetEnabled: boolean,
@@ -654,6 +725,7 @@ const handleComplete = async () => {
     const shouldApplyTheme = baselineLoaded ? targetCoreSettings.theme !== currentTheme : true;
     const shouldApplyLocale = baselineLoaded ? targetCoreSettings.locale !== currentLocale : true;
     const shouldApplySsh = baselineLoaded ? targetCoreSettings.useSsh !== currentSsh : true;
+    const shouldRetryNetworkMutations = shouldApplySsh;
     const applyServerIdentityAtEnd = async () => {
       if (!shouldApplyServerIdentity) {
         return;
@@ -661,11 +733,15 @@ const handleComplete = async () => {
 
       addLog(summaryT('logs.updatingServerIdentity', { name: targetCoreSettings.serverName }), 'info');
       try {
-        await updateServerIdentity({
-          name: targetCoreSettings.serverName,
-          comment: targetCoreSettings.serverDescription,
-          sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
-        });
+        await runWithTransientNetworkRetry(
+          () =>
+            updateServerIdentity({
+              name: targetCoreSettings.serverName,
+              comment: targetCoreSettings.serverDescription,
+              sysModel: shouldApplyPartnerSysModel ? activationSystemModel.value : undefined,
+            }),
+          shouldRetryNetworkMutations
+        );
         addLog(summaryT('logs.serverIdentityUpdated'), 'success');
       } catch (caughtError: unknown) {
         hadNonOptimisticFailures = true;
@@ -1036,7 +1112,7 @@ const handleComplete = async () => {
 
     // 5. Mark Complete
     try {
-      await completeOnboarding();
+      await runWithTransientNetworkRetry(() => completeOnboarding(), shouldRetryNetworkMutations);
       completionMarked = true;
       cleanupOnboardingStorage({ clearTemporaryBypassSessionState: true });
     } catch (caughtError: unknown) {

From 58fdaf90000a62f322ab5fa3a05c2bac6fea9d1b Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 12:19:19 -0500
Subject: [PATCH 48/53] fix(onboarding): show modal only on fresh installs

- Purpose: limit onboarding modal visibility to truly fresh-install flows while keeping upgrade/downgrade customization logic available.
- Before: the modal could render when onboarding status was UPGRADE or DOWNGRADE even on non-fresh systems.
- Why this was a problem: upgraded/downgraded systems could still be prompted with onboarding despite the new product requirement.
- What this change accomplishes: modal display now requires fresh-install state in addition to existing modal visibility conditions.
- How it works: add isFreshInstall as a hard gate in OnboardingModal's showModal computed path and keep shouldShowOnboarding/status logic intact for future reuse.
- How it is validated: extend OnboardingModal tests with a non-fresh-install negative case and update fixture reset behavior so modal tests reliably cover fresh-install gating.
---
 .../components/Onboarding/OnboardingModal.test.ts    | 12 ++++++++++++
 web/src/components/Onboarding/OnboardingModal.vue    |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index 0f31d96954..e25f859a07 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -159,6 +159,7 @@ describe('OnboardingModal.vue', () => {
     activationCodeModalStore.isTemporarilyBypassed.value = false;
     activationCodeDataStore.activationRequired.value = false;
     activationCodeDataStore.hasActivationCode.value = true;
+    activationCodeDataStore.isFreshInstall.value = true;
     activationCodeDataStore.registrationState.value = 'ENOKEYFILE';
     upgradeOnboardingStore.shouldShowOnboarding.value = false;
     upgradeOnboardingStore.isVersionDrift.value = false;
@@ -217,6 +218,17 @@ describe('OnboardingModal.vue', () => {
     expect(wrapper.find('[data-testid="dialog"]').exists()).toBe(false);
   });
 
+  it('does not render when system is not a fresh install', () => {
+    activationCodeDataStore.isFreshInstall.value = false;
+    activationCodeModalStore.isVisible.value = false;
+    upgradeOnboardingStore.shouldShowOnboarding.value = true;
+    upgradeOnboardingStore.canDisplayOnboardingModal.value = true;
+
+    const wrapper = mountComponent();
+
+    expect(wrapper.find('[data-testid="dialog"]').exists()).toBe(false);
+  });
+
   it('does not render when temporary bypass is active', () => {
     activationCodeModalStore.isVisible.value = true;
     activationCodeModalStore.isTemporarilyBypassed.value = true;
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index d898821d2e..409e15abc7 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -29,7 +29,7 @@ const { t } = useI18n();
 
 const modalStore = useActivationCodeModalStore();
 const { isVisible, isTemporarilyBypassed } = storeToRefs(modalStore);
-const { activationRequired, hasActivationCode, registrationState } = storeToRefs(
+const { activationRequired, hasActivationCode, isFreshInstall, registrationState } = storeToRefs(
   useActivationCodeDataStore()
 );
 const onboardingStore = useUpgradeOnboardingStore();
@@ -118,6 +118,7 @@ const isLoginPage = computed(() => {
 const showModal = computed(
   () =>
     !isLoginPage.value &&
+    isFreshInstall.value &&
     canDisplayOnboardingModal.value &&
     !isTemporarilyBypassed.value &&
     (isVisible.value || shouldShowOnboarding.value)

From 6798e2b8fb835dc919d95220175b845db7556dc0 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 13:46:05 -0500
Subject: [PATCH 49/53] fix(onboarding-summary): fallback to USB when storage
 is ineligible

- Purpose: ensure summary reflects effective boot mode when storage boot cannot be configured.

- Before: summary treated draft  as authoritative, even when there were no eligible storage boot targets.

- Problem: users could skip/continue from internal boot step and still see Storage Drive on summary despite being ineligible.

- New behavior: summary now resolves to USB when storage mode is selected but eligibility checks fail (bootEligible false or no unassigned disk target).

- How: added a context-derived  guard in summary mode resolution and added a regression test covering ineligible storage fallback.
---
 .../Onboarding/OnboardingSummaryStep.test.ts  | 37 +++++++++++
 .../steps/OnboardingSummaryStep.vue           | 66 +++++++++++++++----
 2 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 431a0d1ff2..80276efd64 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -299,6 +299,15 @@ describe('OnboardingSummaryStep', () => {
       info: { primaryNetwork: { ipAddress: '192.168.1.2' } },
     };
     internalBootContextResult.value = {
+      array: {
+        boot: null,
+        parities: [],
+        disks: [],
+        caches: [],
+      },
+      vars: {
+        bootEligible: true,
+      },
       disks: [
         {
           device: '/dev/sda',
@@ -1033,6 +1042,34 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('USB/Flash Drive');
   });
 
+  it('falls back to USB boot mode when storage boot is selected but ineligible', () => {
+    draftStore.bootMode = 'storage';
+    draftStore.internalBootSelection = null;
+    internalBootContextResult.value = {
+      array: {
+        boot: null,
+        parities: [],
+        disks: [],
+        caches: [],
+      },
+      vars: {
+        bootEligible: false,
+      },
+      disks: [
+        {
+          device: '/dev/sda',
+          size: 500 * 1024 * 1024 * 1024,
+          emhttpDeviceId: 'diskA',
+        },
+      ],
+    };
+
+    const { wrapper } = mountComponent();
+
+    expect(wrapper.text()).toContain('Boot Configuration');
+    expect(wrapper.text()).toContain('USB/Flash Drive');
+  });
+
   it('shows selected boot devices with device name and size details', () => {
     draftStore.bootMode = 'storage';
     draftStore.internalBootSelection = {
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 9badce78f1..1faf8e13b3 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -134,14 +134,64 @@ const summaryServerDescription = computed(
   () => draftStore.serverDescription || coreSettingsResult.value?.server?.comment || ''
 );
 
+interface InternalBootContextArrayDisk {
+  device?: string | null;
+}
+
+interface InternalBootContextDisk {
+  device: string;
+  size: number;
+  emhttpDeviceId?: string | null;
+}
+
+interface InternalBootContextData {
+  array?: {
+    boot?: InternalBootContextArrayDisk | null;
+    parities?: InternalBootContextArrayDisk[];
+    disks?: InternalBootContextArrayDisk[];
+    caches?: InternalBootContextArrayDisk[];
+  } | null;
+  vars?: {
+    bootEligible?: boolean | null;
+  } | null;
+  disks?: InternalBootContextDisk[];
+}
+
+const hasEligibleStorageBootTarget = computed(() => {
+  const data = internalBootContextResult.value as InternalBootContextData | null;
+  if (!data || !data.vars?.bootEligible) {
+    return false;
+  }
+
+  const assignedDevices = new Set<string>();
+  const assignedDiskGroups = [
+    data.array?.boot ? [data.array.boot] : [],
+    data.array?.parities ?? [],
+    data.array?.disks ?? [],
+    data.array?.caches ?? [],
+  ];
+
+  for (const group of assignedDiskGroups) {
+    for (const disk of group) {
+      const device = normalizeDeviceName(disk.device);
+      if (device) {
+        assignedDevices.add(device);
+      }
+    }
+  }
+
+  return (data.disks ?? []).some((disk) => {
+    const device = normalizeDeviceName(disk.device);
+    return Boolean(device) && !assignedDevices.has(device);
+  });
+});
+
 const selectedBootMode = computed(() => {
   if (draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection)) {
-    return 'storage';
+    return hasEligibleStorageBootTarget.value ? 'storage' : 'usb';
   }
 
-  const context = internalBootContextResult.value as {
-    array?: { boot?: { device?: string | null } | null } | null;
-  } | null;
+  const context = internalBootContextResult.value as InternalBootContextData | null;
   const bootDevice = context?.array?.boot?.device;
   return typeof bootDevice === 'string' && bootDevice.trim().length > 0 ? 'storage' : 'usb';
 });
@@ -195,14 +245,8 @@ const normalizeDeviceName = (value: string | null | undefined): string => {
   return trimmed;
 };
 
-interface InternalBootContextDisk {
-  device: string;
-  size: number;
-  emhttpDeviceId?: string | null;
-}
-
 const internalBootDeviceLabelById = computed(() => {
-  const data = internalBootContextResult.value as { disks?: InternalBootContextDisk[] } | null;
+  const data = internalBootContextResult.value as InternalBootContextData | null;
   const disks = data?.disks ?? [];
   const labels = new Map<string, string>();
 

From 54b1e6c583cf77954460023bbddc0b800378af1a Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 14:14:08 -0500
Subject: [PATCH 50/53] fix(onboarding-summary): derive fallback from boot disk
 type

- Purpose: make summary boot mode fallback match backend-reported boot media type when onboarding draft does not explicitly select internal boot.
- Before: fallback treated any non-empty backend boot device as storage, even when backend boot type was FLASH.
- Problem: summary could display Storage Drive(s) while the system was effectively USB/flash booted, creating misleading onboarding state.
- New change: query now includes array.boot.type and fallback logic returns USB when boot type is FLASH, otherwise storage only when a backend boot device exists.
- How it works: updated GraphQL query + generated types/doc maps, then added coverage for both FLASH and non-FLASH fallback cases in OnboardingSummaryStep tests.
---
 .../Onboarding/OnboardingSummaryStep.test.ts  | 46 ++++++++++++++++++-
 .../graphql/getInternalBootContext.query.ts   |  1 +
 .../steps/OnboardingSummaryStep.vue           |  7 ++-
 web/src/composables/gql/gql.ts                |  6 +--
 web/src/composables/gql/graphql.ts            |  4 +-
 5 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 80276efd64..b0ba3ad783 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -15,7 +15,7 @@ import { UPDATE_SYSTEM_TIME_MUTATION } from '@/components/Onboarding/graphql/upd
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import OnboardingSummaryStep from '~/components/Onboarding/steps/OnboardingSummaryStep.vue';
-import { PluginInstallStatus } from '~/composables/gql/graphql';
+import { ArrayDiskType, PluginInstallStatus } from '~/composables/gql/graphql';
 import { createTestI18n } from '../../utils/i18n';
 
 const {
@@ -1042,6 +1042,50 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('USB/Flash Drive');
   });
 
+  it('shows USB/Flash Drive when backend boot device type is FLASH', () => {
+    draftStore.bootMode = 'usb';
+    draftStore.internalBootSelection = null;
+    internalBootContextResult.value = {
+      array: {
+        boot: { device: 'sda', type: ArrayDiskType.FLASH },
+        parities: [],
+        disks: [],
+        caches: [],
+      },
+      vars: {
+        bootEligible: true,
+      },
+      disks: [],
+    };
+
+    const { wrapper } = mountComponent();
+
+    expect(wrapper.text()).toContain('Boot Configuration');
+    expect(wrapper.text()).toContain('USB/Flash Drive');
+  });
+
+  it('shows Storage Drive(s) when backend boot device type is non-FLASH', () => {
+    draftStore.bootMode = 'usb';
+    draftStore.internalBootSelection = null;
+    internalBootContextResult.value = {
+      array: {
+        boot: { device: 'sdb', type: ArrayDiskType.CACHE },
+        parities: [],
+        disks: [],
+        caches: [],
+      },
+      vars: {
+        bootEligible: true,
+      },
+      disks: [],
+    };
+
+    const { wrapper } = mountComponent();
+
+    expect(wrapper.text()).toContain('Boot Configuration');
+    expect(wrapper.text()).toContain('Storage Drive(s)');
+  });
+
   it('falls back to USB boot mode when storage boot is selected but ineligible', () => {
     draftStore.bootMode = 'storage';
     draftStore.internalBootSelection = null;
diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index 80c69b4ab8..a0b8c5482c 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -6,6 +6,7 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
       state
       boot {
         device
+        type
       }
       parities {
         device
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 1faf8e13b3..b24cb7711d 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -52,7 +52,7 @@ import type { OnboardingErrorDiagnostics } from '@/components/Onboarding/composa
 
 import { useActivationCodeDataStore } from '~/components/Onboarding/store/activationCodeData';
 import { useOnboardingDraftStore } from '~/components/Onboarding/store/onboardingDraft';
-import { PluginInstallStatus, ThemeName } from '~/composables/gql/graphql';
+import { ArrayDiskType, PluginInstallStatus, ThemeName } from '~/composables/gql/graphql';
 
 export interface Props {
   onComplete: () => void;
@@ -136,6 +136,7 @@ const summaryServerDescription = computed(
 
 interface InternalBootContextArrayDisk {
   device?: string | null;
+  type?: ArrayDiskType | null;
 }
 
 interface InternalBootContextDisk {
@@ -192,6 +193,10 @@ const selectedBootMode = computed(() => {
   }
 
   const context = internalBootContextResult.value as InternalBootContextData | null;
+  const bootType = context?.array?.boot?.type;
+  if (bootType === ArrayDiskType.FLASH) {
+    return 'usb';
+  }
   const bootDevice = context?.array?.boot?.device;
   return typeof bootDevice === 'string' && bootDevice.trim().length > 0 ? 'storage' : 'usb';
 });
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index dd10d07d86..9973a02410 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -74,7 +74,7 @@ type Documents = {
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": typeof types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": typeof types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
@@ -159,7 +159,7 @@ const documents: Documents = {
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
@@ -441,7 +441,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 1cf46fb76c..3ccfdb77e7 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3897,7 +3897,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null, type: ArrayDiskType } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null }> };
 
 export type GetInternalBootStepVisibilityQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -4088,7 +4088,7 @@ export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"Oper
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const CreateInternalBootPoolDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateInternalBootPool"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateInternalBootPoolInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createInternalBootPool"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}},{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<CreateInternalBootPoolMutation, CreateInternalBootPoolMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const GetInternalBootStepVisibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootStepVisibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootStepVisibilityQuery, GetInternalBootStepVisibilityQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;

From 450f4f64329d159c171d8cf35e19c00d0ef36cad Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 14:56:03 -0500
Subject: [PATCH 51/53] fix(onboarding): optimize pool name regex for CodeQL

- Purpose: remove CodeQL inefficient-regular-expression finding in onboarding input validation.
- Before: the pattern used nested quantifiers ([a-z0-9~._-]*[a-z_-])*, which can trigger heavy backtracking on adversarial input.
- Problem: static analysis flagged potential exponential backtracking risk, increasing denial-of-service exposure in validation paths.
- New change: replaced the nested repeated group with a linear optional suffix pattern (?:[a-z0-9~._-]*[a-z_-])?.
- How it works: preserves the same naming constraints (must start with lowercase letter; optional tail must end in [a-z_-]) while avoiding nested repetition that causes regex engine backtracking blowups.
---
 .../unraid-api/graph/resolvers/onboarding/onboarding.model.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
index f37f40404c..dadfe46f06 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding.model.ts
@@ -281,7 +281,7 @@ export class OnboardingOverrideInput {
 export class CreateInternalBootPoolInput {
     @Field(() => String)
     @IsString()
-    @Matches(/^[a-z]([a-z0-9~._-]*[a-z_-])*$/, {
+    @Matches(/^[a-z](?:[a-z0-9~._-]*[a-z_-])?$/, {
         message: 'Pool name must match Unraid naming requirements',
     })
     poolName!: string;

From b10dd265162b09fbcc03a1bad6a7959e368f78c8 Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 15:38:20 -0500
Subject: [PATCH 52/53] refactor(onboarding): split BIOS boot updates into
 helpers

- Purpose: reduce complexity in onboarding BIOS boot entry handling by breaking one long method into focused steps.

- Before:  performed context loading, cleanup, device resolution, entry creation, flash entry creation, and boot-order calculation/update in a single large block.

- Problem: the monolithic flow was harder to review, reason about, and reuse for follow-up boot-management changes.

- After: extracted dedicated helpers for deleting existing entries, resolving boot devices, creating internal entries, creating flash entry, building desired order, and applying boot order while keeping output/error semantics consistent.

- How:  now orchestrates helper calls and aggregates failure state with the same command sequence and messaging.
---
 .../onboarding-internal-boot.service.ts       | 129 ++++++++++++------
 1 file changed, 85 insertions(+), 44 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
index ecd35d0f3c..622a735f9a 100644
--- a/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
+++ b/api/src/unraid-api/graph/resolvers/onboarding/onboarding-internal-boot.service.ts
@@ -162,20 +162,11 @@ export class OnboardingInternalBootService {
         return null;
     }
 
-    private async updateBiosBootEntries(
-        devices: string[],
+    private async deleteExistingBootEntries(
+        bootLabelMap: Map<string, string>,
         output: string[]
-    ): Promise<{ hadFailures: boolean }> {
+    ): Promise<boolean> {
         let hadFailures = false;
-        this.ensureEmhttpBootContext();
-        const devsById = this.getDeviceMapFromEmhttpState();
-
-        const existingEntries = await this.runEfiBootMgr([], output);
-        const bootLabelMap =
-            existingEntries.exitCode === 0
-                ? this.parseBootLabelMap(existingEntries.lines)
-                : new Map<string, string>();
-
         for (const bootNumber of bootLabelMap.values()) {
             const deleteResult = await this.runEfiBootMgr(['-b', bootNumber, '-B'], output);
             if (deleteResult.exitCode !== 0) {
@@ -185,29 +176,48 @@ export class OnboardingInternalBootService {
                 );
             }
         }
+        return hadFailures;
+    }
 
-        for (const bootDevice of devices) {
-            const bootId = bootDevice;
-            let device = bootDevice;
-            if (device === '' || devsById.has(device)) {
-                const mapped = devsById.get(device);
-                if (mapped) {
-                    device = mapped;
-                }
+    private resolveBootDevicePath(
+        bootDevice: string,
+        devsById: Map<string, string>
+    ): { bootId: string; devicePath: string } | null {
+        const bootId = bootDevice;
+        let device = bootDevice;
+        if (device === '' || devsById.has(device)) {
+            const mapped = devsById.get(device);
+            if (mapped) {
+                device = mapped;
             }
-            if (device === '') {
+        }
+        if (device === '') {
+            return null;
+        }
+        return { bootId, devicePath: `/dev/${device}` };
+    }
+
+    private async createInternalBootEntries(
+        devices: string[],
+        devsById: Map<string, string>,
+        output: string[]
+    ): Promise<boolean> {
+        let hadFailures = false;
+        for (const bootDevice of devices) {
+            const resolved = this.resolveBootDevicePath(bootDevice, devsById);
+            if (!resolved) {
                 continue;
             }
-            const devicePath = `/dev/${device}`;
+
             const createResult = await this.runEfiBootMgr(
                 [
                     '-c',
                     '-d',
-                    devicePath,
+                    resolved.devicePath,
                     '-p',
                     '2',
                     '-L',
-                    `Unraid Internal Boot - ${bootId}`,
+                    `Unraid Internal Boot - ${resolved.bootId}`,
                     '-l',
                     EFI_BOOT_PATH,
                 ],
@@ -216,32 +226,33 @@ export class OnboardingInternalBootService {
             if (createResult.exitCode !== 0) {
                 hadFailures = true;
                 output.push(
-                    `efibootmgr failed for ${this.shellQuote(devicePath)} (rc=${createResult.exitCode})`
+                    `efibootmgr failed for ${this.shellQuote(resolved.devicePath)} (rc=${createResult.exitCode})`
                 );
             }
         }
+        return hadFailures;
+    }
 
+    private async createFlashBootEntry(output: string[]): Promise<boolean> {
         const flashDevice = this.getFlashDeviceFromEmhttpState();
-        if (flashDevice) {
-            const device = flashDevice.trim();
-            const devicePath = `/dev/${device}`;
-            const flashResult = await this.runEfiBootMgr(
-                ['-c', '-d', devicePath, '-p', '1', '-L', 'Unraid Flash'],
-                output
-            );
-            if (flashResult.exitCode !== 0) {
-                hadFailures = true;
-                output.push(`efibootmgr failed for flash (rc=${flashResult.exitCode})`);
-            }
+        if (!flashDevice) {
+            return false;
         }
 
-        const currentEntries = await this.runEfiBootMgr([], output);
-        if (currentEntries.exitCode !== 0) {
-            hadFailures = true;
-            return { hadFailures };
+        const device = flashDevice.trim();
+        const devicePath = `/dev/${device}`;
+        const flashResult = await this.runEfiBootMgr(
+            ['-c', '-d', devicePath, '-p', '1', '-L', 'Unraid Flash'],
+            output
+        );
+        if (flashResult.exitCode !== 0) {
+            output.push(`efibootmgr failed for flash (rc=${flashResult.exitCode})`);
+            return true;
         }
+        return false;
+    }
 
-        const labelMap = this.parseBootLabelMap(currentEntries.lines);
+    private buildDesiredBootOrder(devices: string[], labelMap: Map<string, string>): string[] {
         const desiredOrder: string[] = [];
 
         for (const bootId of devices) {
@@ -261,9 +272,19 @@ export class OnboardingInternalBootService {
             }
         }
 
-        const uniqueOrder = [...new Set(desiredOrder.filter((entry) => entry.length > 0))];
+        return [...new Set(desiredOrder.filter((entry) => entry.length > 0))];
+    }
+
+    private async updateBootOrder(devices: string[], output: string[]): Promise<boolean> {
+        const currentEntries = await this.runEfiBootMgr([], output);
+        if (currentEntries.exitCode !== 0) {
+            return true;
+        }
+
+        const labelMap = this.parseBootLabelMap(currentEntries.lines);
+        const uniqueOrder = this.buildDesiredBootOrder(devices, labelMap);
         if (uniqueOrder.length === 0) {
-            return { hadFailures };
+            return false;
         }
 
         const nextBoot = uniqueOrder[0];
@@ -274,10 +295,30 @@ export class OnboardingInternalBootService {
 
         const orderResult = await this.runEfiBootMgr(orderArgs, output);
         if (orderResult.exitCode !== 0) {
-            hadFailures = true;
             output.push(`efibootmgr failed to set boot order (rc=${orderResult.exitCode})`);
+            return true;
+        }
+        return false;
+    }
+
+    private async updateBiosBootEntries(
+        devices: string[],
+        output: string[]
+    ): Promise<{ hadFailures: boolean }> {
+        let hadFailures = false;
+        this.ensureEmhttpBootContext();
+        const devsById = this.getDeviceMapFromEmhttpState();
+
+        const existingEntries = await this.runEfiBootMgr([], output);
+        if (existingEntries.exitCode === 0) {
+            const bootLabelMap = this.parseBootLabelMap(existingEntries.lines);
+            hadFailures = (await this.deleteExistingBootEntries(bootLabelMap, output)) || hadFailures;
         }
 
+        hadFailures = (await this.createInternalBootEntries(devices, devsById, output)) || hadFailures;
+        hadFailures = (await this.createFlashBootEntry(output)) || hadFailures;
+        hadFailures = (await this.updateBootOrder(devices, output)) || hadFailures;
+
         return { hadFailures };
     }
 

From c401db6a9bb70f24856d2493e5c23ee99a7e2b8d Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajit@lime-technology.com>
Date: Fri, 6 Mar 2026 15:56:48 -0500
Subject: [PATCH 53/53] fix(onboarding-summary): use draft boot intent and hide
 skipped section

- Purpose: simplify internal-boot summary behavior so it reflects user intent from onboarding draft state.
- Before: summary recomputed boot mode from runtime context (eligibility/backend boot info), which could override stored choices and still render boot config after skip.
- Problem: transient context loading/failure could silently downgrade a saved storage intent to USB during apply, and skip vs explicit USB were conflated.
- New change: summary now derives boot mode directly from draft selection, renders boot configuration only when internal boot step was initialized and not skipped, and explicit USB continue uses setBootMode('usb') rather than skip flow.
- How it works: onboardingDraft.setBootMode now clears selection without marking skipped; skip still marks skipped; summary checks internalBootInitialized/internalBootSkipped for visibility; GraphQL query/types removed unused boot.type fallback fields; tests updated for skip-hides and draft-driven mode behavior.
---
 .../Onboarding/OnboardingSummaryStep.test.ts  | 72 ++++---------------
 .../graphql/getInternalBootContext.query.ts   |  1 -
 .../steps/OnboardingInternalBootStep.vue      |  2 +-
 .../steps/OnboardingSummaryStep.vue           | 71 ++----------------
 .../Onboarding/store/onboardingDraft.ts       |  3 +-
 web/src/composables/gql/gql.ts                |  6 +-
 web/src/composables/gql/graphql.ts            |  4 +-
 7 files changed, 28 insertions(+), 131 deletions(-)

diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index b0ba3ad783..2484ec58eb 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -15,7 +15,7 @@ import { UPDATE_SYSTEM_TIME_MUTATION } from '@/components/Onboarding/graphql/upd
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import OnboardingSummaryStep from '~/components/Onboarding/steps/OnboardingSummaryStep.vue';
-import { ArrayDiskType, PluginInstallStatus } from '~/composables/gql/graphql';
+import { PluginInstallStatus } from '~/composables/gql/graphql';
 import { createTestI18n } from '../../utils/i18n';
 
 const {
@@ -60,6 +60,7 @@ const {
       bootSizeMiB: number;
       updateBios: boolean;
     } | null,
+    internalBootInitialized: true,
     internalBootSkipped: false,
     internalBootApplySucceeded: false,
   },
@@ -284,6 +285,7 @@ describe('OnboardingSummaryStep', () => {
     draftStore.bootMode = 'usb';
     draftStore.selectedPlugins = new Set();
     draftStore.internalBootSelection = null;
+    draftStore.internalBootInitialized = true;
     draftStore.internalBootSkipped = false;
     draftStore.internalBootApplySucceeded = false;
 
@@ -1035,6 +1037,8 @@ describe('OnboardingSummaryStep', () => {
   it('always shows boot configuration section for USB boot mode', () => {
     draftStore.bootMode = 'usb';
     draftStore.internalBootSelection = null;
+    draftStore.internalBootInitialized = true;
+    draftStore.internalBootSkipped = false;
 
     const { wrapper } = mountComponent();
 
@@ -1042,76 +1046,26 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('USB/Flash Drive');
   });
 
-  it('shows USB/Flash Drive when backend boot device type is FLASH', () => {
+  it('hides boot configuration section when internal boot step was skipped', () => {
     draftStore.bootMode = 'usb';
     draftStore.internalBootSelection = null;
-    internalBootContextResult.value = {
-      array: {
-        boot: { device: 'sda', type: ArrayDiskType.FLASH },
-        parities: [],
-        disks: [],
-        caches: [],
-      },
-      vars: {
-        bootEligible: true,
-      },
-      disks: [],
-    };
+    draftStore.internalBootInitialized = true;
+    draftStore.internalBootSkipped = true;
 
     const { wrapper } = mountComponent();
 
-    expect(wrapper.text()).toContain('Boot Configuration');
-    expect(wrapper.text()).toContain('USB/Flash Drive');
+    expect(wrapper.text()).not.toContain('Boot Configuration');
   });
 
-  it('shows Storage Drive(s) when backend boot device type is non-FLASH', () => {
-    draftStore.bootMode = 'usb';
-    draftStore.internalBootSelection = null;
-    internalBootContextResult.value = {
-      array: {
-        boot: { device: 'sdb', type: ArrayDiskType.CACHE },
-        parities: [],
-        disks: [],
-        caches: [],
-      },
-      vars: {
-        bootEligible: true,
-      },
-      disks: [],
-    };
-
-    const { wrapper } = mountComponent();
-
-    expect(wrapper.text()).toContain('Boot Configuration');
-    expect(wrapper.text()).toContain('Storage Drive(s)');
-  });
-
-  it('falls back to USB boot mode when storage boot is selected but ineligible', () => {
+  it('hides boot configuration section when internal boot step is not initialized', () => {
     draftStore.bootMode = 'storage';
     draftStore.internalBootSelection = null;
-    internalBootContextResult.value = {
-      array: {
-        boot: null,
-        parities: [],
-        disks: [],
-        caches: [],
-      },
-      vars: {
-        bootEligible: false,
-      },
-      disks: [
-        {
-          device: '/dev/sda',
-          size: 500 * 1024 * 1024 * 1024,
-          emhttpDeviceId: 'diskA',
-        },
-      ],
-    };
+    draftStore.internalBootInitialized = false;
+    draftStore.internalBootSkipped = false;
 
     const { wrapper } = mountComponent();
 
-    expect(wrapper.text()).toContain('Boot Configuration');
-    expect(wrapper.text()).toContain('USB/Flash Drive');
+    expect(wrapper.text()).not.toContain('Boot Configuration');
   });
 
   it('shows selected boot devices with device name and size details', () => {
diff --git a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
index a0b8c5482c..80c69b4ab8 100644
--- a/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
+++ b/web/src/components/Onboarding/graphql/getInternalBootContext.query.ts
@@ -6,7 +6,6 @@ export const GET_INTERNAL_BOOT_CONTEXT_QUERY = gql`
       state
       boot {
         device
-        type
       }
       parities {
         device
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 09be32294c..a194069c93 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -566,7 +566,7 @@ const handleSkip = () => {
 
 const handlePrimaryAction = () => {
   if (bootMode.value === 'usb') {
-    draftStore.skipInternalBoot();
+    draftStore.setBootMode('usb');
     props.onComplete();
     return;
   }
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index b24cb7711d..6f6c8f7230 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -52,7 +52,7 @@ import type { OnboardingErrorDiagnostics } from '@/components/Onboarding/composa
 
 import { useActivationCodeDataStore } from '~/components/Onboarding/store/activationCodeData';
 import { useOnboardingDraftStore } from '~/components/Onboarding/store/onboardingDraft';
-import { ArrayDiskType, PluginInstallStatus, ThemeName } from '~/composables/gql/graphql';
+import { PluginInstallStatus, ThemeName } from '~/composables/gql/graphql';
 
 export interface Props {
   onComplete: () => void;
@@ -134,11 +134,6 @@ const summaryServerDescription = computed(
   () => draftStore.serverDescription || coreSettingsResult.value?.server?.comment || ''
 );
 
-interface InternalBootContextArrayDisk {
-  device?: string | null;
-  type?: ArrayDiskType | null;
-}
-
 interface InternalBootContextDisk {
   device: string;
   size: number;
@@ -146,72 +141,20 @@ interface InternalBootContextDisk {
 }
 
 interface InternalBootContextData {
-  array?: {
-    boot?: InternalBootContextArrayDisk | null;
-    parities?: InternalBootContextArrayDisk[];
-    disks?: InternalBootContextArrayDisk[];
-    caches?: InternalBootContextArrayDisk[];
-  } | null;
-  vars?: {
-    bootEligible?: boolean | null;
-  } | null;
   disks?: InternalBootContextDisk[];
 }
 
-const hasEligibleStorageBootTarget = computed(() => {
-  const data = internalBootContextResult.value as InternalBootContextData | null;
-  if (!data || !data.vars?.bootEligible) {
-    return false;
-  }
-
-  const assignedDevices = new Set<string>();
-  const assignedDiskGroups = [
-    data.array?.boot ? [data.array.boot] : [],
-    data.array?.parities ?? [],
-    data.array?.disks ?? [],
-    data.array?.caches ?? [],
-  ];
-
-  for (const group of assignedDiskGroups) {
-    for (const disk of group) {
-      const device = normalizeDeviceName(disk.device);
-      if (device) {
-        assignedDevices.add(device);
-      }
-    }
-  }
-
-  return (data.disks ?? []).some((disk) => {
-    const device = normalizeDeviceName(disk.device);
-    return Boolean(device) && !assignedDevices.has(device);
-  });
-});
-
-const selectedBootMode = computed(() => {
-  if (draftStore.bootMode === 'storage' || Boolean(draftStore.internalBootSelection)) {
-    return hasEligibleStorageBootTarget.value ? 'storage' : 'usb';
-  }
-
-  const context = internalBootContextResult.value as InternalBootContextData | null;
-  const bootType = context?.array?.boot?.type;
-  if (bootType === ArrayDiskType.FLASH) {
-    return 'usb';
-  }
-  const bootDevice = context?.array?.boot?.device;
-  return typeof bootDevice === 'string' && bootDevice.trim().length > 0 ? 'storage' : 'usb';
-});
+const showBootConfiguration = computed(
+  () => draftStore.internalBootInitialized && !draftStore.internalBootSkipped
+);
+const selectedBootMode = computed(() => (draftStore.internalBootSelection ? 'storage' : 'usb'));
 const bootModeLabel = computed(() =>
   selectedBootMode.value === 'storage'
     ? t('onboarding.summaryStep.bootConfig.bootMethodStorage')
     : t('onboarding.summaryStep.bootConfig.bootMethodUsb')
 );
 
-const internalBootSelection = computed(() => {
-  if (selectedBootMode.value !== 'storage') {
-    return null;
-  }
-  return draftStore.internalBootSelection ?? null;
-});
+const internalBootSelection = computed(() => draftStore.internalBootSelection ?? null);
 
 const hasInternalBootSelection = computed(() => Boolean(internalBootSelection.value));
 
@@ -1471,7 +1414,7 @@ const handleBack = () => {
         </Disclosure>
       </div>
 
-      <div class="border-muted bg-bg/50 mt-6 rounded-lg border p-5">
+      <div v-if="showBootConfiguration" class="border-muted bg-bg/50 mt-6 rounded-lg border p-5">
         <div class="mb-4 flex items-center gap-2">
           <CircleStackIcon class="text-primary h-5 w-5" />
           <h3 class="text-highlighted text-sm font-bold tracking-wider uppercase">
diff --git a/web/src/components/Onboarding/store/onboardingDraft.ts b/web/src/components/Onboarding/store/onboardingDraft.ts
index b4fee48976..df9676999b 100644
--- a/web/src/components/Onboarding/store/onboardingDraft.ts
+++ b/web/src/components/Onboarding/store/onboardingDraft.ts
@@ -167,8 +167,9 @@ export const useOnboardingDraftStore = defineStore(
     function setBootMode(mode: OnboardingBootMode) {
       bootMode.value = mode;
       internalBootInitialized.value = true;
-      internalBootSkipped.value = mode === 'usb';
+      internalBootSkipped.value = false;
       if (mode === 'usb') {
+        internalBootSelection.value = null;
         internalBootApplySucceeded.value = false;
       }
     }
diff --git a/web/src/composables/gql/gql.ts b/web/src/composables/gql/gql.ts
index 9973a02410..dd10d07d86 100644
--- a/web/src/composables/gql/gql.ts
+++ b/web/src/composables/gql/gql.ts
@@ -74,7 +74,7 @@ type Documents = {
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": typeof types.UpdateSshSettingsDocument,
     "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": typeof types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": typeof types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": typeof types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": typeof types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": typeof types.InstallPluginDocument,
@@ -159,7 +159,7 @@ const documents: Documents = {
     "\n  mutation UpdateSshSettings($enabled: Boolean!, $port: Int = 22) {\n    updateSshSettings(input: { enabled: $enabled, port: $port }) {\n      id\n      useSsh\n      portssh\n    }\n  }\n": types.UpdateSshSettingsDocument,
     "\n  mutation CreateInternalBootPool($input: CreateInternalBootPoolInput!) {\n    onboarding {\n      createInternalBootPool(input: $input) {\n        ok\n        code\n        output\n      }\n    }\n  }\n": types.CreateInternalBootPoolDocument,
     "\n  query GetCoreSettings {\n    customization {\n      activationCode {\n        system {\n          serverName\n          comment\n        }\n      }\n    }\n    vars {\n      name\n      sysModel\n      useSsh\n      localTld\n    }\n    server {\n      name\n      comment\n    }\n    display {\n      theme\n      locale\n    }\n    systemTime {\n      timeZone\n    }\n    info {\n      primaryNetwork {\n        ipAddress\n      }\n    }\n  }\n": types.GetCoreSettingsDocument,
-    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": types.GetInternalBootContextDocument,
+    "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n": types.GetInternalBootContextDocument,
     "\n  query GetInternalBootStepVisibility {\n    vars {\n      enableBootTransfer\n    }\n  }\n": types.GetInternalBootStepVisibilityDocument,
     "\n  mutation InstallLanguage($input: InstallPluginInput!) {\n    unraidPlugins {\n      installLanguage(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallLanguageDocument,
     "\n  mutation InstallPlugin($input: InstallPluginInput!) {\n    unraidPlugins {\n      installPlugin(input: $input) {\n        id\n        url\n        name\n        status\n        createdAt\n        updatedAt\n        finishedAt\n        output\n      }\n    }\n  }\n": types.InstallPluginDocument,
@@ -441,7 +441,7 @@ export function graphql(source: "\n  query GetCoreSettings {\n    customization
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n        type\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"];
+export function graphql(source: "\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"): (typeof documents)["\n  query GetInternalBootContext {\n    array {\n      state\n      boot {\n        device\n      }\n      parities {\n        device\n      }\n      disks {\n        device\n      }\n      caches {\n        name\n        device\n      }\n    }\n    vars {\n      fsState\n      bootEligible\n      enableBootTransfer\n      reservedNames\n    }\n    shares {\n      name\n    }\n    disks {\n      device\n      size\n      emhttpDeviceId\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/src/composables/gql/graphql.ts b/web/src/composables/gql/graphql.ts
index 3ccfdb77e7..1cf46fb76c 100644
--- a/web/src/composables/gql/graphql.ts
+++ b/web/src/composables/gql/graphql.ts
@@ -3897,7 +3897,7 @@ export type GetCoreSettingsQuery = { __typename?: 'Query', customization?: { __t
 export type GetInternalBootContextQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null, type: ArrayDiskType } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null }> };
+export type GetInternalBootContextQuery = { __typename?: 'Query', array: { __typename?: 'UnraidArray', state: ArrayState, boot?: { __typename?: 'ArrayDisk', device?: string | null } | null, parities: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, disks: Array<{ __typename?: 'ArrayDisk', device?: string | null }>, caches: Array<{ __typename?: 'ArrayDisk', name?: string | null, device?: string | null }> }, vars: { __typename?: 'Vars', fsState?: string | null, bootEligible?: boolean | null, enableBootTransfer?: string | null, reservedNames?: string | null }, shares: Array<{ __typename?: 'Share', name?: string | null }>, disks: Array<{ __typename?: 'Disk', device: string, size: number, emhttpDeviceId?: string | null }> };
 
 export type GetInternalBootStepVisibilityQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -4088,7 +4088,7 @@ export const SetLocaleDocument = {"kind":"Document","definitions":[{"kind":"Oper
 export const UpdateSshSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSshSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"port"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}},"defaultValue":{"kind":"IntValue","value":"22"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSshSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"enabled"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enabled"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"port"},"value":{"kind":"Variable","name":{"kind":"Name","value":"port"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"portssh"}}]}}]}}]} as unknown as DocumentNode<UpdateSshSettingsMutation, UpdateSshSettingsMutationVariables>;
 export const CreateInternalBootPoolDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateInternalBootPool"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateInternalBootPoolInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"onboarding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createInternalBootPool"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}},{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<CreateInternalBootPoolMutation, CreateInternalBootPoolMutationVariables>;
 export const GetCoreSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCoreSettings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customization"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activationCode"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverName"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"sysModel"}},{"kind":"Field","name":{"kind":"Name","value":"useSsh"}},{"kind":"Field","name":{"kind":"Name","value":"localTld"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"display"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"theme"}},{"kind":"Field","name":{"kind":"Name","value":"locale"}}]}},{"kind":"Field","name":{"kind":"Name","value":"systemTime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timeZone"}}]}},{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"primaryNetwork"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}}]}}]}}]}}]} as unknown as DocumentNode<GetCoreSettingsQuery, GetCoreSettingsQueryVariables>;
-export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
+export const GetInternalBootContextDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootContext"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"array"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"boot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"parities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}}]}},{"kind":"Field","name":{"kind":"Name","value":"caches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"device"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fsState"}},{"kind":"Field","name":{"kind":"Name","value":"bootEligible"}},{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}},{"kind":"Field","name":{"kind":"Name","value":"reservedNames"}}]}},{"kind":"Field","name":{"kind":"Name","value":"shares"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"disks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"device"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"emhttpDeviceId"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootContextQuery, GetInternalBootContextQueryVariables>;
 export const GetInternalBootStepVisibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetInternalBootStepVisibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enableBootTransfer"}}]}}]}}]} as unknown as DocumentNode<GetInternalBootStepVisibilityQuery, GetInternalBootStepVisibilityQueryVariables>;
 export const InstallLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallLanguageMutation, InstallLanguageMutationVariables>;
 export const InstallPluginDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InstallPlugin"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InstallPluginInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraidPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"installPlugin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"finishedAt"}},{"kind":"Field","name":{"kind":"Name","value":"output"}}]}}]}}]}}]} as unknown as DocumentNode<InstallPluginMutation, InstallPluginMutationVariables>;