From ddf534e72b9b7106afbe8439678ec946afe5328c Mon Sep 17 00:00:00 2001
From: Victor Giers <giers@macbookpro.speedport.ip>
Date: Mon, 8 Dec 2025 14:11:15 +0100
Subject: [PATCH] auto-git:  [change] main.js

---
 main.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/main.js b/main.js
index 61d80ef..279ed45 100755
--- a/main.js
+++ b/main.js
@@ -1274,6 +1274,22 @@ async function runLLMCommitRewrite(folderObj, win) {
   } catch (err) {
     error = err;
     console.error('[runLLMCommitRewrite] Rewrite failed:', err);
+    // Fallback: use existing commit messages so queue clears and flow continues
+    try {
+      const git = simpleGit(folderPath);
+      const messageMap = {};
+      for (const h of hashes) {
+        const msg = (await git.show(['-s', '--format=%B', h])).trim();
+        messageMap[h] = msg || 'auto-git';
+      }
+      await rewordCommitsSequentially(folderPath, messageMap, hashes);
+      debug(`[runLLMCommitRewrite] Fallback reword using existing messages for ${folderPath}`);
+      error = null; // treat as handled
+      win.webContents.send('repo-updated', folderPath);
+    } catch (fallbackErr) {
+      error = fallbackErr;
+      console.error('[runLLMCommitRewrite] Fallback rewrite failed:', fallbackErr);
+    }
   } finally {
     // Refresh state in case it changed during the rewrite
     folders = store.get('folders') || [];