From 4a9db0de0ac44963aef72d56a1733d3d1905414b Mon Sep 17 00:00:00 2001
From: Mike <mike@payfrit.com>
Date: Fri, 27 Mar 2026 01:35:09 +0000
Subject: [PATCH] Fix deploy webhook: auto-recover from broken .git directory

If git pull fails (corrupted .git), automatically remove the broken
.git dir and re-clone. This prevents the chicken-and-egg problem
where a broken repo state makes the deploy webhook permanently stuck.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 _webhook/deploy.php | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/_webhook/deploy.php b/_webhook/deploy.php
index df2b532..74f234c 100644
--- a/_webhook/deploy.php
+++ b/_webhook/deploy.php
@@ -10,18 +10,47 @@ if ($headerSecret !== $secret) {
     exit;
 }
 
-// Run git pull directly
+// Deploy: clone if needed, otherwise pull (with auto-recovery)
 $repoPath = dirname(__DIR__);
+$repoUrl = 'https://payfrit:Noorani%401234@git.payfrit.com/payfrit/payfrit-api.git';
 $output = [];
 $exitCode = 0;
-exec("cd " . escapeshellarg($repoPath) . " && git pull origin main 2>&1", $output, $exitCode);
+$method = 'unknown';
 
-// Also write trigger file for backward compatibility
+if (is_dir($repoPath . '/.git')) {
+    // Try pull first
+    $method = 'pull';
+    exec("cd " . escapeshellarg($repoPath) . " && git pull origin main 2>&1", $output, $exitCode);
+
+    // If pull fails, nuke the broken .git and re-clone
+    if ($exitCode !== 0) {
+        $method = 'recovery-clone';
+        $output[] = '--- pull failed, attempting recovery clone ---';
+        exec("rm -rf " . escapeshellarg($repoPath . '/.git') . " 2>&1");
+        // Fall through to clone logic below
+    }
+}
+
+if (!is_dir($repoPath . '/.git')) {
+    // Fresh clone into temp dir, then copy into web root
+    $method = ($method === 'recovery-clone') ? 'recovery-clone' : 'fresh-clone';
+    $tmpDir = '/tmp/payfrit-api-clone-' . time();
+    $cloneOutput = [];
+    exec("git clone --branch main " . escapeshellarg($repoUrl) . " " . escapeshellarg($tmpDir) . " 2>&1", $cloneOutput, $exitCode);
+    $output = array_merge($output, $cloneOutput);
+    if ($exitCode === 0) {
+        exec("cp -a " . escapeshellarg($tmpDir) . "/. " . escapeshellarg($repoPath) . "/ 2>&1", $output, $exitCode);
+        exec("rm -rf " . escapeshellarg($tmpDir) . " 2>&1");
+    }
+}
+
+// Write trigger file for backward compatibility
 $triggerFile = '/tmp/deploy-payfrit-api.trigger';
 file_put_contents($triggerFile, date('Y-m-d H:i:s'));
 
 echo json_encode([
     'OK' => $exitCode === 0,
+    'METHOD' => $method,
     'MESSAGE' => $exitCode === 0 ? 'Deploy successful' : 'Deploy failed',
     'OUTPUT' => implode("\n", $output),
     'TIME' => date('c')