Add support for configurable squash update delay and improve squash & restart logic in webhook

Author: DigitallyRefined

README.md

@@ -25,7 +25,7 @@ It provides a unified interface for managing containerized applications, and aut
 - 🌓 **Modern UX**: Automatic light and dark mode (based on system settings)
 - 📊 **Job Tracking**: Monitor update jobs with detailed logs and retry capabilities
 - 🔐 **Security**: Secure SSH connections, webhook signature verification and OIDC authentication
-- 🗜️ **Optional Git Commit Squashing**: Automatically squash multiple dependency update commits to keep Git history clean
+- 🗜️ **Optional Git Commit Squashing**: Automatically squash multiple dependency update commits to keep Git history clean - 15 minutes after last merge (configurable) to prevent PR conflicts
 
 ## Screenshot
 
@@ -39,7 +39,7 @@ The app can be started using the following `compose.yml`:
 services:
   containers-up:
     # https://github.com/DigitallyRefined/containers-up/releases
-    image: ghcr.io/digitallyrefined/containers-up:1.4.2
+    image: ghcr.io/digitallyrefined/containers-up:1.4.3
     restart: unless-stopped
     ports:
       - 3000:3000
@@ -63,7 +63,7 @@ Optional system wide configuration can be changed by copying `.env.default` to `
 services:
   containers-up:
     # https://github.com/DigitallyRefined/containers-up/releases
-    image: ghcr.io/digitallyrefined/containers-up:1.4.2
+    image: ghcr.io/digitallyrefined/containers-up:1.4.3
     restart: unless-stopped
     volumes:
       - ./containers-up/storage:/storage
@@ -286,5 +286,6 @@ All environment variables are _optional_ and can be set in the `compose.yml` fil
 | `CONTAINER_REGISTRY_USERNAME` | Custom container image registry username                                                                                                                                                                                        |                       |
 | `CONTAINER_REGISTRY_TOKEN`    | Custom container image registry token                                                                                                                                                                                           |                       |
 | `SQUASH_UPDATE_MESSAGE`       | Commit message prefix used when squashing dependency update commits (requires squash updates enabled per host)                                                                                                                  | `Update dependencies` |
+| `SQUASH_UPDATE_DELAY_MINUTES` | Minutes to wait before running squash updates; new attempts reset the timer                                                                                                                                                     | `15`                  |
 | `SQUASH_DAYS_AGO`             | Number of days before considering a commit too old to squash with newer dependency updates                                                                                                                                      | `5`                   |
 | `SQUASH_MAX_UPDATE_COMMITS`   | Maximum number of dependency update commits to keep before squashing the oldest two together                                                                                                                                    | `5`                   |

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.13/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.14/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",

bun.lock

@@ -1,7 +1,7 @@
 services:
   containers-up:
     # https://github.com/DigitallyRefined/containers-up/releases
-    image: ghcr.io/digitallyrefined/containers-up:1.4.2
+    image: ghcr.io/digitallyrefined/containers-up:1.4.3
     container_name: containers-up
     restart: unless-stopped
     volumes:

compose.yml

@@ -1,6 +1,6 @@
 {
   "name": "containers-up",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Containers Up! a web based platform designed to manage and update containers",
   "author": "DigitallyRefined",
   "license": "ISC",
@@ -49,12 +49,12 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.13",
+    "@biomejs/biome": "2.3.14",
     "@tailwindcss/cli": "^4.1.18",
     "@types/bun": "^1.3.8",
     "@types/pino": "^7.0.5",
     "@types/pino-pretty": "^5.0.0",
-    "@types/react": "^19.2.10",
+    "@types/react": "^19.2.11",
     "@types/react-dom": "^19.2.3"
   }
 }

package.json

@@ -7,6 +7,12 @@ import { createDockerExec } from '@/backend/utils/docker';
 import { createExec } from '@/backend/utils/exec';
 import { squashUpdates } from '@/backend/utils/git';
 
+const SQUASH_UPDATE_DELAY_MINUTES = Number.parseInt(
+  process.env.SQUASH_UPDATE_DELAY_MINUTES || '15'
+);
+const SQUASH_UPDATE_DELAY_MS = SQUASH_UPDATE_DELAY_MINUTES * 60 * 1000;
+const squashUpdateTimers = new Map<number, ReturnType<typeof setTimeout>>();
+
 const folderExcluded = (folder: string, excludeFolders: string | null): boolean => {
   if (!excludeFolders || excludeFolders === 'null') return false;
   const regex = new RegExp(excludeFolders);
@@ -24,19 +30,40 @@ export const pullRestartUpdatedContainers = async (
   const dockerExec = createDockerExec(logger);
   const sshRun = (cmd: string) => exec.sshRun(name, host, `cd ${workingFolder} && ${cmd}`);
 
-  const composePullDownUp = async (composeFolder: string) => {
+  const restartComposeIfNotExcluded = async (composeFolder: string) => {
+    if (folderExcluded(composeFolder, excludeFolders)) {
+      logger.info(`Compose folder excluded: ${composeFolder}`);
+      return;
+    }
+
     logger.info(`Restarting services in: ${composeFolder}`);
     const response = dockerExec.restartCompose(name, host, composeFolder, true);
     await response.text();
   };
 
   const checkAndSquashUpdates = async () => {
     if (repoConfig.squashUpdates && (await jobDb.getIncompleteJobsWithPr(id)).length <= 1) {
-      try {
-        await squashUpdates(sshRun, logger);
-      } catch (err) {
-        logger.error({ err }, 'Failed to squash update commits');
+      const existingTimer = squashUpdateTimers.get(id);
+      if (existingTimer) {
+        clearTimeout(existingTimer);
       }
+
+      logger.info(
+        `Scheduling squash updates in ${SQUASH_UPDATE_DELAY_MINUTES} minutes for host ${name}`
+      );
+
+      const timer = setTimeout(() => {
+        squashUpdateTimers.delete(id);
+        void (async () => {
+          try {
+            await squashUpdates(sshRun, id, repoConfig.id);
+          } catch (err) {
+            logger.error({ err }, `Failed to squash update commits for host ${name}`);
+          }
+        })();
+      }, SQUASH_UPDATE_DELAY_MS);
+
+      squashUpdateTimers.set(id, timer);
     }
   };
 
@@ -52,28 +79,21 @@ export const pullRestartUpdatedContainers = async (
   }
 
   if (composeFolderExists === 'exists') {
-    if (!folderExcluded(containerFolder, excludeFolders)) {
-      await composePullDownUp(containerFolder);
-    } else {
-      logger.info(`Compose folder excluded: ${containerFolder}`);
-    }
-    await checkAndSquashUpdates();
+    await restartComposeIfNotExcluded(containerFolder);
   } else {
     // Single compose file watch (via git diff)
     const { stdout: changedFilesStdout } = await sshRun(`git diff --name-only HEAD~1 HEAD`);
     const changedFiles = changedFilesStdout.split('\n').filter(Boolean);
-    if (changedFiles.some((f: string) => isComposeFilename(f))) {
-      for (const changedFile of changedFiles) {
-        const composeFolder = path.dirname(path.join(workingFolder, changedFile));
-        if (!folderExcluded(composeFolder, excludeFolders)) {
-          await composePullDownUp(composeFolder);
-        } else {
-          logger.info(`Compose folder excluded: ${composeFolder}`);
-        }
-      }
-      await checkAndSquashUpdates();
-    } else {
+
+    if (!changedFiles.some((f: string) => isComposeFilename(f))) {
       logger.info('No compose YAML files have been changed');
+      return;
+    }
+
+    for (const changedFile of changedFiles) {
+      const composeFolder = path.dirname(path.join(workingFolder, changedFile));
+      await restartComposeIfNotExcluded(composeFolder);
     }
   }
+  await checkAndSquashUpdates();
 };

src/backend/endpoints/webhook/pull-restart.ts

@@ -87,7 +87,17 @@ export const handleWebhookRequest = async (
     }
   }
 
-  options.handler(webhookEvent, selectedHost);
+  void options.handler(webhookEvent, selectedHost).catch((err) => {
+    const msg = `${options.name} webhook handler failed for host: ${selectedHost.name}`;
+    mainLogger.error({ err }, msg);
+    void logDb.create({
+      hostId: selectedHost.id,
+      level: 50,
+      time: Date.now(),
+      event: `${options.name} webhook error`,
+      msg,
+    });
+  });
 
   return Response.json({ message: 'webhook received' });
 };

src/backend/endpoints/webhook/request-handler.ts

@@ -1,7 +1,13 @@
 import type { Logger } from 'pino';
 
+import { log as logDb } from '@/backend/db/log';
+import { getLogs, mainLogger } from '@/backend/utils/logger';
+
+const event = 'git-squash-updates';
+const logger = mainLogger.child({ event });
+
 const SQUASH_UPDATE_MESSAGE = process.env.SQUASH_UPDATE_MESSAGE || 'Update dependencies';
-const SQUASH__DEPS_DAYS_AGO = Number.parseInt(process.env.SQUASH_DAYS_AGO || '5');
+const SQUASH_DEPS_DAYS_AGO = Number.parseInt(process.env.SQUASH_DAYS_AGO || '5');
 const SQUASH_MAX_UPDATE_COMMITS = Number.parseInt(process.env.SQUASH_MAX_UPDATE_COMMITS || '5');
 
 const buildMessage = (subject: string, body?: string) => {
@@ -143,7 +149,8 @@ const pushToRemote = async (
 
 export const squashUpdates = async (
   sshRun: (cmd: string) => Promise<{ stdout: string }>,
-  logger: Logger
+  jobId: number,
+  hostId: number
 ) => {
   logger.info('Squashing dependency update commits');
 
@@ -153,12 +160,10 @@ export const squashUpdates = async (
     return;
   }
 
-  // Keep squashing while the previous commit is from an automated author
-  let continueSquashing = true;
   let loopCount = 0;
   const MAX_SQUASH_LOOPS = 50; // To prevent infinite loops
 
-  while (continueSquashing && loopCount < MAX_SQUASH_LOOPS) {
+  while (loopCount < MAX_SQUASH_LOOPS) {
     loopCount++;
     logger.info(`Squash loop iteration ${loopCount}`);
 
@@ -169,11 +174,12 @@ export const squashUpdates = async (
     const prevCommit = await getCommitMetadata(sshRun, 1);
 
     const isAutomatedAuthor = /dependabot|renovate/i.test(prevCommit.authorName);
+    const X_DAYS_AGO = Date.now() - SQUASH_DEPS_DAYS_AGO * 24 * 60 * 60 * 1000;
 
-    // If previous commit is not from automated author, stop squashing
-    if (!isAutomatedAuthor) {
-      continueSquashing = false;
-    } else {
+    if (
+      isAutomatedAuthor ||
+      (prevCommit.timestamp > X_DAYS_AGO && prevCommit.subject.includes(SQUASH_UPDATE_MESSAGE))
+    ) {
       // Previous commit is from automated author, squash them together
       logger.info(`Squashing last 2 commits together (previous author: ${prevCommit.authorName})`);
       await squashLastTwoCommits(
@@ -183,25 +189,21 @@ export const squashUpdates = async (
         prevCommit.body,
         prevCommit.authorDate
       );
+      continue;
     }
+
+    if (!lastCommit.subject.includes(SQUASH_UPDATE_MESSAGE)) {
+      logger.info('Updating current commit message only (previous is old or not an update commit)');
+      await updateCurrentCommit(sshRun, lastCommit.subject, lastCommit.body);
+    }
+
+    break;
   }
 
   if (loopCount >= MAX_SQUASH_LOOPS) {
     logger.warn(`Reached maximum squash loop limit of ${MAX_SQUASH_LOOPS}`);
   }
 
-  // Get current commit info after squashing
-  const lastCommit = await getCommitMetadata(sshRun, 0);
-  const prevCommit = await getCommitMetadata(sshRun, 1);
-
-  const DAYS_AGO = Date.now() - SQUASH__DEPS_DAYS_AGO * 24 * 60 * 60 * 1000;
-
-  // If previous commit is old or doesn't start with "Update dependencies", just update current commit
-  if (prevCommit.timestamp < DAYS_AGO || !prevCommit.subject.includes(SQUASH_UPDATE_MESSAGE)) {
-    logger.info('Updating current commit message only (previous is old or not an update commit)');
-    await updateCurrentCommit(sshRun, lastCommit.subject, lastCommit.body);
-  }
-
   // After squashing, check if we've exceeded the max number of update commits
   const checkCommitCount = SQUASH_MAX_UPDATE_COMMITS + 1;
   const recentCommits = await sshRun(`git log -${checkCommitCount} --format="%s"`);
@@ -219,4 +221,8 @@ export const squashUpdates = async (
 
   await pushToRemote(sshRun, logger);
   logger.info('Finished squashing dependency update commits');
+
+  getLogs(event).map(async (log) => {
+    await logDb.create({ jobId, hostId, ...log });
+  });
 };

src/backend/utils/git.ts

@@ -299,6 +299,10 @@ export const HostForm = ({
                 When enabled, multiple dependency update commits will be squashed into a single
                 commit after pulling updates.
               </p>
+              <p>
+                This happens automatically 15 minutes after the last merge (configurable) to prevent
+                PR conflicts.
+              </p>
               <p>
                 Note: Requires repositories to use the Git pull request squash merge strategy and
                 may not work in all scenarios.