From a47d309103c91de1dd603c425dc40be5b38fd875 Mon Sep 17 00:00:00 2001
From: Disy <disymayufei@yeah.net>
Date: Sat, 19 Sep 2026 00:13:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E5=8C=85=E5=A4=B1=E8=B4=A5=E5=90=8E=E7=9A=84=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/instance/HostedModpacks.vue    |  11 +-
 .../browse/install-job-notifications.ts       |   3 +-
 .../src/composables/useHostedCreation.ts      |  27 +++-
 .../src/composables/useHostedSync.ts          |  55 ++++++--
 .../src/helpers/hosted-install-retry.test.ts  | 124 ++++++++++++++++++
 .../src/helpers/hosted-install-retry.ts       |  34 +++++
 apps/app-frontend/src/pages/Downloads.vue     |   3 +-
 .../src/providers/download-manager.ts         |  41 +++++-
 8 files changed, 266 insertions(+), 32 deletions(-)
 create mode 100644 apps/app-frontend/src/helpers/hosted-install-retry.test.ts
 create mode 100644 apps/app-frontend/src/helpers/hosted-install-retry.ts

diff --git a/apps/app-frontend/src/components/instance/HostedModpacks.vue b/apps/app-frontend/src/components/instance/HostedModpacks.vue
index 46ef409..5fa106d 100644
--- a/apps/app-frontend/src/components/instance/HostedModpacks.vue
+++ b/apps/app-frontend/src/components/instance/HostedModpacks.vue
@@ -83,20 +83,20 @@
 <script setup lang="ts">
 import { ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
 import { computed, inject, ref, watch } from 'vue'
-import { useHostedSync } from '@/composables/useHostedSync'
-import { injectDownloadManager } from '@/providers/download-manager'
 import { useRouter } from 'vue-router'
 
-import InstanceModeSettings from '@/components/instance/InstanceModeSettings.vue'
 import HostedPackProgress from '@/components/instance/HostedPackProgress.vue'
+import InstanceModeSettings from '@/components/instance/InstanceModeSettings.vue'
+import { markHostedCreationCompleted } from '@/composables/useHostedCreation'
+import { useHostedSync } from '@/composables/useHostedSync'
 import { useInstanceMode } from '@/composables/useInstanceMode'
-
 import {
 	type HostedBinding,
 	hostedBinding,
 	hostedDefault,
 	type HostedPublication,
 } from '@/helpers/hosted-packs'
+import { injectDownloadManager } from '@/providers/download-manager'
 const props = defineProps<{ instanceId: string }>()
 const modeQuery = useInstanceMode(() => props.instanceId)
 const router = useRouter()
@@ -186,7 +186,8 @@ async function load() {
 async function sync() {
 	if (syncing.value || !ready.value || modeQuery.data.value !== 'starlight') return
 	loadError.value = ''
-	await task.sync()
+	const result = await task.sync()
+	if (result) markHostedCreationCompleted(props.instanceId)
 }
 watch(syncing, (busy, wasBusy) => {
 	if (!busy && wasBusy) void load()
diff --git a/apps/app-frontend/src/composables/browse/install-job-notifications.ts b/apps/app-frontend/src/composables/browse/install-job-notifications.ts
index 74a6643..6b4353b 100644
--- a/apps/app-frontend/src/composables/browse/install-job-notifications.ts
+++ b/apps/app-frontend/src/composables/browse/install-job-notifications.ts
@@ -13,7 +13,6 @@ import type { Router } from 'vue-router'
 import {
 	install_job_dismiss,
 	install_job_repair_cache_and_retry,
-	install_job_retry,
 	install_job_support_details,
 	installJobInstanceId,
 	type InstallJobSnapshot,
@@ -674,7 +673,7 @@ export async function useInstallJobNotifications(opts: {
 				action: async () => {
 					if (repairingJobIds.value.has(job.job_id)) return
 					if (!requiresCacheRepair) {
-						await install_job_retry(job.job_id).catch(opts.handleError)
+						await opts.manager.retry(job.job_id).catch(opts.handleError)
 						await refresh()
 						return
 					}
diff --git a/apps/app-frontend/src/composables/useHostedCreation.ts b/apps/app-frontend/src/composables/useHostedCreation.ts
index df2534e..b98158d 100644
--- a/apps/app-frontend/src/composables/useHostedCreation.ts
+++ b/apps/app-frontend/src/composables/useHostedCreation.ts
@@ -1,6 +1,8 @@
-import { ref } from 'vue'
 import { invoke } from '@tauri-apps/api/core'
-import { hostedCreate, hostedSync } from '../helpers/hosted-packs.ts'
+import { ref } from 'vue'
+
+import { hostedCreate } from '../helpers/hosted-packs.ts'
+import { runHostedSync } from './useHostedSync.ts'
 
 const installing = ref(false)
 const installError = ref('')
@@ -16,6 +18,18 @@ export function forgetHostedCreation(instanceId: string) {
 	installError.value = ''
 }
 
+export function markHostedCreationCompleted(instanceId: string) {
+	if (createdInstance.value !== instanceId) return
+	installError.value = ''
+	completed.value = true
+}
+
+export function markHostedCreationFailed(instanceId: string, cause: unknown) {
+	if (createdInstance.value !== instanceId) return
+	completed.value = false
+	installError.value = String(cause)
+}
+
 export function useHostedCreation() {
 	function acknowledge(instanceId: string) {
 		if (completed.value && createdInstance.value === instanceId) {
@@ -42,12 +56,15 @@ export function useHostedCreation() {
 			if (completed.value) return createdInstance.value
 			createdInstance.value ??= await hostedCreate(gameDirRoot)
 			const instanceId = createdInstance.value
-			await hostedSync(instanceId)
+			await runHostedSync(instanceId)
 			if (attempt !== generation) return
-			completed.value = true
+			markHostedCreationCompleted(instanceId)
 			return instanceId
 		} catch (cause) {
-			if (attempt === generation) installError.value = String(cause)
+			if (attempt === generation) {
+				if (createdInstance.value) markHostedCreationFailed(createdInstance.value, cause)
+				else installError.value = String(cause)
+			}
 		} finally {
 			installing.value = false
 		}
diff --git a/apps/app-frontend/src/composables/useHostedSync.ts b/apps/app-frontend/src/composables/useHostedSync.ts
index 46fcbe3..b89b413 100644
--- a/apps/app-frontend/src/composables/useHostedSync.ts
+++ b/apps/app-frontend/src/composables/useHostedSync.ts
@@ -1,30 +1,59 @@
 import { computed, reactive } from 'vue'
+
 import { hostedSync, type HostedSyncResult } from '../helpers/hosted-packs.ts'
 
 const tasks = reactive(
 	new Map<string, { busy: boolean; result: HostedSyncResult | null; error: string }>(),
 )
+const inFlight = new Map<string, Promise<HostedSyncResult>>()
+
+function getTask(instanceId: string) {
+	if (!tasks.has(instanceId)) tasks.set(instanceId, { busy: false, result: null, error: '' })
+	return tasks.get(instanceId)!
+}
+
+/**
+ * Run one authoritative StarLight synchronization per instance. Every retry
+ * surface uses this function so the full pack transaction, its progress and
+ * its final result cannot diverge between pages.
+ */
+export function runHostedSync(instanceId: string): Promise<HostedSyncResult> {
+	const existing = inFlight.get(instanceId)
+	if (existing) return existing
+
+	const current = getTask(instanceId)
+	current.busy = true
+	current.error = ''
+	current.result = null
+	const request = hostedSync(instanceId)
+		.then((result) => {
+			current.result = result
+			return result
+		})
+		.catch((error) => {
+			current.error = String(error)
+			throw error
+		})
+		.finally(() => {
+			current.busy = false
+			inFlight.delete(instanceId)
+		})
+	inFlight.set(instanceId, request)
+	return request
+}
 
 export function useHostedSync(instanceId: () => string) {
 	const task = computed(() => {
-		const id = instanceId()
-		if (!tasks.has(id)) tasks.set(id, { busy: false, result: null, error: '' })
-		return tasks.get(id)!
+		return getTask(instanceId())
 	})
 
 	async function sync() {
 		const id = instanceId()
-		const current = task.value
-		if (current.busy) return
-		current.busy = true
-		current.error = ''
-		current.result = null
+		if (task.value.busy) return undefined
 		try {
-			current.result = await hostedSync(id)
-		} catch (error) {
-			current.error = String(error)
-		} finally {
-			current.busy = false
+			return await runHostedSync(id)
+		} catch {
+			return undefined
 		}
 	}
 
diff --git a/apps/app-frontend/src/helpers/hosted-install-retry.test.ts b/apps/app-frontend/src/helpers/hosted-install-retry.test.ts
new file mode 100644
index 0000000..67e6343
--- /dev/null
+++ b/apps/app-frontend/src/helpers/hosted-install-retry.test.ts
@@ -0,0 +1,124 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import {
+	hostedRetryRoute,
+	hostedRuntimeRetryInstanceId,
+	retryInstallJob,
+} from './hosted-install-retry.ts'
+import type { InstallJobSnapshot } from './install.ts'
+
+function job(overrides: Partial<InstallJobSnapshot> = {}): InstallJobSnapshot {
+	return {
+		job_id: 'job',
+		instance_id: 'local:instance',
+		source_instance_id: null,
+		instance_deleted: false,
+		kind: 'install_existing_instance',
+		status: 'failed',
+		execution_mode: 'normal',
+		provider: 'minecraft',
+		target: { type: 'existing_instance', instance_id: 'local:instance' },
+		phase: 'downloading_minecraft',
+		progress: null,
+		details: { type: 'empty' },
+		parallel: null,
+		display: null,
+		error: null,
+		rollback_error: null,
+		pause_reason: null,
+		upgrade_result: null,
+		created: '2026-09-18T00:00:00Z',
+		modified: '2026-09-18T00:00:00Z',
+		finished: '2026-09-18T00:00:01Z',
+		summary: {
+			files_completed: 0,
+			files_total: null,
+			bytes_downloaded: 0,
+			bytes_total: null,
+			speed_bytes_per_second: null,
+			eta_seconds: null,
+			source: null,
+			fallback_count: 0,
+		},
+		items: [],
+		...overrides,
+	}
+}
+
+test('StarLight runtime retries keep the existing instance identity', () => {
+	assert.equal(hostedRuntimeRetryInstanceId(job()), 'local:instance')
+	assert.equal(
+		hostedRuntimeRetryInstanceId(
+			job({ instance_id: null, target: { type: 'existing_instance', instance_id: 'target' } }),
+		),
+		'target',
+	)
+})
+
+test('deleted and unrelated install jobs do not enter the StarLight runtime retry path', () => {
+	assert.equal(hostedRuntimeRetryInstanceId(job({ instance_deleted: true })), null)
+	assert.equal(hostedRuntimeRetryInstanceId(job({ kind: 'create_instance' })), null)
+})
+
+test('the hosted retry link targets the current instance content route', () => {
+	assert.equal(
+		hostedRetryRoute('local:instance/with space'),
+		'/instance/local%3Ainstance%2Fwith%20space',
+	)
+	assert.doesNotMatch(hostedRetryRoute('local:instance'), /\/mods$/)
+})
+
+test('a StarLight runtime failure retries the complete hosted transaction only', async () => {
+	const calls: string[] = []
+	const result = await retryInstallJob(job(), {
+		getInstanceMode: async (instanceId) => {
+			calls.push(`mode:${instanceId}`)
+			return 'starlight'
+		},
+		retryHosted: async (instanceId, sourceJobId) => {
+			calls.push(`hosted:${instanceId}:${sourceJobId}`)
+		},
+		retryGeneric: async (jobId) => {
+			calls.push(`generic:${jobId}`)
+			return job()
+		},
+	})
+	assert.equal(result, null)
+	assert.deepEqual(calls, ['mode:local:instance', 'hosted:local:instance:job'])
+})
+
+test('a Local runtime failure keeps the generic retry path', async () => {
+	const replacement = job({ job_id: 'replacement', status: 'queued' })
+	const calls: string[] = []
+	const result = await retryInstallJob(job(), {
+		getInstanceMode: async () => 'local',
+		retryHosted: async () => {
+			calls.push('hosted')
+		},
+		retryGeneric: async (jobId) => {
+			calls.push(`generic:${jobId}`)
+			return replacement
+		},
+	})
+	assert.equal(result, replacement)
+	assert.deepEqual(calls, ['generic:job'])
+})
+
+test('mode lookup failures never fall back to an incomplete generic retry', async () => {
+	let genericCalls = 0
+	await assert.rejects(
+		retryInstallJob(job(), {
+			getInstanceMode: async () => {
+				throw new Error('instance unavailable')
+			},
+			retryHosted: async () => {},
+			retryGeneric: async () => {
+				genericCalls++
+				return job()
+			},
+		}),
+		/instance unavailable/,
+	)
+	assert.equal(genericCalls, 0)
+})
diff --git a/apps/app-frontend/src/helpers/hosted-install-retry.ts b/apps/app-frontend/src/helpers/hosted-install-retry.ts
new file mode 100644
index 0000000..4f73f0e
--- /dev/null
+++ b/apps/app-frontend/src/helpers/hosted-install-retry.ts
@@ -0,0 +1,34 @@
+import type { InstallJobSnapshot } from './install.ts'
+
+interface InstallRetryDependencies {
+	getInstanceMode: (instanceId: string) => Promise<'starlight' | 'local'>
+	retryHosted: (instanceId: string, sourceJobId: string) => Promise<void>
+	retryGeneric: (jobId: string) => Promise<InstallJobSnapshot>
+}
+
+/**
+ * Minecraft installation jobs started by StarLight synchronization are only
+ * one stage of the full operation. Retrying that stage alone leaves the
+ * pending pack journal unapplied, so these jobs must resume through
+ * `hostedSync` instead of the generic install-job retry command.
+ */
+export function hostedRuntimeRetryInstanceId(job: InstallJobSnapshot): string | null {
+	if (job.kind !== 'install_existing_instance' || job.instance_deleted) return null
+	return job.instance_id ?? job.target.instance_id ?? null
+}
+
+export function hostedRetryRoute(instanceId: string): string {
+	return `/instance/${encodeURIComponent(instanceId)}`
+}
+
+export async function retryInstallJob(
+	job: InstallJobSnapshot,
+	dependencies: InstallRetryDependencies,
+): Promise<InstallJobSnapshot | null> {
+	const instanceId = hostedRuntimeRetryInstanceId(job)
+	if (instanceId && (await dependencies.getInstanceMode(instanceId)) === 'starlight') {
+		await dependencies.retryHosted(instanceId, job.job_id)
+		return null
+	}
+	return dependencies.retryGeneric(job.job_id)
+}
diff --git a/apps/app-frontend/src/pages/Downloads.vue b/apps/app-frontend/src/pages/Downloads.vue
index eab9d59..dd58120 100644
--- a/apps/app-frontend/src/pages/Downloads.vue
+++ b/apps/app-frontend/src/pages/Downloads.vue
@@ -99,7 +99,7 @@
 				/>
 				<RouterLink
 					v-else
-					:to="`/instance/${encodeURIComponent(bar.bar_type?.instance_id ?? '')}/mods`"
+					:to="hostedRetryRoute(bar.bar_type?.instance_id ?? '')"
 					class="mt-3 inline-block text-brand hover:underline"
 				>
 					{{ formatMessage(messages.hostedRetry) }}
@@ -471,6 +471,7 @@ import { useRoute, useRouter } from 'vue-router'
 import MissingModpackContentModal from '@/components/ui/modal/MissingModpackContentModal.vue'
 import { listPendingCurseForgeManualDownloads } from '@/helpers/curseforge'
 import type { CurseForgeManualDownloadItem } from '@/helpers/curseforge-manual'
+import { hostedRetryRoute } from '@/helpers/hosted-install-retry'
 import {
 	download_job_support_details,
 	type InstallJobSnapshot,
diff --git a/apps/app-frontend/src/providers/download-manager.ts b/apps/app-frontend/src/providers/download-manager.ts
index 7513597..9589b70 100644
--- a/apps/app-frontend/src/providers/download-manager.ts
+++ b/apps/app-frontend/src/providers/download-manager.ts
@@ -1,16 +1,22 @@
 import { createContext } from '@modrinth/ui'
 import { computed, type ComputedRef, type Ref, ref } from 'vue'
 
+import {
+	forgetHostedCreation,
+	markHostedCreationCompleted,
+	markHostedCreationFailed,
+} from '@/composables/useHostedCreation'
+import { runHostedSync } from '@/composables/useHostedSync'
 import { setCurseForgeManualDownloads } from '@/helpers/curseforge-manual'
-import { onHostedPackAttemptStarted } from '@/helpers/hosted-packs'
-import { createHostedDownloadFailures } from '@/helpers/hosted-download-failures'
-import { forgetHostedCreation } from '@/composables/useHostedCreation'
 import {
 	download_request_listener,
 	install_job_listener,
-	loading_listener,
 	instance_listener,
+	loading_listener,
 } from '@/helpers/events'
+import { createHostedDownloadFailures } from '@/helpers/hosted-download-failures'
+import { retryInstallJob } from '@/helpers/hosted-install-retry'
+import { getInstanceMode, onHostedPackAttemptStarted } from '@/helpers/hosted-packs'
 import {
 	download_history_clear,
 	download_job_cancel,
@@ -50,6 +56,7 @@ export interface DownloadManager {
 	refresh: () => Promise<void>
 	cancel: (jobId: string) => Promise<void>
 	retry: (jobId: string) => Promise<void>
+	retryHosted: (instanceId: string, sourceJobId?: string) => Promise<void>
 	resume: (jobId: string) => Promise<void>
 	skipMissingContent: (jobId: string) => Promise<void>
 	remove: (jobId: string) => Promise<void>
@@ -376,8 +383,29 @@ export function createDownloadManager(handleError: (error: unknown) => void): Do
 	}
 
 	async function retry(jobId: string) {
-		const job = await download_job_retry(jobId)
-		await reconcileJob(job)
+		const original =
+			jobs.value.find((candidate) => candidate.job_id === jobId) ?? (await download_job_get(jobId))
+		const job = await retryInstallJob(original, {
+			getInstanceMode,
+			retryHosted,
+			retryGeneric: download_job_retry,
+		})
+		if (job) await reconcileJob(job)
+	}
+
+	async function retryHosted(instanceId: string, sourceJobId?: string) {
+		try {
+			await runHostedSync(instanceId)
+		} catch (error) {
+			markHostedCreationFailed(instanceId, error)
+			throw error
+		}
+		markHostedCreationCompleted(instanceId)
+		if (sourceJobId) {
+			await download_job_delete(sourceJobId).catch(handleError)
+			jobs.value = jobs.value.filter((job) => job.job_id !== sourceJobId)
+		}
+		await refresh()
 	}
 
 	async function resume(jobId: string) {
@@ -459,6 +487,7 @@ export function createDownloadManager(handleError: (error: unknown) => void): Do
 		refresh,
 		cancel,
 		retry,
+		retryHosted,
 		resume,
 		skipMissingContent,
 		remove,