@codifycli/plugin-core 1.2.6 → 1.2.7-beta.1

package/dist/utils/index.js

@@ -207,10 +207,23 @@ Brew can be installed using Codify:
             if (isAptInstalled.status === SpawnStatus.SUCCESS) {
                 await $.spawn('apt-get update', { requiresRoot: true });
                 const flagStr = extraFlags.length > 0 ? `${extraFlags.join(' ')} ` : '';
-                const { status, data } = await $.spawnSafe(`apt-get -y -qq install -o Dpkg::Use-Pty=0 -o Dpkg::Progress-Fancy=0 ${flagStr}${packageName}`, {
-                    requiresRoot: true,
-                    env: { DEBIAN_FRONTEND: 'noninteractive', NEEDRESTART_MODE: 'a' }
-                });
+                let status = SpawnStatus.ERROR;
+                let data = '';
+                const maxLockRetries = 5;
+                for (let attempt = 0; attempt <= maxLockRetries; attempt++) {
+                    ({ status, data } = await $.spawnSafe(`apt-get -y -qq install -o Dpkg::Use-Pty=0 -o Dpkg::Progress-Fancy=0 ${flagStr}${packageName}`, {
+                        requiresRoot: true,
+                        env: { DEBIAN_FRONTEND: 'noninteractive', NEEDRESTART_MODE: 'a' }
+                    }));
+                    // dpkg/apt lock is held by another process (e.g. unattended-upgrades on a fresh VM).
+                    // This isn't a broken-dependency condition, so back off and retry rather than falling
+                    // through to `apt-get install -f`, which will just hit the same lock and fail too.
+                    const isLockContention = status === SpawnStatus.ERROR
+                        && (data.includes('Could not get lock') || data.includes('dpkg frontend lock'));
+                    if (!isLockContention || attempt === maxLockRetries)
+                        break;
+                    await new Promise((resolve) => setTimeout(resolve, 5000 * (attempt + 1)));
+                }
                 if (status === SpawnStatus.ERROR && data.includes('E: dpkg was interrupted, you must manually run \'sudo dpkg --configure -a\' to correct the problem.')) {
                     await $.spawn('dpkg --configure -a', { requiresRoot: true });
                     await $.spawn(`apt-get -y install ${flagStr}${packageName}`, {
@@ -219,6 +232,11 @@ Brew can be installed using Codify:
                     });
                     return;
                 }
+                const isLockContention = status === SpawnStatus.ERROR
+                    && (data.includes('Could not get lock') || data.includes('dpkg frontend lock'));
+                if (isLockContention) {
+                    throw new Error(`Failed to install package ${packageName} via apt: dpkg/apt lock held by another process after ${maxLockRetries} retries: ${data}`);
+                }
                 if (status === SpawnStatus.ERROR) {
                     // Attempt to fix broken dependencies then retry
                     const fixResult = await $.spawnSafe('apt-get install -f -y -o Dpkg::Use-Pty=0 -o Dpkg::Progress-Fancy=0', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codifycli/plugin-core",
-  "version": "1.2.6",
+  "version": "1.2.7-beta.1",
   "description": "TypeScript library for building Codify plugins to manage system resources (applications, CLI tools, settings) through infrastructure-as-code",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/utils/index.ts

@@ -4,7 +4,7 @@ import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { getPty, SpawnStatus } from '../pty/index.js';
+import { getPty, SpawnResult, SpawnStatus } from '../pty/index.js';
 
 export function isDebug(): boolean {
   return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
@@ -274,10 +274,25 @@ Brew can be installed using Codify:
       if (isAptInstalled.status === SpawnStatus.SUCCESS) {
         await $.spawn('apt-get update', { requiresRoot: true });
         const flagStr = extraFlags.length > 0 ? `${extraFlags.join(' ')} ` : '';
-        const { status, data } = await $.spawnSafe(`apt-get -y -qq install -o Dpkg::Use-Pty=0 -o Dpkg::Progress-Fancy=0 ${flagStr}${packageName}`, {
-          requiresRoot: true,
-          env: { DEBIAN_FRONTEND: 'noninteractive', NEEDRESTART_MODE: 'a' }
-        });
+
+        let status: SpawnResult['status'] = SpawnStatus.ERROR;
+        let data = '';
+        const maxLockRetries = 5;
+        for (let attempt = 0; attempt <= maxLockRetries; attempt++) {
+          ({ status, data } = await $.spawnSafe(`apt-get -y -qq install -o Dpkg::Use-Pty=0 -o Dpkg::Progress-Fancy=0 ${flagStr}${packageName}`, {
+            requiresRoot: true,
+            env: { DEBIAN_FRONTEND: 'noninteractive', NEEDRESTART_MODE: 'a' }
+          }));
+
+          // dpkg/apt lock is held by another process (e.g. unattended-upgrades on a fresh VM).
+          // This isn't a broken-dependency condition, so back off and retry rather than falling
+          // through to `apt-get install -f`, which will just hit the same lock and fail too.
+          const isLockContention = status === SpawnStatus.ERROR
+            && (data.includes('Could not get lock') || data.includes('dpkg frontend lock'));
+          if (!isLockContention || attempt === maxLockRetries) break;
+
+          await new Promise((resolve) => setTimeout(resolve, 5000 * (attempt + 1)));
+        }
 
         if (status === SpawnStatus.ERROR && data.includes('E: dpkg was interrupted, you must manually run \'sudo dpkg --configure -a\' to correct the problem.')) {
           await $.spawn('dpkg --configure -a', { requiresRoot: true });
@@ -288,6 +303,12 @@ Brew can be installed using Codify:
           return;
         }
 
+        const isLockContention = status === SpawnStatus.ERROR
+          && (data.includes('Could not get lock') || data.includes('dpkg frontend lock'));
+        if (isLockContention) {
+          throw new Error(`Failed to install package ${packageName} via apt: dpkg/apt lock held by another process after ${maxLockRetries} retries: ${data}`);
+        }
+
         if (status === SpawnStatus.ERROR) {
           // Attempt to fix broken dependencies then retry
           const fixResult = await $.spawnSafe('apt-get install -f -y -o Dpkg::Use-Pty=0 -o Dpkg::Progress-Fancy=0', {