Fix server deletion cleanup and allow failed cleanup to resume

src/routes/api/deployments/[id]/resume/+server.ts

@@ -1,9 +1,9 @@
 import { json } from '@sveltejs/kit';
-import { resumeVerification } from '$lib/server/fleet/deployments.js';
+import { resumeVerification, resumeCleanup } from '$lib/server/fleet/deployments.js';
 import { kick } from '$lib/server/pipeline/worker.js';
 
 export function POST({ params }: { params: { id: string } }) {
-    if (!resumeVerification(params.id)) return json({ error: 'This operation cannot resume verification. Refresh and inspect its server.' }, { status: 409 });
+    if (!resumeVerification(params.id) && !resumeCleanup(params.id)) return json({ error: 'This operation cannot resume. Refresh and inspect its server.' }, { status: 409 });
     void kick().catch(err => console.error('[deployment] verification kick failed:', err));
     return json({ ok: true }, { status: 202 });
 }

src/routes/deployments/[id]/+page.svelte

@@ -14,7 +14,7 @@
         stage: string; started_at: string; finished_at: string | null;
         triggered_by: string; error: string | null; warnings: string; server_exists: number;
     }
-    interface Detail { deployment: Deployment; events: { id: number; created_at: string; message: string }[]; recipe: LaunchRecipeSummary | null; blueprintName: string | null; canResumeVerification: boolean; collection: { id: string; name: string } | null }
+    interface Detail { deployment: Deployment; events: { id: number; created_at: string; message: string }[]; recipe: LaunchRecipeSummary | null; blueprintName: string | null; canResumeVerification: boolean; canResumeCleanup: boolean; collection: { id: string; name: string } | null }
     let detail = $state<Detail | null>(null);
     let error = $state('');
     let refreshing = false;
@@ -34,13 +34,15 @@
         const stages = deployment.action === 'destroy'
             ? ['Starting', 'Waiting', 'Stopping and removing container', 'Deleting Komodo deployment', 'Removing server files and registry']
             : ['Starting', 'Preparing server files', 'Creating Komodo deployment', 'Starting container', 'Waiting for Komodo health', 'Waiting for RCON health', 'Waiting for selected map'];
-        if (deployment.state === 'waiting') return 1;
+        if (deployment.state === 'waiting' && deployment.stage !== 'Removing server files and registry') return 1;
         if (deployment.state === 'awaiting-health' && deployment.stage.startsWith('Waiting for health verification')) return 4;
         if (deployment.state === 'done' || deployment.state === 'warning') return stages.length;
         return Math.max(0, stages.findIndex(stage => deployment.stage.startsWith(stage)));
     });
     let explanation = $derived.by(() => {
         if (!deployment) return '';
+        if (detail?.canResumeCleanup) return 'Komodo deletion succeeded. Resume the remaining file and database cleanup; the removed container does not need to answer RCON.';
+        if (deployment.state === 'waiting' && deployment.stage === 'Removing server files and registry') return 'Local cleanup is queued. Komodo deletion has already succeeded.';
         if (deployment.state === 'done') return deployment.action === 'create'
             ? 'The container is healthy, RCON responds, and the reported engine map matches your selection.'
             : 'The container, deployment, and server registration have been removed.';
@@ -68,7 +70,7 @@
         try {
             const res = await fetch(`/api/deployments/${encodeURIComponent(deployment.id)}/resume`, { method: 'POST' });
             const body = await res.json();
-            if (!res.ok) throw new Error(body.error ?? 'Could not resume verification.');
+            if (!res.ok) throw new Error(body.error ?? 'Could not resume the operation.');
             await load();
         } catch (err) { error = (err as Error).message; }
         finally { resuming = false; }
@@ -112,6 +114,7 @@
             <p class="explanation" aria-live="polite">{explanation}</p>
             <div class="timing"><span>Total time <strong>{duration(deployment.started_at, deployment.finished_at ? new Date(deployment.finished_at).getTime() : now)}</strong></span>{#if active && stageStarted}<span>This step <strong>{duration(stageStarted, now)}</strong></span>{/if}</div>
             {#if detail?.canResumeVerification}<div><Button disabled={resuming} loading={resuming} onclick={resume}>Resume health verification</Button></div>{/if}
+            {#if detail?.canResumeCleanup}<div><Button disabled={resuming} loading={resuming} onclick={resume}>Resume cleanup</Button></div>{/if}
             {#if deployment.error}<p role="alert" class="error">{deployment.error}</p>{/if}
             {#each warnings as warning}<p class="warning">{warning}</p>{/each}
             {#if deployment.expected_map}<p>Expected map: <strong>{deployment.expected_map}</strong></p>{/if}