diff --git a/Cargo.lock b/Cargo.lock
index 045a26a5e6f..43dae65372f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13762,6 +13762,7 @@ dependencies = [
  "infer 0.22.0",
  "itertools 0.15.0",
  "json5",
+ "libc",
  "minecraft-meta-manifest",
  "modrinth-content-management",
  "notify",
diff --git a/Cargo.toml b/Cargo.toml
index a6a0fe00e35..24154a871e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -138,6 +138,7 @@ lettre = { version = "0.11.23", default-features = false, features = [
   "tokio1",
   "tokio1-rustls",
 ] }
+libc = "0.2.191"
 lingua = "=1.8.0"
 linkify = "0.11.0"
 lz4_flex = { version = "0.14.0", default-features = false, features = [
diff --git a/apps/app-frontend/src/components/ui/SplashScreen.vue b/apps/app-frontend/src/components/ui/SplashScreen.vue
index c63421f80f6..1d79183bff5 100644
--- a/apps/app-frontend/src/components/ui/SplashScreen.vue
+++ b/apps/app-frontend/src/components/ui/SplashScreen.vue
@@ -67,8 +67,8 @@
 						</g>
 					</g>
 				</svg>
-				<ProgressBar class="loading-bar" :progress="Math.min(loadingProgress, 100)" />
-				<span v-if="message">{{ message }}</span>
+				<ProgressBar class="loading-bar" :progress="progress" />
+				<span v-if="message" class="text-secondary">{{ message }}</span>
 			</div>
 			<div class="gradient-bg" data-tauri-drag-region></div>
 			<div class="cube-bg"></div>
@@ -78,8 +78,8 @@
 </template>
 
 <script setup>
-import { injectLoadingState } from '@modrinth/ui'
-import { onMounted, ref, watch } from 'vue'
+import { defineMessages, injectLoadingState, useVIntl } from '@modrinth/ui'
+import { computed, onMounted, ref, watch } from 'vue'
 
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { useAppEvent } from '@/composables/use-app-event'
@@ -87,10 +87,27 @@ import { useTheme } from '@/composables/use-theme.ts'
 import { debugStartup } from '@/helpers/startup-debug'
 
 const theme = useTheme()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	movingAppDirectory: {
+		id: 'app.splash.moving-app-directory',
+		defaultMessage: 'Moving your app directory...',
+	},
+})
 
 const doneLoading = ref(false)
 const loadingProgress = ref(0)
-const message = ref()
+const directoryMoveFraction = ref(null)
+
+const progress = computed(() =>
+	directoryMoveFraction.value === null
+		? Math.min(loadingProgress.value, 100)
+		: directoryMoveFraction.value * 100,
+)
+const message = computed(() =>
+	directoryMoveFraction.value === null ? null : formatMessage(messages.movingAppDirectory),
+)
 
 const MIN_DISPLAY_MS = 500
 const mountedAt = Date.now()
@@ -144,8 +161,7 @@ function fakeLoadingIncrease() {
 
 useAppEvent('loading', (e) => {
 	if (e.event.type === 'directory_move') {
-		loadingProgress.value = 100 * (e.fraction ?? 1)
-		message.value = 'Updating app directory...'
+		directoryMoveFraction.value = e.fraction ?? null
 	}
 })
 </script>
diff --git a/apps/app-frontend/src/features/library/shared-instances/shared-instance-modals.vue b/apps/app-frontend/src/features/library/shared-instances/shared-instance-modals.vue
index 9962666b3e3..3e459d0d37a 100644
--- a/apps/app-frontend/src/features/library/shared-instances/shared-instance-modals.vue
+++ b/apps/app-frontend/src/features/library/shared-instances/shared-instance-modals.vue
@@ -57,6 +57,7 @@ async function install(
 			async () => {
 				if (loadingIds.value.has(sharedInstanceId)) return
 				setLoading(sharedInstanceId, true)
+				let jobId: string
 				try {
 					const job = await install_shared_instance(
 						sharedInstanceId,
@@ -67,12 +68,16 @@ async function install(
 						instance.icon_path ?? null,
 						instance.icon_path ? (instance.icon_config ?? null) : null,
 					)
+					jobId = job.job_id
 					await queryClient.invalidateQueries({ queryKey: ['instances'] })
 					options.onInstalled?.()
-					await wait_for_install_job(appEvents, job.job_id).catch(() => {})
-				} finally {
+				} catch (error) {
 					setLoading(sharedInstanceId, false)
+					throw error
 				}
+				void wait_for_install_job(appEvents, jobId)
+					.catch(() => {})
+					.finally(() => setLoading(sharedInstanceId, false))
 			},
 			manager
 				? { id: manager.id, username: manager.username, avatarUrl: manager.avatar_url ?? null }
diff --git a/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/change-directory-modal.vue b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/change-directory-modal.vue
new file mode 100644
index 00000000000..2dbae5984e9
--- /dev/null
+++ b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/change-directory-modal.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import {
+	ClipboardCopyIcon,
+	ClockIcon,
+	FolderSearchIcon,
+	RefreshCwIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	Admonition,
+	Button,
+	type ButtonMenuOption,
+	commonMessages,
+	defineMessages,
+	NewModal,
+	SplitButton,
+	useVIntl,
+} from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed, ref } from 'vue'
+
+import { get_all as getRunningProcesses } from '@/helpers/process.js'
+import { pickDirectory } from '@/platform/dialogs'
+
+import { isDriveRoot, isNestedPath, normalizePath } from './paths'
+import { useCopyPath } from './use-copy-path'
+
+const props = defineProps<{
+	currentDir: string
+	caseInsensitive: boolean
+}>()
+
+const emit = defineEmits<{
+	confirm: [directory: string, restartNow: boolean]
+}>()
+
+const { formatMessage } = useVIntl()
+const copyPath = useCopyPath()
+
+const messages = defineMessages({
+	header: {
+		id: 'app.settings.resource-management.app-directory.modal.header',
+		defaultMessage: 'Change app directory',
+	},
+	admonitionHeader: {
+		id: 'app.settings.resource-management.app-directory.modal.admonition-header',
+		defaultMessage: 'All your files will be moved',
+	},
+	admonitionBody: {
+		id: 'app.settings.resource-management.app-directory.modal.admonition-body',
+		defaultMessage:
+			"You won't be able to use Modrinth App while we move your data. This may take a while.",
+	},
+	currentLabel: {
+		id: 'app.settings.resource-management.app-directory.modal.current',
+		defaultMessage: 'Current',
+	},
+	newLabel: {
+		id: 'app.settings.resource-management.app-directory.modal.new',
+		defaultMessage: 'New',
+	},
+	choose: {
+		id: 'app.settings.resource-management.app-directory.modal.choose',
+		defaultMessage: 'Choose a folder',
+	},
+	pickerTitle: {
+		id: 'app.settings.resource-management.app-directory.modal.picker-title',
+		defaultMessage: 'Select a new app directory',
+	},
+	instancesRunning: {
+		id: 'app.settings.resource-management.app-directory.modal.instances-running',
+		defaultMessage: 'Close all running instances before changing the app directory.',
+	},
+	nested: {
+		id: 'app.settings.resource-management.app-directory.modal.nested',
+		defaultMessage: "The new folder can't be inside your current app directory, or contain it.",
+	},
+	driveRoot: {
+		id: 'app.settings.resource-management.app-directory.modal.drive-root',
+		defaultMessage:
+			"Choose a folder rather than the top of a drive, so your files don't mix with everything else on it.",
+	},
+	moveAndRestart: {
+		id: 'app.settings.resource-management.app-directory.modal.move-and-restart',
+		defaultMessage: 'Move and restart',
+	},
+	moveLater: {
+		id: 'app.settings.resource-management.app-directory.modal.move-later',
+		defaultMessage: 'Move on next launch',
+	},
+	moreOptions: {
+		id: 'app.settings.resource-management.app-directory.modal.more-options',
+		defaultMessage: 'More move options',
+	},
+})
+
+const modal = ref<InstanceType<typeof NewModal>>()
+const newDir = ref<string | null>(null)
+const locked = ref(false)
+
+const processesQuery = useQuery({
+	queryKey: ['processes', 'list'],
+	networkMode: 'always',
+	queryFn: (): Promise<unknown[]> => getRunningProcesses(),
+	staleTime: 0,
+})
+const instancesRunning = computed(() => (processesQuery.data.value?.length ?? 0) > 0)
+
+const normalizedNew = computed(() =>
+	newDir.value === null ? null : normalizePath(newDir.value, props.caseInsensitive),
+)
+const normalizedCurrent = computed(() => normalizePath(props.currentDir, props.caseInsensitive))
+const sameAsCurrent = computed(() => normalizedNew.value === normalizedCurrent.value)
+const nested = computed(
+	() =>
+		normalizedNew.value !== null &&
+		!sameAsCurrent.value &&
+		isNestedPath(normalizedNew.value, normalizedCurrent.value),
+)
+const driveRoot = computed(() => newDir.value !== null && isDriveRoot(newDir.value))
+const canMove = computed(
+	() => newDir.value !== null && !sameAsCurrent.value && !nested.value && !instancesRunning.value,
+)
+
+const moveOptions = computed<ButtonMenuOption[]>(() => [
+	{
+		id: 'move-later',
+		label: formatMessage(messages.moveLater),
+		icon: ClockIcon,
+		action: () => confirm(false),
+	},
+])
+
+function show(event?: MouseEvent, directory?: string) {
+	newDir.value = directory ?? null
+	locked.value = directory !== undefined
+	void processesQuery.refetch()
+	modal.value?.show(event)
+}
+
+async function browse() {
+	const directory = await pickDirectory(formatMessage(messages.pickerTitle))
+	if (directory) {
+		newDir.value = directory
+	}
+}
+
+async function confirm(restartNow: boolean) {
+	await processesQuery.refetch()
+	if (!canMove.value || newDir.value === null) return
+	modal.value?.hide()
+	emit('confirm', newDir.value, restartNow)
+}
+
+defineExpose({ show })
+</script>
+
+<template>
+	<NewModal ref="modal" :header="formatMessage(messages.header)" fade="danger" max-width="560px">
+		<div class="flex flex-col gap-6">
+			<Admonition
+				type="critical"
+				:header="formatMessage(messages.admonitionHeader)"
+				:body="formatMessage(messages.admonitionBody)"
+			/>
+
+			<div class="flex flex-col gap-2">
+				<span class="font-semibold text-contrast">{{ formatMessage(messages.currentLabel) }}</span>
+				<Button size="lg" class="w-full !justify-between text-left" @click="copyPath(currentDir)">
+					<span class="min-w-0 truncate text-base font-semibold text-primary">
+						{{ currentDir }}
+					</span>
+					<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+				</Button>
+			</div>
+
+			<div class="flex flex-col gap-2">
+				<span class="font-semibold text-contrast">{{ formatMessage(messages.newLabel) }}</span>
+				<Button
+					size="lg"
+					class="w-full !justify-between text-left"
+					:disabled="locked"
+					@click="browse"
+				>
+					<span
+						class="min-w-0 truncate font-semibold"
+						:class="newDir ? 'text-primary' : 'text-secondary'"
+						:title="newDir ?? undefined"
+					>
+						{{ newDir ?? formatMessage(messages.choose) }}
+					</span>
+					<FolderSearchIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+				</Button>
+				<div aria-live="polite" class="flex flex-col gap-1 empty:hidden">
+					<p v-if="instancesRunning" class="m-0 text-sm text-red">
+						{{ formatMessage(messages.instancesRunning) }}
+					</p>
+					<p v-if="nested" class="m-0 text-sm text-red">
+						{{ formatMessage(messages.nested) }}
+					</p>
+					<p v-else-if="driveRoot" class="m-0 text-sm text-orange">
+						{{ formatMessage(messages.driveRoot) }}
+					</p>
+				</div>
+			</div>
+		</div>
+
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<SplitButton
+					type="colored"
+					color="red"
+					:menu-label="formatMessage(messages.moreOptions)"
+					:options="moveOptions"
+					:disabled="!canMove"
+					@click="confirm(true)"
+				>
+					<RefreshCwIcon aria-hidden="true" />
+					{{ formatMessage(messages.moveAndRestart) }}
+				</SplitButton>
+			</div>
+		</template>
+	</NewModal>
+</template>
diff --git a/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/index.vue b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/index.vue
new file mode 100644
index 00000000000..90f8096a493
--- /dev/null
+++ b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/index.vue
@@ -0,0 +1,198 @@
+<script setup lang="ts">
+import {
+	ClipboardCopyIcon,
+	FolderOpenIcon,
+	FolderSearchIcon,
+	RefreshCwIcon,
+	UndoIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	Admonition,
+	Button,
+	type ButtonMenuOption,
+	defineMessages,
+	injectNotificationManager,
+	SplitButton,
+	useVIntl,
+} from '@modrinth/ui'
+import { computed, onMounted, ref } from 'vue'
+
+import { getOS, openPath } from '@/helpers/utils.js'
+
+import ChangeDirectoryModal from './change-directory-modal.vue'
+import { normalizePath } from './paths'
+import { useAppDirectory } from './use-app-directory'
+import { useCopyPath } from './use-copy-path'
+
+const { formatMessage } = useVIntl()
+const copyPath = useCopyPath()
+const { handleError } = injectNotificationManager()
+const { currentDir, defaultDir, pendingDir, busy, changeDirectory, cancelMove, restartNow } =
+	useAppDirectory()
+
+const messages = defineMessages({
+	title: {
+		id: 'app.settings.resource-management.app-directory.title',
+		defaultMessage: 'App directory',
+	},
+	description: {
+		id: 'app.settings.resource-management.app-directory.description',
+		defaultMessage: 'Where Modrinth App stores instances and other files.',
+	},
+	pending: {
+		id: 'app.settings.resource-management.app-directory.pending',
+		defaultMessage: 'Your app directory will move to {path} the next time Modrinth App opens.',
+	},
+	cancelMove: {
+		id: 'app.settings.resource-management.app-directory.cancel-move',
+		defaultMessage: 'Cancel move',
+	},
+	moveNow: {
+		id: 'app.settings.resource-management.app-directory.move-now',
+		defaultMessage: 'Move and restart now',
+	},
+	openInFinder: {
+		id: 'app.settings.resource-management.app-directory.open-in-finder',
+		defaultMessage: 'Open in Finder',
+	},
+	openInExplorer: {
+		id: 'app.settings.resource-management.app-directory.open-in-explorer',
+		defaultMessage: 'Open in File Explorer',
+	},
+	openFolder: {
+		id: 'app.settings.resource-management.app-directory.open-folder',
+		defaultMessage: 'Open folder',
+	},
+	changeDirectory: {
+		id: 'app.settings.resource-management.app-directory.change',
+		defaultMessage: 'Change directory',
+	},
+	changeToDefault: {
+		id: 'app.settings.resource-management.app-directory.change-to-default',
+		defaultMessage: 'Change to default',
+	},
+	moreChangeOptions: {
+		id: 'app.settings.resource-management.app-directory.more-change-options',
+		defaultMessage: 'More directory options',
+	},
+})
+
+const changeModal = ref<InstanceType<typeof ChangeDirectoryModal>>()
+const os = ref<string | null>(null)
+
+onMounted(async () => {
+	os.value = await getOS()
+})
+
+const isDefaultDir = computed(() => {
+	if (!currentDir.value || !defaultDir.value) return true
+	const caseInsensitive = os.value === 'Windows'
+	return (
+		normalizePath(currentDir.value, caseInsensitive) ===
+		normalizePath(defaultDir.value, caseInsensitive)
+	)
+})
+
+const changeOptions = computed<ButtonMenuOption[]>(() => [
+	{
+		id: 'change-to-default',
+		label: formatMessage(messages.changeToDefault),
+		icon: UndoIcon,
+		action: (event) => {
+			if (defaultDir.value) changeModal.value?.show(event, defaultDir.value)
+		},
+	},
+])
+
+const openFolderLabel = computed(() => {
+	if (os.value === 'MacOS') return formatMessage(messages.openInFinder)
+	if (os.value === 'Windows') return formatMessage(messages.openInExplorer)
+	return formatMessage(messages.openFolder)
+})
+
+function openCurrentDir() {
+	if (currentDir.value) {
+		openPath(currentDir.value).catch(handleError)
+	}
+}
+</script>
+
+<template>
+	<section class="flex flex-col gap-2.5" aria-labelledby="app-directory-title">
+		<div class="flex flex-col gap-1">
+			<h2 id="app-directory-title" class="m-0 text-lg font-semibold text-contrast">
+				{{ formatMessage(messages.title) }}
+			</h2>
+			<p class="m-0 text-secondary">{{ formatMessage(messages.description) }}</p>
+		</div>
+
+		<div
+			class="flex flex-col gap-3 rounded-2xl border border-solid border-surface-5 bg-surface-3 p-4"
+		>
+			<Button
+				v-if="currentDir"
+				size="lg"
+				class="w-full !justify-between text-left"
+				@click="copyPath(currentDir)"
+			>
+				<span class="min-w-0 truncate text-base font-semibold text-primary">
+					{{ currentDir }}
+				</span>
+				<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+			</Button>
+
+			<Admonition
+				v-if="pendingDir"
+				type="warning"
+				:body="formatMessage(messages.pending, { path: pendingDir })"
+			>
+				<template #actions>
+					<div class="flex flex-wrap gap-2">
+						<Button type="outlined" :disabled="busy" @click="cancelMove">
+							<XIcon aria-hidden="true" />
+							{{ formatMessage(messages.cancelMove) }}
+						</Button>
+						<Button type="colored" color="red" :disabled="busy" @click="restartNow">
+							<RefreshCwIcon aria-hidden="true" />
+							{{ formatMessage(messages.moveNow) }}
+						</Button>
+					</div>
+				</template>
+			</Admonition>
+
+			<div class="flex flex-wrap gap-2">
+				<Button :disabled="!currentDir" @click="openCurrentDir">
+					<FolderOpenIcon aria-hidden="true" />
+					{{ openFolderLabel }}
+				</Button>
+				<Button
+					v-if="isDefaultDir"
+					:disabled="!currentDir || busy"
+					@click="changeModal?.show($event)"
+				>
+					<FolderSearchIcon aria-hidden="true" />
+					{{ formatMessage(messages.changeDirectory) }}
+				</Button>
+				<SplitButton
+					v-else
+					:menu-label="formatMessage(messages.moreChangeOptions)"
+					:options="changeOptions"
+					:disabled="busy"
+					@click="changeModal?.show($event)"
+				>
+					<FolderSearchIcon aria-hidden="true" />
+					{{ formatMessage(messages.changeDirectory) }}
+				</SplitButton>
+			</div>
+		</div>
+
+		<ChangeDirectoryModal
+			v-if="currentDir"
+			ref="changeModal"
+			:current-dir="currentDir"
+			:case-insensitive="os === 'Windows'"
+			@confirm="changeDirectory"
+		/>
+	</section>
+</template>
diff --git a/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/paths.ts b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/paths.ts
new file mode 100644
index 00000000000..a6ac2be1684
--- /dev/null
+++ b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/paths.ts
@@ -0,0 +1,21 @@
+export function normalizePath(path: string, caseInsensitive: boolean): string {
+	const normalized = path.replace(/\\/g, '/').replace(/\/+$/, '')
+	return caseInsensitive ? normalized.toLowerCase() : normalized
+}
+
+export function isNestedPath(first: string, second: string): boolean {
+	return first.startsWith(`${second}/`) || second.startsWith(`${first}/`)
+}
+
+const DRIVE_ROOTS = [
+	/^$/,
+	/^[a-z]:$/i,
+	/^\/Volumes\/[^/]+$/,
+	/^\/mnt\/[^/]+$/,
+	/^(\/run)?\/media\/[^/]+\/[^/]+$/,
+]
+
+export function isDriveRoot(path: string): boolean {
+	const normalized = normalizePath(path, false)
+	return DRIVE_ROOTS.some((root) => root.test(normalized))
+}
diff --git a/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/use-app-directory.ts b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/use-app-directory.ts
new file mode 100644
index 00000000000..0e46f1aa6a1
--- /dev/null
+++ b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/use-app-directory.ts
@@ -0,0 +1,81 @@
+import { injectNotificationManager } from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, watch } from 'vue'
+
+import {
+	appSettingsKeys,
+	appSettingsQueryOptions,
+	cancel_directory_change,
+	get,
+	set,
+} from '@/helpers/settings'
+import { restartApp } from '@/helpers/utils.js'
+import { getDefaultAppDirectory } from '@/platform/app-lib/settings/commands'
+
+export function useAppDirectory() {
+	const { handleError } = injectNotificationManager()
+	const queryClient = useQueryClient()
+	const settingsQuery = useQuery(appSettingsQueryOptions())
+	const defaultDirQuery = useQuery({
+		queryKey: ['app-directory', 'default'],
+		networkMode: 'always',
+		queryFn: getDefaultAppDirectory,
+		staleTime: Infinity,
+	})
+
+	watch([settingsQuery.error, defaultDirQuery.error], ([settingsError, defaultDirError]) => {
+		const error = settingsError ?? defaultDirError
+		if (error) handleError(error)
+	})
+
+	const defaultDir = computed(() => defaultDirQuery.data.value ?? null)
+
+	const currentDir = computed(() => {
+		const settings = settingsQuery.data.value
+		return settings?.prev_custom_dir ?? settings?.custom_dir ?? null
+	})
+
+	const pendingDir = computed(() => {
+		const settings = settingsQuery.data.value
+		if (!settings?.prev_custom_dir || !settings.custom_dir) return null
+		return settings.custom_dir === settings.prev_custom_dir ? null : settings.custom_dir
+	})
+
+	const settingsMutationOptions = {
+		networkMode: 'always',
+		mutationKey: appSettingsKeys.update,
+		scope: { id: 'app-settings' },
+		onMutate: () => queryClient.cancelQueries({ queryKey: appSettingsKeys.all }),
+		onError: handleError,
+		onSettled: () => queryClient.invalidateQueries({ queryKey: appSettingsKeys.all }),
+	} as const
+
+	const changeMutation = useMutation({
+		...settingsMutationOptions,
+		mutationFn: async ({ directory, restartNow }: { directory: string; restartNow: boolean }) => {
+			await set({ ...(await get()), custom_dir: directory })
+			if (restartNow) await restartApp()
+		},
+	})
+
+	const cancelMutation = useMutation({
+		...settingsMutationOptions,
+		mutationFn: () => cancel_directory_change(),
+	})
+
+	const busy = computed(() => changeMutation.isPending.value || cancelMutation.isPending.value)
+
+	function changeDirectory(directory: string, restartNow: boolean) {
+		changeMutation.mutate({ directory, restartNow })
+	}
+
+	function cancelMove() {
+		cancelMutation.mutate()
+	}
+
+	function restartNow() {
+		restartApp().catch(handleError)
+	}
+
+	return { currentDir, defaultDir, pendingDir, busy, changeDirectory, cancelMove, restartNow }
+}
diff --git a/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/use-copy-path.ts b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/use-copy-path.ts
new file mode 100644
index 00000000000..061a72e5d92
--- /dev/null
+++ b/apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/use-copy-path.ts
@@ -0,0 +1,38 @@
+import { defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
+
+const messages = defineMessages({
+	copiedTitle: {
+		id: 'app.settings.resource-management.app-directory.path-copied-title',
+		defaultMessage: 'Path copied',
+	},
+	copiedText: {
+		id: 'app.settings.resource-management.app-directory.path-copied-text',
+		defaultMessage: 'The app directory path has been copied to your clipboard.',
+	},
+	copyFailedTitle: {
+		id: 'app.settings.resource-management.app-directory.path-copy-failed-title',
+		defaultMessage: 'Failed to copy path',
+	},
+})
+
+export function useCopyPath() {
+	const { formatMessage } = useVIntl()
+	const { addNotification } = injectNotificationManager()
+
+	return async function copyPath(path: string) {
+		try {
+			await navigator.clipboard.writeText(path)
+			addNotification({
+				type: 'success',
+				title: formatMessage(messages.copiedTitle),
+				text: formatMessage(messages.copiedText),
+			})
+		} catch (error) {
+			addNotification({
+				type: 'error',
+				title: formatMessage(messages.copyFailedTitle),
+				text: error instanceof Error ? error.message : String(error),
+			})
+		}
+	}
+}
diff --git a/apps/app-frontend/src/features/settings/system/resource-management-settings/index.vue b/apps/app-frontend/src/features/settings/system/resource-management-settings/index.vue
index eb12af28eb1..ae1fefeed1a 100644
--- a/apps/app-frontend/src/features/settings/system/resource-management-settings/index.vue
+++ b/apps/app-frontend/src/features/settings/system/resource-management-settings/index.vue
@@ -1,34 +1,19 @@
 <script setup>
-import { BoxIcon, FolderSearchIcon } from '@modrinth/assets'
-import { defineMessages, IconButton, Input, Slider, useVIntl } from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
+import { defineMessages, injectNotificationManager, Slider, useVIntl } from '@modrinth/ui'
+import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import { ref, watch } from 'vue'
 
-import { get, set } from '@/helpers/settings.ts'
+import { appSettingsKeys, get, set } from '@/helpers/settings.ts'
 
+import AppDirectorySettings from './app-directory/index.vue'
 import ContentStorageSettings from './content-storage.vue'
 
 const { formatMessage } = useVIntl()
+const { handleError } = injectNotificationManager()
+const queryClient = useQueryClient()
 const settings = ref(await get())
 
 const messages = defineMessages({
-	appDirectoryTitle: {
-		id: 'app.settings.resource-management.app-directory.title',
-		defaultMessage: 'App directory',
-	},
-	appDirectoryDescription: {
-		id: 'app.settings.resource-management.app-directory.description',
-		defaultMessage:
-			'Where Modrinth App stores instances and other files. Changes take effect after restarting the app.',
-	},
-	selectAppDirectory: {
-		id: 'app.settings.resource-management.app-directory.select',
-		defaultMessage: 'Select a new app directory',
-	},
-	browseAppDirectory: {
-		id: 'app.settings.resource-management.app-directory.browse',
-		defaultMessage: 'Browse for an app directory',
-	},
 	maximumConcurrentDownloadsTitle: {
 		id: 'app.settings.resource-management.maximum-concurrent-downloads.title',
 		defaultMessage: 'Maximum concurrent downloads',
@@ -49,62 +34,28 @@ const messages = defineMessages({
 	},
 })
 
-watch(
-	settings,
-	async () => {
-		const setSettings = JSON.parse(JSON.stringify(settings.value))
-
-		if (!setSettings.custom_dir) {
-			setSettings.custom_dir = null
-		}
+const limitsMutation = useMutation({
+	networkMode: 'always',
+	mutationKey: appSettingsKeys.update,
+	scope: { id: 'app-settings' },
+	mutationFn: async (limits) => set({ ...(await get()), ...limits }),
+	onError: handleError,
+	onSettled: () => queryClient.invalidateQueries({ queryKey: appSettingsKeys.all }),
+})
 
-		await set(setSettings)
-	},
-	{ deep: true },
+watch(
+	() => ({
+		max_concurrent_downloads: settings.value.max_concurrent_downloads,
+		max_concurrent_writes: settings.value.max_concurrent_writes,
+	}),
+	(limits) => limitsMutation.mutate(limits),
 )
-
-async function findLauncherDir() {
-	const newDir = await open({
-		multiple: false,
-		directory: true,
-		title: formatMessage(messages.selectAppDirectory),
-	})
-
-	if (newDir) {
-		settings.value.custom_dir = newDir
-	}
-}
 </script>
 
 <template>
 	<div class="flex flex-col gap-6">
 		<ContentStorageSettings />
-		<div class="flex flex-col gap-2.5">
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.appDirectoryTitle) }}
-			</h2>
-			<Input
-				id="appDir"
-				v-model="settings.custom_dir"
-				:icon="BoxIcon"
-				type="text"
-				wrapper-class="w-full"
-			>
-				<template #right>
-					<IconButton
-						v-tooltip="formatMessage(messages.browseAppDirectory)"
-						:label="formatMessage(messages.browseAppDirectory)"
-						class="ml-1.5"
-						@click="findLauncherDir"
-					>
-						<FolderSearchIcon aria-hidden="true" />
-					</IconButton>
-				</template>
-			</Input>
-			<p class="m-0 leading-tight text-secondary">
-				{{ formatMessage(messages.appDirectoryDescription) }}
-			</p>
-		</div>
+		<AppDirectorySettings />
 
 		<div class="flex flex-col gap-2.5">
 			<h2 class="m-0 text-lg font-semibold text-contrast mt-4">
diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index b05f9f6c6a3..da2d483e19d 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -2762,15 +2762,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "النسخ الاحتياطية لقاعدة بيانات التطبيق"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "تصفح لاختيار مجلد التطبيق"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "المكان الذي يخزن فيه تطبيق Modrinth النسخ والملفات الأخرى. تسري التغييرات بعد إعادة تشغيل التطبيق."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "حدد مجلد تطبيق جديد"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "مجلد التطبيق"
   },
diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index 91e5eefb2da..eba381b1bd3 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -2921,15 +2921,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Zálohy databáze aplikace"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Procházet pro adresář aplikace"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Kde Modrinth App ukládá instance a další soubory. Změny se projeví po restartu aplikace."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Vyberte nový adresář pro aplikaci"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Složka aplikace"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index ba94be9bc8d..48eae73b608 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "App-Daten Backups"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Nach einem App-Verzeichnis suchen"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Hier speichert die Modrinth App Instanzen und andere Dateien. Änderungen werden nach einem Neustart der App wirksam."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Neues App-Verzeichnis auswählen"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "App-Verzeichnis"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 5e6e7e90042..e9ef30f6701 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "App-Daten Backups"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Nach einem App-Verzeichnis suchen"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Hier speichert die Modrinth App Instanzen und andere Dateien. Änderungen werden nach einem Neustart der App wirksam."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Neues App-Verzeichnis auswählen"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "App-Verzeichnis"
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 55356c89c81..ee5c83c6183 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -2981,15 +2981,84 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "App database backups"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Browse for an app directory"
+  "app.settings.resource-management.app-directory.cancel-move": {
+    "message": "Cancel move"
+  },
+  "app.settings.resource-management.app-directory.change": {
+    "message": "Change directory"
+  },
+  "app.settings.resource-management.app-directory.change-to-default": {
+    "message": "Change to default"
   },
   "app.settings.resource-management.app-directory.description": {
-    "message": "Where Modrinth App stores instances and other files. Changes take effect after restarting the app."
+    "message": "Where Modrinth App stores instances and other files."
+  },
+  "app.settings.resource-management.app-directory.modal.admonition-body": {
+    "message": "You won't be able to use Modrinth App while we move your data. This may take a while."
+  },
+  "app.settings.resource-management.app-directory.modal.admonition-header": {
+    "message": "All your files will be moved"
+  },
+  "app.settings.resource-management.app-directory.modal.choose": {
+    "message": "Choose a folder"
+  },
+  "app.settings.resource-management.app-directory.modal.current": {
+    "message": "Current"
+  },
+  "app.settings.resource-management.app-directory.modal.drive-root": {
+    "message": "Choose a folder rather than the top of a drive, so your files don't mix with everything else on it."
+  },
+  "app.settings.resource-management.app-directory.modal.header": {
+    "message": "Change app directory"
+  },
+  "app.settings.resource-management.app-directory.modal.instances-running": {
+    "message": "Close all running instances before changing the app directory."
+  },
+  "app.settings.resource-management.app-directory.modal.more-options": {
+    "message": "More move options"
+  },
+  "app.settings.resource-management.app-directory.modal.move-and-restart": {
+    "message": "Move and restart"
+  },
+  "app.settings.resource-management.app-directory.modal.move-later": {
+    "message": "Move on next launch"
+  },
+  "app.settings.resource-management.app-directory.modal.nested": {
+    "message": "The new folder can't be inside your current app directory, or contain it."
+  },
+  "app.settings.resource-management.app-directory.modal.new": {
+    "message": "New"
   },
-  "app.settings.resource-management.app-directory.select": {
+  "app.settings.resource-management.app-directory.modal.picker-title": {
     "message": "Select a new app directory"
   },
+  "app.settings.resource-management.app-directory.more-change-options": {
+    "message": "More directory options"
+  },
+  "app.settings.resource-management.app-directory.move-now": {
+    "message": "Move and restart now"
+  },
+  "app.settings.resource-management.app-directory.open-folder": {
+    "message": "Open folder"
+  },
+  "app.settings.resource-management.app-directory.open-in-explorer": {
+    "message": "Open in File Explorer"
+  },
+  "app.settings.resource-management.app-directory.open-in-finder": {
+    "message": "Open in Finder"
+  },
+  "app.settings.resource-management.app-directory.path-copied-text": {
+    "message": "The app directory path has been copied to your clipboard."
+  },
+  "app.settings.resource-management.app-directory.path-copied-title": {
+    "message": "Path copied"
+  },
+  "app.settings.resource-management.app-directory.path-copy-failed-title": {
+    "message": "Failed to copy path"
+  },
+  "app.settings.resource-management.app-directory.pending": {
+    "message": "Your app directory will move to {path} the next time Modrinth App opens."
+  },
   "app.settings.resource-management.app-directory.title": {
     "message": "App directory"
   },
@@ -3542,6 +3611,9 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Toggle on"
   },
+  "app.splash.moving-app-directory": {
+    "message": "Moving your app directory..."
+  },
   "app.survey.body": {
     "message": "Would you mind answering a few questions about your experience with Modrinth App?"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index d9a0bbe2957..477a722e0a0 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Respaldos de la base de datos de la aplicación"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Buscar un directorio para la aplicación"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Aquí es donde la aplicación guardará las instancias y otros archivos. Los cambios entrarán en efecto al reiniciar la app."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Seleccionar un directorio nuevo para la app"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Directorio de la aplicación"
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index c7467d77255..3336a89eea3 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Copias de seguridad de base de datos"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Buscar un directorio de aplicaciones"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Donde Modrinth App almacena instancias y otros archivos. Los cambios entran en vigor tras reiniciar la aplicación."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Seleccionar un nuevo directorio de aplicaciones"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Directorio de aplicaciones"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 9049284ef6e..ec08602ffbe 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -2912,15 +2912,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Sauvegardes de la base de données de l’application"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Parcourir pour le répertoire de l'application"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Où Modrinth App stocke les instances et les autres fichiers. Changer prend effet après avoir redémarré l'application."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Sélectionner un nouveau répertoire pour l'application"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Répertoire de l'application"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 0fbc470eedf..7c3277ac969 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -2765,15 +2765,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Alkalmazásadatbázis-biztonsági mentések"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Alkalmazáskönyvtár tallózása"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "A Modrinth App ebben a mappában tárolja a példányokat és az egyéb fájlokat. A módosítások az alkalmazás újraindítása után lépnek érvénybe."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Új alkalmazáskönyvtár kiválasztása"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Alkalmazáskönyvtár"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 1ce95fcc7a6..a86c8f5d4c9 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Backup del database dell'app"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Esplora una cartella per l'app"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Dove Modrinth App memorizza le istanze e altri file. Le modifiche avranno effetto dopo un riavvio."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Seleziona la nuova cartella dell'app"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Cartella dell'app"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index f96c588eb16..b6fb932ddb2 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -2501,15 +2501,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "アプリデータベースのバックアップ"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "アプリのディレクトリを参照"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Modrinth Appがインスタンスやその他のファイルを保存する場所です。変更はアプリの再起動後に反映されます。"
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "新しいアプリディレクトリを選択"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "アプリのディレクトリ"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index f64c18e6faa..a582bf5eeeb 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "앱 데이터베이스 백업"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "앱 디렉터리 찾아보기"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Modrinth App이 인스턴스 및 기타 파일을 저장하는 위치입니다. 변경 사항은 앱을 재시작한 후 적용됩니다."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "새 앱 디렉터리 선택"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "앱 경로"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index 9c2b3d7d912..e6f0694d0fd 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -2909,15 +2909,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Back-ups van de app-database"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Zoek naar een app-folder"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Hier slaat de Modrinth-app instanties en andere bestanden op. Wijzigingen worden pas van kracht nadat de app opnieuw is opgestart."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Kies een nieuwe app-folder"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "App-folder"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index a143cb745e3..eb9587414bc 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -2894,15 +2894,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Kopie zapasowe bazy danych aplikacji"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Przeglądaj lokalizację aplikacji"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Gdzie aplikacja Modrinth przechowuje instancje i inne pliki. Wymaga ponownego uruchomienia aplikacji."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Wybierz nową lokalizację aplikacji"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Katalog aplikacji"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index db64e2ff708..c1d30e34aef 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -2951,15 +2951,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Backups do banco de dados do aplicativo"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Buscar por um diretório de aplicativo"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Onde o Modrinth App armazena as instâncias e outros arquivos. As mudanças serão aplicadas após reiniciar o aplicativo."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Selecione um novo diretório de aplicativo"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Diretório de aplicativo"
   },
diff --git a/apps/app-frontend/src/locales/pt-PT/index.json b/apps/app-frontend/src/locales/pt-PT/index.json
index fe30ad3d6e1..964979227c6 100644
--- a/apps/app-frontend/src/locales/pt-PT/index.json
+++ b/apps/app-frontend/src/locales/pt-PT/index.json
@@ -1190,9 +1190,6 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Cópias de segurança da base de dados das aplicações"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Procurar um diretório de aplicações"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Local onde a aplicação Modrinth armazena instâncias e outros ficheiros. As alterações entram em vigor após o reinício da aplicação."
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 2070b25d22b..8fb01a5efab 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -2876,15 +2876,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Резервные копии базы данных"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Выбрать каталог приложения"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Здесь Modrinth App хранит сборки и другие файлы. Изменения вступят в силу после перезапуска."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Выбор нового каталога приложения"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Каталог приложения"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index f013650a36e..eda6e811e62 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -2678,15 +2678,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Säkerhetskopior av appdatabas"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Bläddra efter en appmapp"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Var Modrinth App lagrar instanser och andra filer. Ändringar träder i kraft efter appen startas om."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Välj en ny appmapp"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Appmapp"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index e8bdede5e12..fe781d19c8c 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -2759,15 +2759,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Uygulama veritabanı yedekleri"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Bir uygulama dizinine göz atın"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Modrinth App'in örnekleri ve diğer dosyaları depoladığı yer. Değişiklikler uygulamayı yeniden başlattıktan sonra etki eder."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Yeni bir uygulama dizini seçin"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Uygulama dizini"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 9c2990cffb6..a6532cda3dc 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -2939,15 +2939,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Резервні копії бази даних застосунку"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Оглянути каталог застосунку"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Де Modrinth App зберігає примірники й інші файли. Зміни набудуть чинності після перезапуску застосунку."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Вибрати новий каталог застосунку"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Каталог застосунку"
   },
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index 3b80b44f04f..20ced800966 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -2756,15 +2756,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "Bản sao lưu cơ sở dữ liệu ứng dụng"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "Chọn thư mục ứng dụng"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Nơi Ứng dụng Modrinth lưu các bản cài đặt và tệp khác. Thay đổi có hiệu lực sau khi khởi động lại ứng dụng."
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "Chọn thư mục ứng dụng mới"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Thư mục ứng dụng"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index f0ecd314d67..6c2d6c755da 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -2876,15 +2876,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "应用数据库备份"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "浏览应用目录"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Modrinth App存储实例和其他文件的位置。更改会在重启程序后生效。"
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "选择新的应用目录"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "应用目录"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index 5934cef81fe..061dbec2d7b 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -2915,15 +2915,9 @@
   "app.settings.resource-management.app-database-backups.title": {
     "message": "應用程式資料庫備份"
   },
-  "app.settings.resource-management.app-directory.browse": {
-    "message": "瀏覽應用程式資料夾"
-  },
   "app.settings.resource-management.app-directory.description": {
     "message": "Modrinth App 儲存實例及其他檔案的位置。變更將於重新啟動應用程式後生效。"
   },
-  "app.settings.resource-management.app-directory.select": {
-    "message": "選擇新的應用程式資料夾"
-  },
   "app.settings.resource-management.app-directory.title": {
     "message": "應用程式資料夾"
   },
diff --git a/apps/app-frontend/src/platform/app-lib/settings/commands.ts b/apps/app-frontend/src/platform/app-lib/settings/commands.ts
new file mode 100644
index 00000000000..e1629e87406
--- /dev/null
+++ b/apps/app-frontend/src/platform/app-lib/settings/commands.ts
@@ -0,0 +1,5 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export function getDefaultAppDirectory(): Promise<string> {
+	return invoke('plugin:settings|default_app_directory')
+}
diff --git a/apps/app-frontend/src/platform/dialogs.ts b/apps/app-frontend/src/platform/dialogs.ts
index 0bc366a3a97..75804beb014 100644
--- a/apps/app-frontend/src/platform/dialogs.ts
+++ b/apps/app-frontend/src/platform/dialogs.ts
@@ -1,5 +1,10 @@
 import { open } from '@tauri-apps/plugin-dialog'
 
+export async function pickDirectory(title: string): Promise<string | null> {
+	const directory = await open({ multiple: false, directory: true, title })
+	return typeof directory === 'string' ? directory : null
+}
+
 export function pickFile(): Promise<string | null> {
 	return open({ multiple: false, directory: false })
 }
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 48825652443..5413d1ba5a1 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -338,6 +338,7 @@ fn main() {
                         "store_cleanup",
                         "store_set_cache_limit",
                         "cancel_directory_change",
+                        "default_app_directory",
                     ])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
