fix: harden upload resilience and contracts

app/api/upload/git/route.ts

@@ -6,12 +6,26 @@ import { classifyFileChanges } from '@/lib/diff-files'
 import { getModelFolderPath } from '@/lib/model-paths'
 import { cleanupStagingUpload, ensurePreparedStagingAssets, readStagedManifest } from '@/lib/upload-staging'
 import { acquireUploadLock, releaseUploadLock } from '@/lib/upload-lock'
-import { parseStagingRequestBody } from '@/lib/upload-request'
+import {
+  readStagingRequestBody,
+  uploadErrorMessageResponse,
+  uploadErrorResponse,
+  uploadLockConflictResponse,
+} from '@/lib/upload-request'
 import { getErrorMessage } from '@/lib/guards'
 
 export const runtime = 'nodejs'
 export const dynamic = 'force-dynamic'
 
+async function cleanupCompletedStagingUpload(stagingId: string) {
+  await cleanupStagingUpload(stagingId).catch((err) => {
+    console.warn('[WARN] Git upload -> staging cleanup failed', {
+      stagingId,
+      error: getErrorMessage(err),
+    })
+  })
+}
+
 /**
  * POST /api/upload/git
  * Upload prepared files and push to GitHub via Octokit.
@@ -24,20 +38,15 @@ export async function POST(req: NextRequest) {
   let stagingId: string
 
   try {
-    const body: unknown = await req.json()
-    stagingId = parseStagingRequestBody(body).stagingId
+    stagingId = (await readStagingRequestBody(req)).stagingId
     const manifest = await readStagedManifest(stagingId)
     folderName = manifest.folderName
   } catch (err) {
-    const message = getErrorMessage(err)
-    return NextResponse.json({ success: false, error: message }, { status: 400 })
+    return uploadErrorResponse(err, 400)
   }
 
   if (!acquireUploadLock(folderName)) {
-    return NextResponse.json(
-      { success: false, error: 'Un upload est deja en cours pour ce dossier. Patientez quelques secondes.' },
-      { status: 409 },
-    )
+    return uploadLockConflictResponse()
   }
 
   try {
@@ -45,6 +54,7 @@ export async function POST(req: NextRequest) {
       filesToPush,
       modelFilename,
       compressed,
+      deliveryMode,
       compressionError,
       assetSummaries,
     } = await ensurePreparedStagingAssets(stagingId)
@@ -59,12 +69,13 @@ export async function POST(req: NextRequest) {
       classifyFileChanges(filesToPush, remoteFileMap, folderPath)
 
     if (changedFilesToPush.length === 0 && deletePaths.length === 0) {
-      await cleanupStagingUpload(stagingId).catch(() => {})
+      await cleanupCompletedStagingUpload(stagingId)
       return NextResponse.json({
         success: true,
         folderName,
         filesCount: 0,
         compressed,
+        deliveryMode,
         compressionError: compressionError || undefined,
         message: 'Aucun fichier modifie — rien a envoyer.',
       })
@@ -79,26 +90,22 @@ export async function POST(req: NextRequest) {
       deletedFileNames,
     )
 
-    try {
-      const { commitUrl } = await pushAllToGitHub(changedFilesToPush, deletePaths, commitMessage)
-      await cleanupStagingUpload(stagingId).catch(() => {})
+    const { commitUrl } = await pushAllToGitHub(changedFilesToPush, deletePaths, commitMessage)
+    await cleanupCompletedStagingUpload(stagingId)
 
-      return NextResponse.json({
-        success: true,
-        folderName,
-        filesCount: changedFilesToPush.length,
-        compressed,
-        compressionError: compressionError || undefined,
-        message: `${changedFilesToPush.length} fichier(s) modifie(s) envoye(s) sur GitHub en un seul commit.`,
-        commitUrl,
-      })
-    } catch (err) {
-      const message = getErrorMessage(err, 'Erreur GitHub inconnue')
-      return NextResponse.json(
-        { success: false, error: `Push GitHub echoue: ${message}` },
-        { status: 500 },
-      )
-    }
+    return NextResponse.json({
+      success: true,
+      folderName,
+      filesCount: changedFilesToPush.length,
+      compressed,
+      deliveryMode,
+      compressionError: compressionError || undefined,
+      message: `${changedFilesToPush.length} fichier(s) modifie(s) envoye(s) sur GitHub en un seul commit.`,
+      commitUrl,
+    })
+  } catch (err) {
+    const message = getErrorMessage(err, 'Erreur GitHub inconnue')
+    return uploadErrorMessageResponse(`Upload GitHub echoue: ${message}`, 500)
   } finally {
     releaseUploadLock(folderName)
   }