diff --git a/apps/app/src/api/settings.rs b/apps/app/src/api/settings.rs
index a048133e134..8068f682612 100644
--- a/apps/app/src/api/settings.rs
+++ b/apps/app/src/api/settings.rs
@@ -10,11 +10,17 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             store_usage,
             store_cleanup,
             store_set_cache_limit,
-            cancel_directory_change
+            cancel_directory_change,
+            default_app_directory
         ])
         .build()
 }
 
+#[tauri::command]
+pub async fn default_app_directory() -> Result<std::path::PathBuf> {
+    Ok(settings::default_app_directory().await?)
+}
+
 #[tauri::command]
 pub async fn store_usage() -> Result<settings::StoreUsage> {
     Ok(settings::store_usage().await?)
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 305f7854a0f..1d7a866fc10 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -128,6 +128,9 @@ zip = { workspace = true }
 dotenvy = { workspace = true }
 dunce = { workspace = true }
 
+[target.'cfg(unix)'.dependencies]
+libc = { workspace = true }
+
 [target.'cfg(target_os = "macos")'.dependencies]
 cidre = { workspace = true, features = ["blocks", "nw"] }
 
diff --git a/packages/app-lib/src/api/settings.rs b/packages/app-lib/src/api/settings.rs
index 6a11e52aac9..08d2321b9e9 100644
--- a/packages/app-lib/src/api/settings.rs
+++ b/packages/app-lib/src/api/settings.rs
@@ -24,6 +24,10 @@ pub async fn store_set_cache_limit(bytes: u64) -> crate::Result<()> {
         .await
 }
 
+pub async fn default_app_directory() -> crate::Result<std::path::PathBuf> {
+    Ok(State::get().await?.directories.settings_dir.clone())
+}
+
 /// Gets entire settings
 #[tracing::instrument]
 pub async fn get() -> crate::Result<Settings> {
diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs
index 8e348b5973e..99f5aaedcb9 100644
--- a/packages/app-lib/src/state/dirs.rs
+++ b/packages/app-lib/src/state/dirs.rs
@@ -1,9 +1,8 @@
 //! Theseus directory information
 pub(crate) mod move_app_directory;
-use crate::event::emit::{emit_loading, init_loading};
+use crate::ErrorKind;
 use crate::state::{Settings, State};
 use crate::util::fetch::IoSemaphore;
-use crate::{ErrorKind, LoadingBarType};
 use anyhow::Context;
 use std::path::PathBuf;
 use tokio::fs;
@@ -281,22 +280,12 @@ impl DirectoryInfo {
         if let Some(previous) = &previous
             && moving
         {
-            let loading = init_loading(
-                LoadingBarType::DirectoryMove {
-                    old: previous.to_string_lossy().into_owned(),
-                    new: destination.to_string_lossy().into_owned(),
-                },
-                100.0,
-                "Moving launcher directory",
-            )
-            .await?;
             move_app_directory::move_app_directory(
                 previous,
                 &destination,
                 pool,
             )
             .await?;
-            emit_loading(&loading, 100.0, None)?;
         }
         if !moving {
             move_app_directory::resume_completed_move(&destination, pool)
diff --git a/packages/app-lib/src/state/dirs/move_app_directory.rs b/packages/app-lib/src/state/dirs/move_app_directory.rs
index a4efb818486..b7abaa15a71 100644
--- a/packages/app-lib/src/state/dirs/move_app_directory.rs
+++ b/packages/app-lib/src/state/dirs/move_app_directory.rs
@@ -1,17 +1,82 @@
-use crate::ErrorKind;
+//! 1. The user picks a new directory. The move runs on the next startup, before
+//!    the rest of the app state is created.
+//! 2. The old directory is walked. Folders and links are created at the
+//!    destination, and every file is added to a list. Rebuildable caches are
+//!    left out; `caches/icons` and `caches/game-locales` are kept because
+//!    instances and saved settings point at them. Files already at the
+//!    destination on the first attempt are recorded as protected.
+//! 3. Files are copied in parallel, without syncing each one to disk. A copy
+//!    keeps its source's modification time, so an unprotected file already at
+//!    the destination with the same time is skipped. A protected file is only
+//!    accepted if its contents match.
+//! 4. Every copy is hashed and compared with its source. Mismatches are copied
+//!    again, up to three attempts, after which the move fails. Protected files
+//!    are never replaced.
+//! 5. Every new file and folder is synced to disk once.
+//! 6. Paths in the database are rewritten and the move is marked as copied.
+//! 7. The old directory is deleted.
+//!
+//! Until step 6, the old directory is untouched and remains the source of
+//! truth. If the move is interrupted before then, the next startup runs it
+//! again and step 4 catches any copy left damaged. Cancelling only resets
+//! settings.
+//!
+//! After step 6, the new directory is the source of truth. If the app stops
+//! during step 7, the next startup finishes deleting the old directory.
+
+use crate::event::emit::{emit_loading, init_loading};
 use crate::state::content_store;
+use crate::{ErrorKind, LoadingBarType};
 mod managed_content;
 
 use crate::state::content_store::{
-    hash_file, normalize, relative_link, sync_directory,
+    FileHashes, hash_file, normalize, relative_link, remove_instance_file,
+    sync_directory,
 };
 use crate::state::instances::adapters::sqlite::instance_rows;
 use crate::state::{Instance, JavaVersion};
+use crate::util::content_hash::{copy_and_hash, hash_file_with_progress};
 use anyhow::bail;
+use futures::stream::{self, StreamExt, TryStreamExt};
 use serde_json::Value;
 use sqlx::SqlitePool;
+use std::collections::HashSet;
 use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::time::Instant;
 use tokio::fs;
+use tokio::io::AsyncWriteExt;
+
+const PARALLEL_FILES: usize = 8;
+const COPY_ATTEMPTS: usize = 3;
+
+type ProgressFn<'a> = &'a (dyn Fn(u64) + Send + Sync);
+
+#[derive(Default)]
+struct MovePlan {
+    files: Vec<(PathBuf, PathBuf)>,
+    directories: Vec<PathBuf>,
+    /// Targets that existed before the move wrote anything. They are never replaced.
+    protected: HashSet<PathBuf>,
+    bytes: u64,
+    required: u64,
+}
+
+impl MovePlan {
+    async fn add_file(&mut self, source: PathBuf, target: PathBuf, len: u64) {
+        self.bytes = self.bytes.saturating_add(len);
+        if fs::symlink_metadata(&target).await.is_ok() {
+            self.protected.insert(target.clone());
+        } else {
+            self.required = self.required.saturating_add(len);
+        }
+        self.files.push((source, target));
+    }
+}
+
+const PROTECTED_TARGETS_KEY: &str = "store_directory_move_protected";
+const PRESERVED_CACHE_ENTRIES: [&str; 2] = ["icons", "game-locales"];
+const COPY_PROGRESS_LIMIT: f64 = 0.99;
 
 const MOVED_APP_DIRECTORIES: [&str; 6] = [
     "store",
@@ -44,24 +109,28 @@ pub(crate) async fn relocate_tree(from: &Path, to: &Path) -> crate::Result<()> {
         }
         return Ok(());
     }
-    copy_tree(
+    let mut plan = MovePlan::default();
+    plan_tree(
         from,
         to,
         &[(from.to_path_buf(), to.to_path_buf())],
-        &std::collections::HashSet::new(),
+        &HashSet::new(),
+        &mut plan,
     )
-    .await
+    .await?;
+    copy_planned(&plan, to, &|_| {}).await
 }
 
-async fn copy_tree(
+async fn plan_tree(
     from: &Path,
     to: &Path,
     mappings: &[(PathBuf, PathBuf)],
-    managed_paths: &std::collections::HashSet<PathBuf>,
+    skipped_paths: &HashSet<PathBuf>,
+    plan: &mut MovePlan,
 ) -> crate::Result<()> {
     let mut pending = vec![(from.to_path_buf(), to.to_path_buf())];
     while let Some((source, target)) = pending.pop() {
-        if managed_paths.contains(&source) {
+        if skipped_paths.contains(&source) {
             continue;
         }
         let metadata = fs::symlink_metadata(&source).await?;
@@ -114,47 +183,229 @@ async fn copy_tree(
             while let Some(entry) = entries.next_entry().await? {
                 pending.push((entry.path(), target.join(entry.file_name())));
             }
+            plan.directories.push(target);
         } else if metadata.is_file() {
-            if let Ok(existing) = fs::symlink_metadata(&target).await {
-                if !existing.is_file()
-                    || existing.file_type().is_symlink()
-                    || hash_file(&source).await? != hash_file(&target).await?
-                {
-                    bail!(ErrorKind::InputError(format!(
-                        "migration would overwrite different data at {}",
-                        target.display()
-                    )));
-                }
-                continue;
-            }
-            let parent = target.parent().ok_or(ErrorKind::InputError(
-                "invalid migration target".to_string(),
-            ))?;
-            fs::create_dir_all(parent).await?;
-            let temporary = parent
-                .join(format!(".modrinth-move-{}.tmp", uuid::Uuid::new_v4()));
-            crate::state::content_store::writable_copy(&source, &temporary)
-                .await?;
-            fs::File::options()
-                .write(true)
-                .open(&temporary)
-                .await?
-                .sync_all()
-                .await?;
-            fs::set_permissions(&temporary, metadata.permissions()).await?;
-            if hash_file(&source).await? != hash_file(&temporary).await? {
-                bail!(ErrorKind::InputError(
-                    "file changed or failed verification during directory migration"
-                        .to_string(),
-                ));
-            }
-            fs::rename(&temporary, &target).await?;
-            sync_directory(parent).await?;
+            plan.add_file(source, target, metadata.len()).await;
+        }
+    }
+    Ok(())
+}
+
+async fn copy_planned(
+    plan: &MovePlan,
+    root: &Path,
+    on_progress: ProgressFn<'_>,
+) -> crate::Result<()> {
+    let mut pending = (0..plan.files.len()).collect::<Vec<_>>();
+    for attempt in 0..COPY_ATTEMPTS {
+        let copied: Vec<_> = stream::iter(pending)
+            .map(|index| async move {
+                let (source, target) = &plan.files[index];
+                copy_file(
+                    source,
+                    target,
+                    plan.protected.contains(target),
+                    attempt > 0,
+                    on_progress,
+                )
+                .await
+                .map(|hashes| (index, hashes))
+            })
+            .buffer_unordered(PARALLEL_FILES)
+            .try_collect()
+            .await?;
+        let verified: Vec<_> = stream::iter(copied)
+            .map(|(index, hashes)| async move {
+                let (source, target) = &plan.files[index];
+                verify_file(source, target, hashes, on_progress)
+                    .await
+                    .map(|matches| (index, matches))
+            })
+            .buffer_unordered(PARALLEL_FILES)
+            .try_collect()
+            .await?;
+        pending = verified
+            .into_iter()
+            .filter_map(|(index, matches)| (!matches).then_some(index))
+            .collect();
+        if pending.is_empty() {
+            break;
         }
+        tracing::warn!(
+            files = pending.len(),
+            attempt,
+            "Files failed verification during app directory move"
+        );
+    }
+    if let Some((source, _)) = pending.first().map(|&index| &plan.files[index])
+    {
+        bail!(ErrorKind::InputError(format!(
+            "{} could not be copied after {COPY_ATTEMPTS} attempts",
+            source.display()
+        )));
     }
+    let paths = plan
+        .files
+        .iter()
+        .map(|(_, target)| target)
+        .chain(&plan.directories)
+        .chain(std::iter::once(&root.to_path_buf()))
+        .cloned()
+        .collect::<Vec<_>>();
+    stream::iter(paths)
+        .map(|path| async move {
+            Ok::<_, crate::Error>(
+                tokio::task::spawn_blocking(move || flush_path(&path))
+                    .await??,
+            )
+        })
+        .buffer_unordered(PARALLEL_FILES)
+        .try_collect::<Vec<_>>()
+        .await?;
+    #[cfg(target_os = "macos")]
+    fs::File::open(root).await?.sync_all().await?;
     Ok(())
 }
 
+/// `None` when the file was already copied. Only targets the move wrote may be
+/// trusted by modification time or replaced; `protected` targets must match.
+async fn copy_file(
+    source: &Path,
+    target: &Path,
+    protected: bool,
+    replace: bool,
+    on_progress: ProgressFn<'_>,
+) -> crate::Result<Option<FileHashes>> {
+    let metadata = fs::symlink_metadata(source).await?;
+    if let Ok(existing) = fs::symlink_metadata(target).await {
+        let replace = replace && !protected;
+        if !existing.is_file()
+            || (!replace
+                && (protected || !is_copied_file(&metadata, &existing))
+                && hash_file(source).await? != hash_file(target).await?)
+        {
+            bail!(ErrorKind::InputError(format!(
+                "migration would overwrite different data at {}",
+                target.display()
+            )));
+        }
+        if !replace {
+            on_progress(metadata.len());
+            return Ok(None);
+        }
+        remove_instance_file(target).await?;
+    }
+    let parent = target.parent().ok_or(ErrorKind::InputError(
+        "invalid migration target".to_string(),
+    ))?;
+    let temporary =
+        parent.join(format!(".modrinth-move-{}.tmp", uuid::Uuid::new_v4()));
+    let modified = metadata.modified()?;
+    let mut output = fs::File::create(&temporary).await?;
+    let hashes =
+        copy_and_hash(fs::File::open(source).await?, &mut output, on_progress)
+            .await?;
+    output.flush().await?;
+    output.into_std().await.set_modified(modified)?;
+    fs::set_permissions(&temporary, metadata.permissions()).await?;
+    let after = fs::metadata(source).await?;
+    if after.len() != hashes.size || after.modified()? != modified {
+        bail!(ErrorKind::InputError(format!(
+            "{} changed during the app directory move",
+            source.display()
+        )));
+    }
+    fs::rename(&temporary, target).await?;
+    Ok(Some(hashes))
+}
+
+async fn verify_file(
+    source: &Path,
+    target: &Path,
+    hashes: Option<FileHashes>,
+    on_progress: ProgressFn<'_>,
+) -> crate::Result<bool> {
+    let expected = match hashes {
+        Some(hashes) => hashes,
+        None => hash_file(source).await?,
+    };
+    Ok(hash_file_with_progress(target, on_progress)
+        .await
+        .is_ok_and(|actual| actual == expected))
+}
+
+/// - Linux and other Unix: `fsync`, the same as `sync_all`.
+/// - macOS: `fsync`, as `sync_all` is a slow `F_FULLFSYNC` that flushes the
+///   drive's cache. `copy_planned` issues it once after every path is flushed.
+/// - Windows: `sync_all` (`FlushFileBuffers`) on files. Directories can't be
+///   flushed there and are skipped.
+fn flush_path(path: &Path) -> std::io::Result<()> {
+    #[cfg(unix)]
+    {
+        use std::os::fd::AsRawFd;
+        let file = std::fs::File::open(path)?;
+        if unsafe { libc::fsync(file.as_raw_fd()) } != 0 {
+            return Err(std::io::Error::last_os_error());
+        }
+        Ok(())
+    }
+    #[cfg(windows)]
+    {
+        let metadata = std::fs::metadata(path)?;
+        if metadata.is_dir() {
+            return Ok(());
+        }
+        let permissions = metadata.permissions();
+        if permissions.readonly() {
+            let mut writable = permissions.clone();
+            writable.set_readonly(false);
+            std::fs::set_permissions(path, writable)?;
+        }
+        let result = std::fs::OpenOptions::new()
+            .write(true)
+            .open(path)
+            .and_then(|file| file.sync_all());
+        if permissions.readonly() {
+            std::fs::set_permissions(path, permissions)?;
+        }
+        result
+    }
+}
+
+/// Everything in `caches` except `icons`, which instances reference by absolute
+/// path, and `game-locales`, whose snapshots saved settings reference.
+async fn rebuildable_cache_entries(root: &Path) -> crate::Result<Vec<PathBuf>> {
+    let mut entries = Vec::new();
+    let mut caches = match fs::read_dir(root.join("caches")).await {
+        Ok(caches) => caches,
+        Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
+            return Ok(entries);
+        }
+        Err(error) => return Err(error.into()),
+    };
+    while let Some(entry) = caches.next_entry().await? {
+        if !PRESERVED_CACHE_ENTRIES
+            .iter()
+            .any(|preserved| entry.file_name() == *preserved)
+        {
+            entries.push(entry.path());
+        }
+    }
+    Ok(entries)
+}
+
+/// Copies keep the source's mtime, so for an unprotected target a match means
+/// an earlier attempt wrote this file.
+fn is_copied_file(
+    source: &std::fs::Metadata,
+    target: &std::fs::Metadata,
+) -> bool {
+    matches!(
+        (source.modified(), target.modified()),
+        (Ok(source), Ok(target)) if source == target
+    )
+}
+
 async fn create_link(
     link: &Path,
     target: &Path,
@@ -401,12 +652,23 @@ pub(crate) async fn move_app_directory(
     }
     content_store::set_setting(pool, "store_directory_move", &checkpoint)
         .await?;
+    let started = Instant::now();
+    let loading = init_loading(
+        LoadingBarType::DirectoryMove {
+            old: dunce::simplified(&from).to_string_lossy().into_owned(),
+            new: dunce::simplified(&to).to_string_lossy().into_owned(),
+        },
+        1.0,
+        "Moving app directory",
+    )
+    .await?;
     let managed_files = managed_content::prepare(pool, &from, &to).await?;
-    let managed_paths = managed_files
+    let mut skipped_paths: HashSet<PathBuf> = managed_files
         .iter()
         .map(|file| file.source.clone())
         .collect();
-    let mut required = 0_u64;
+    skipped_paths.extend(rebuildable_cache_entries(&from).await?);
+    let mut plan = MovePlan::default();
     for directory in MOVED_APP_DIRECTORIES {
         let source = from.join(directory);
         match fs::symlink_metadata(&source).await {
@@ -424,28 +686,63 @@ pub(crate) async fn move_app_directory(
             }
             Err(error) => return Err(error.into()),
         }
-        if fs::try_exists(&source).await? {
-            required = required.saturating_add(
-                required_copy_bytes(
-                    &source,
-                    &to.join(directory),
-                    &managed_paths,
-                )
-                .await?,
-            );
-        }
+        plan_tree(
+            &source,
+            &to.join(directory),
+            &mappings,
+            &skipped_paths,
+            &mut plan,
+        )
+        .await?;
     }
-    ensure_move_space(&to, required)?;
-    for directory in MOVED_APP_DIRECTORIES {
-        let source = from.join(directory);
-        if fs::try_exists(&source).await? {
-            copy_tree(&source, &to.join(directory), &mappings, &managed_paths)
-                .await?;
+    for (source, target, len) in
+        managed_content::checkpoint(pool, managed_files, &from, &to).await?
+    {
+        plan.add_file(source, target, len).await;
+    }
+    match content_store::setting(pool, PROTECTED_TARGETS_KEY)
+        .await?
+        .filter(|saved| !saved.is_empty())
+        .map(|saved| serde_json::from_str::<(String, HashSet<PathBuf>)>(&saved))
+        .transpose()?
+    {
+        Some((saved_checkpoint, protected))
+            if saved_checkpoint == checkpoint =>
+        {
+            plan.protected = protected;
+        }
+        _ => {
+            content_store::set_setting(
+                pool,
+                PROTECTED_TARGETS_KEY,
+                &serde_json::to_string(&(&checkpoint, &plan.protected))?,
+            )
+            .await?;
         }
     }
-    managed_content::copy_and_checkpoint(pool, managed_files, &from, &to)
-        .await?;
+    ensure_move_space(&to, plan.required)?;
+    tracing::info!(
+        from = %from.display(),
+        to = %to.display(),
+        files = plan.files.len(),
+        bytes = plan.bytes,
+        "Moving app directory"
+    );
+    let total = plan.bytes.saturating_mul(2).max(1) as f64;
+    let processed = AtomicU64::new(0);
+    let fraction =
+        |bytes: u64| (bytes as f64 / total).min(1.0) * COPY_PROGRESS_LIMIT;
+    let on_progress = |bytes: u64| {
+        let before = processed.fetch_add(bytes, Ordering::Relaxed);
+        let _ = emit_loading(
+            &loading,
+            fraction(before.saturating_add(bytes)) - fraction(before),
+            None,
+        );
+    };
+    copy_planned(&plan, &to, &on_progress).await?;
     rewrite_database_paths(pool, &mappings, &checkpoint).await?;
+    tracing::info!(elapsed = ?started.elapsed(), "Copied app directory");
     Ok(())
 }
 
@@ -475,6 +772,8 @@ pub(crate) async fn finish_app_directory_move(
                 .to_string(),
         ));
     }
+    tracing::info!(from = %from.display(), "Removing old app directory data");
+    let started = Instant::now();
     managed_content::commit(pool).await?;
     for directory in MOVED_APP_DIRECTORIES {
         let source = from.join(directory);
@@ -486,7 +785,9 @@ pub(crate) async fn finish_app_directory_move(
     }
     content_store::set_setting(pool, "store_directory_move", "").await?;
     content_store::set_setting(pool, "store_directory_move_copied", "").await?;
+    content_store::set_setting(pool, PROTECTED_TARGETS_KEY, "").await?;
     managed_content::clear_checkpoint(pool).await?;
+    tracing::info!(elapsed = ?started.elapsed(), "Finished app directory move");
     Ok(())
 }
 
@@ -499,32 +800,6 @@ fn ensure_move_space(destination: &Path, required: u64) -> crate::Result<()> {
     Ok(())
 }
 
-async fn required_copy_bytes(
-    from: &Path,
-    to: &Path,
-    managed_paths: &std::collections::HashSet<PathBuf>,
-) -> crate::Result<u64> {
-    let mut pending = vec![(from.to_path_buf(), to.to_path_buf())];
-    let mut bytes = 0_u64;
-    while let Some((source, target)) = pending.pop() {
-        if managed_paths.contains(&source) {
-            continue;
-        }
-        let metadata = fs::symlink_metadata(&source).await?;
-        if metadata.is_dir() && !metadata.file_type().is_symlink() {
-            let mut entries = fs::read_dir(&source).await?;
-            while let Some(entry) = entries.next_entry().await? {
-                pending.push((entry.path(), target.join(entry.file_name())));
-            }
-        } else if metadata.is_file()
-            && fs::symlink_metadata(&target).await.is_err()
-        {
-            bytes = bytes.saturating_add(metadata.len());
-        }
-    }
-    Ok(bytes)
-}
-
 pub(crate) async fn resume_completed_move(
     destination: &Path,
     pool: &SqlitePool,
@@ -535,6 +810,7 @@ pub(crate) async fn resume_completed_move(
     {
         let (from, to): (PathBuf, PathBuf) = serde_json::from_str(&checkpoint)?;
         if fs::canonicalize(destination).await? == to {
+            tracing::info!("Resuming interrupted app directory move cleanup");
             finish_app_directory_move(&from, &to, pool).await?;
         }
     }
@@ -572,6 +848,7 @@ pub(crate) async fn cancel_move(pool: &SqlitePool) -> crate::Result<()> {
         content_store::set_setting(pool, "store_directory_move", "").await?;
         content_store::set_setting(pool, "store_directory_move_copied", "")
             .await?;
+        content_store::set_setting(pool, PROTECTED_TARGETS_KEY, "").await?;
         managed_content::clear_checkpoint(pool).await?;
     }
     Ok(())
@@ -607,3 +884,213 @@ pub(crate) async fn remove_migrated_tree(root: &Path) -> crate::Result<()> {
     fs::remove_dir_all(root).await?;
     Ok(())
 }
+
+// dont usually need tests but cant fk this one up
+#[cfg(test)]
+mod tests {
+    use super::{MovePlan, copy_planned, plan_tree};
+    use std::collections::HashSet;
+    use std::fs;
+    use std::path::Path;
+    use std::sync::atomic::{AtomicU64, Ordering};
+
+    async fn copy_tree(from: &Path, to: &Path) -> crate::Result<u64> {
+        copy_tree_with(from, to, None).await
+    }
+
+    /// Runs again with the protected targets recorded by the first attempt.
+    async fn resume_tree(from: &Path, to: &Path) -> crate::Result<u64> {
+        copy_tree_with(from, to, Some(HashSet::new())).await
+    }
+
+    async fn copy_tree_with(
+        from: &Path,
+        to: &Path,
+        protected: Option<HashSet<std::path::PathBuf>>,
+    ) -> crate::Result<u64> {
+        let mut plan = MovePlan::default();
+        plan_tree(
+            from,
+            to,
+            &[(from.to_path_buf(), to.to_path_buf())],
+            &HashSet::new(),
+            &mut plan,
+        )
+        .await?;
+        if let Some(protected) = protected {
+            plan.protected = protected;
+        }
+        let progress = AtomicU64::new(0);
+        copy_planned(&plan, to, &|bytes| {
+            progress.fetch_add(bytes, Ordering::Relaxed);
+        })
+        .await?;
+        Ok(progress.into_inner())
+    }
+
+    fn modified(path: &Path) -> std::time::SystemTime {
+        fs::metadata(path).unwrap().modified().unwrap()
+    }
+
+    #[tokio::test]
+    async fn copies_tree_with_metadata_and_full_progress() {
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        let large: Vec<u8> = (0..600_000).map(|i| (i % 251) as u8).collect();
+        fs::create_dir_all(from.join("mods/nested")).unwrap();
+        fs::create_dir_all(from.join("empty")).unwrap();
+        fs::write(from.join("mods/large.jar"), &large).unwrap();
+        fs::write(from.join("mods/nested/config.toml"), b"key = 1").unwrap();
+        let mut permissions =
+            fs::metadata(from.join("mods/nested/config.toml"))
+                .unwrap()
+                .permissions();
+        permissions.set_readonly(true);
+        fs::set_permissions(from.join("mods/nested/config.toml"), permissions)
+            .unwrap();
+
+        let progress = copy_tree(&from, &to).await.unwrap();
+
+        assert_eq!(fs::read(to.join("mods/large.jar")).unwrap(), large);
+        assert_eq!(
+            fs::read(to.join("mods/nested/config.toml")).unwrap(),
+            b"key = 1"
+        );
+        assert!(to.join("empty").is_dir());
+        assert_eq!(
+            modified(&to.join("mods/large.jar")),
+            modified(&from.join("mods/large.jar"))
+        );
+        assert!(
+            fs::metadata(to.join("mods/nested/config.toml"))
+                .unwrap()
+                .permissions()
+                .readonly()
+        );
+        assert_eq!(progress, 2 * (large.len() as u64 + 7));
+        assert!(fs::read_dir(to.join("mods")).unwrap().all(|entry| {
+            !entry
+                .unwrap()
+                .file_name()
+                .to_string_lossy()
+                .ends_with(".tmp")
+        }));
+    }
+
+    #[cfg(unix)]
+    #[tokio::test]
+    async fn second_run_skips_copied_files() {
+        use std::os::unix::fs::MetadataExt;
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        fs::create_dir_all(&from).unwrap();
+        fs::write(from.join("file.bin"), b"contents").unwrap();
+        copy_tree(&from, &to).await.unwrap();
+        let inode = fs::metadata(to.join("file.bin")).unwrap().ino();
+
+        resume_tree(&from, &to).await.unwrap();
+
+        assert_eq!(fs::metadata(to.join("file.bin")).unwrap().ino(), inode);
+    }
+
+    #[tokio::test]
+    async fn recopies_damaged_copy() {
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        fs::create_dir_all(&from).unwrap();
+        fs::write(from.join("file.bin"), b"original contents").unwrap();
+        copy_tree(&from, &to).await.unwrap();
+        fs::write(to.join("file.bin"), b"damaged").unwrap();
+        fs::File::options()
+            .write(true)
+            .open(to.join("file.bin"))
+            .unwrap()
+            .set_modified(modified(&from.join("file.bin")))
+            .unwrap();
+
+        resume_tree(&from, &to).await.unwrap();
+
+        assert_eq!(
+            fs::read(to.join("file.bin")).unwrap(),
+            b"original contents"
+        );
+    }
+
+    #[tokio::test]
+    async fn refuses_to_overwrite_existing_file_with_same_mtime() {
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        fs::create_dir_all(&from).unwrap();
+        fs::create_dir_all(&to).unwrap();
+        fs::write(from.join("file.bin"), b"source").unwrap();
+        fs::write(to.join("file.bin"), b"someone else's data").unwrap();
+        fs::File::options()
+            .write(true)
+            .open(to.join("file.bin"))
+            .unwrap()
+            .set_modified(modified(&from.join("file.bin")))
+            .unwrap();
+
+        assert!(copy_tree(&from, &to).await.is_err());
+        assert_eq!(
+            fs::read(to.join("file.bin")).unwrap(),
+            b"someone else's data"
+        );
+    }
+
+    #[tokio::test]
+    async fn refuses_to_overwrite_different_file() {
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        fs::create_dir_all(&from).unwrap();
+        fs::create_dir_all(&to).unwrap();
+        fs::write(from.join("file.bin"), b"source").unwrap();
+        fs::write(to.join("file.bin"), b"someone else's data").unwrap();
+
+        assert!(copy_tree(&from, &to).await.is_err());
+        assert_eq!(
+            fs::read(to.join("file.bin")).unwrap(),
+            b"someone else's data"
+        );
+    }
+
+    #[tokio::test]
+    async fn accepts_identical_existing_file() {
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        fs::create_dir_all(&from).unwrap();
+        fs::create_dir_all(&to).unwrap();
+        fs::write(from.join("file.bin"), b"same").unwrap();
+        fs::write(to.join("file.bin"), b"same").unwrap();
+
+        copy_tree(&from, &to).await.unwrap();
+
+        assert_eq!(fs::read(to.join("file.bin")).unwrap(), b"same");
+    }
+
+    #[cfg(unix)]
+    #[tokio::test]
+    async fn remaps_links_into_the_new_directory() {
+        let root = tempfile::tempdir().unwrap();
+        let from = root.path().join("from");
+        let to = root.path().join("to");
+        fs::create_dir_all(from.join("store")).unwrap();
+        fs::write(from.join("store/blob"), b"blob").unwrap();
+        std::os::unix::fs::symlink(from.join("store/blob"), from.join("link"))
+            .unwrap();
+
+        copy_tree(&from, &to).await.unwrap();
+
+        assert!(fs::read_link(to.join("link")).unwrap().is_relative());
+        assert_eq!(
+            fs::canonicalize(to.join("link")).unwrap(),
+            fs::canonicalize(to.join("store/blob")).unwrap()
+        );
+    }
+}
diff --git a/packages/app-lib/src/state/dirs/move_app_directory/managed_content.rs b/packages/app-lib/src/state/dirs/move_app_directory/managed_content.rs
index 45993f6e1ba..6b0fd199e80 100644
--- a/packages/app-lib/src/state/dirs/move_app_directory/managed_content.rs
+++ b/packages/app-lib/src/state/dirs/move_app_directory/managed_content.rs
@@ -1,11 +1,8 @@
 use crate::ErrorKind;
 use crate::state::content_store;
 use crate::state::content_store::{
-    FileStorageKind, content_file_path, hash_file, sync_directory,
-    validate_instance_path, validate_relative,
-};
-use crate::state::content_store::{
-    remove_instance_file, validate_parent_directories, writable_copy,
+    FileStorageKind, content_file_path, validate_instance_path,
+    validate_parent_directories, validate_relative,
 };
 use crate::state::instances::adapters::sqlite::{content_rows, instance_rows};
 use anyhow::bail;
@@ -81,12 +78,13 @@ pub(super) async fn prepare(
     Ok(moves)
 }
 
-pub(super) async fn copy_and_checkpoint(
+pub(super) async fn checkpoint(
     pool: &SqlitePool,
     files: Vec<ManagedContentMove>,
     from: &Path,
     to: &Path,
-) -> crate::Result<()> {
+) -> crate::Result<Vec<(PathBuf, PathBuf, u64)>> {
+    let mut copies = Vec::new();
     let mut bindings = Vec::new();
     for mut file in files {
         validate_parent_directories(from, &file.source).await?;
@@ -105,61 +103,21 @@ pub(super) async fn copy_and_checkpoint(
                     .to_string(),
             ));
         }
-        let hashes = hash_file(&file.source).await?;
         let parent = file.destination.parent().ok_or(ErrorKind::InputError(
             "invalid content destination".to_string(),
         ))?;
         fs::create_dir_all(parent).await?;
-        let temporary =
-            parent.join(format!(".modrinth-move-{}.tmp", uuid::Uuid::new_v4()));
-        let result = async {
-            super::ensure_move_space(parent, hashes.size)?;
-            writable_copy(&file.source, &temporary).await?;
-            if hash_file(&temporary).await? != hashes
-                || hash_file(&file.source).await? != hashes
-            {
-                bail!(ErrorKind::InputError(
-                    "content changed during the app-directory move".to_string(),
-                ));
-            }
-            fs::File::options()
-                .write(true)
-                .open(&temporary)
-                .await?
-                .sync_all()
-                .await?;
-            match fs::symlink_metadata(&file.destination).await {
-                Ok(metadata) => {
-                    if !metadata.is_file()
-                        || hash_file(&file.destination).await? != hashes
-                    {
-                        bail!(ErrorKind::InputError(
-                            "the content destination contains different data"
-                                .to_string(),
-                        ));
-                    }
-                    remove_instance_file(&file.destination).await?;
-                }
-                Err(error) if error.kind() == std::io::ErrorKind::NotFound => {}
-                Err(error) => return Err(error.into()),
-            }
-            fs::rename(&temporary, &file.destination).await?;
-            sync_directory(parent).await?;
-            Ok(FileStorageKind::Copy)
-        }
-        .await;
-        if result.is_err() && fs::symlink_metadata(&temporary).await.is_ok() {
-            let _ = remove_instance_file(&temporary).await;
-        }
-        file.binding.storage_kind = result?;
+        file.binding.storage_kind = FileStorageKind::Copy;
         bindings.push(file.binding);
+        copies.push((file.source, file.destination, metadata.len()));
     }
     content_store::set_setting(
         pool,
         CHECKPOINT_KEY,
         &serde_json::to_string(&bindings)?,
     )
-    .await
+    .await?;
+    Ok(copies)
 }
 
 /// Records how files are stored on the destination filesystem after the app switches to it.
diff --git a/packages/ui/src/utils/use-anchored-teleport.ts b/packages/ui/src/utils/use-anchored-teleport.ts
index 1e85e783146..27f9b42ab4a 100644
--- a/packages/ui/src/utils/use-anchored-teleport.ts
+++ b/packages/ui/src/utils/use-anchored-teleport.ts
@@ -203,7 +203,15 @@ export function useAnchoredTeleport(
 		if (!isOpen.value) return
 		isOpen.value = false
 		removeListeners()
-		if (restoreFocus) nextTick(() => triggerElement()?.focus())
+		if (!restoreFocus) return
+		const closingPanel = panel.value
+		nextTick(() => {
+			const element = triggerElement()
+			if (!element) return
+			const active = element.ownerDocument.activeElement
+			if (active && active !== element.ownerDocument.body && !closingPanel?.contains(active)) return
+			element.focus()
+		})
 	}
 
 	watch([placement, distance, alignOffset, trigger], updatePosition)
diff --git a/scripts/collect-changelog.ts b/scripts/collect-changelog.ts
index e572018f514..9fc40a88699 100644
--- a/scripts/collect-changelog.ts
+++ b/scripts/collect-changelog.ts
@@ -99,6 +99,22 @@ async function getParser() {
 	return mod.parser
 }
 
+function indentSubBulletsWithTabs(markdown: string): string {
+	const lines = markdown.split(/\r?\n/)
+	const subBullet = /^([ \t]+)(?=[-*] )/
+	const spaceWidths = lines.flatMap((line) => line.match(/^( +)[-*] /)?.[1].length ?? [])
+	const unit = spaceWidths.length > 0 ? Math.min(...spaceWidths) : 2
+	return lines
+		.map((line) =>
+			line.replace(subBullet, (indent) => {
+				const tabs = indent.split('\t').length - 1
+				const spaces = indent.length - tabs
+				return '  ' + '\t'.repeat(tabs + Math.floor(spaces / unit))
+			}),
+		)
+		.join('\n')
+}
+
 function parseChangelogComment(body: string, parse: Function): ParsedChangelog | null {
 	if (!body.includes(CHANGELOG_MARKER)) return null
 
@@ -115,7 +131,7 @@ function parseChangelogComment(body: string, parse: Function): ParsedChangelog |
 		const firstSection = content.search(/^### /m)
 		if (firstSection === -1) continue
 
-		const changelogMd = `# Changelog\n\n## [Unreleased]\n${content.slice(firstSection)}`
+		const changelogMd = `# Changelog\n\n## [Unreleased]\n${indentSubBulletsWithTabs(content.slice(firstSection))}`
 
 		let changelog
 		try {
@@ -131,7 +147,10 @@ function parseChangelogComment(body: string, parse: Function): ParsedChangelog |
 		for (const type of SECTION_ORDER) {
 			const changes = unreleased.changes.get(type)
 			if (changes && changes.length > 0) {
-				sections.set(type, changes.map((c: { title: string }) => c.title))
+				sections.set(
+					type,
+					changes.map((c: { title: string }) => c.title),
+				)
 			}
 		}
 
@@ -146,10 +165,7 @@ function parseChangelogComment(body: string, parse: Function): ParsedChangelog |
 }
 
 function linkifyIssues(text: string): string {
-	return text.replace(
-		/\[#(\d+)\]/g,
-		'[#$1](https://github.com/modrinth/code/issues/$1)',
-	)
+	return text.replace(/\[#(\d+)\]/g, '[#$1](https://github.com/modrinth/code/issues/$1)')
 }
 
 function buildBody(sections: Map<string, string[]>): string {
@@ -183,7 +199,11 @@ function mergeSections(
 	return merged
 }
 
-async function githubFetch(endpoint: string, token: string, options?: RequestInit): Promise<Response> {
+async function githubFetch(
+	endpoint: string,
+	token: string,
+	options?: RequestInit,
+): Promise<Response> {
 	const url = endpoint.startsWith('http') ? endpoint : `${GITHUB_API}${endpoint}`
 	return fetch(url, {
 		...options,
@@ -249,10 +269,7 @@ function getLatestAppRelease(): AppRelease {
 }
 
 async function fetchBotComment(token: string, prNumber: number): Promise<CommentInfo | null> {
-	const res = await githubFetch(
-		`/repos/${REPO}/issues/${prNumber}/comments?per_page=100`,
-		token,
-	)
+	const res = await githubFetch(`/repos/${REPO}/issues/${prNumber}/comments?per_page=100`, token)
 
 	if (!res.ok) return null
 
@@ -263,8 +280,13 @@ async function fetchBotComment(token: string, prNumber: number): Promise<Comment
 	return { id: comment.id, body: comment.body }
 }
 
-async function markCommentBaked(token: string, commentId: number, currentBody: string): Promise<void> {
-	const admonition = '> [!NOTE]\n> This changelog has been baked. Any further edits will not be reflected.\n\n'
+async function markCommentBaked(
+	token: string,
+	commentId: number,
+	currentBody: string,
+): Promise<void> {
+	const admonition =
+		'> [!NOTE]\n> This changelog has been baked. Any further edits will not be reflected.\n\n'
 	const newBody = admonition + currentBody
 
 	await githubFetch(`/repos/${REPO}/issues/comments/${commentId}`, token, {
@@ -314,7 +336,11 @@ async function main() {
 		try {
 			token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
 		} catch {
-			console.error(chalk.red('GITHUB_TOKEN not set and `gh auth token` failed. Run `gh auth login` or set GITHUB_TOKEN.'))
+			console.error(
+				chalk.red(
+					'GITHUB_TOKEN not set and `gh auth token` failed. Run `gh auth login` or set GITHUB_TOKEN.',
+				),
+			)
 			process.exit(1)
 		}
 	}