4runr-os 2.10.13 → 2.10.16

package/dist/boot-sequence.js

@@ -4,8 +4,8 @@
  */
 import { execSync } from 'child_process';
 import * as fs from 'fs';
-import * as os from 'os';
 import * as path from 'path';
+import { forceClearGlobalDeferredNpmLock } from './deferred-npm-install-lock.js';
 /**
  * Kill any stale 4r/Gateway processes that might lock files
  */
@@ -20,31 +20,19 @@ export function killStaleProcesses() {
         }
         return;
     }
-    // Windows: kill node.exe processes running from global 4runr-os or Gateway paths
+    // Windows: Use PowerShell Get-Process (wmic was removed in Windows 11+)
     try {
-        const output = execSync('wmic process where "name=\'node.exe\'" get ProcessId,CommandLine /format:csv', { encoding: 'utf-8', windowsHide: true });
-        const lines = output.split(/\r?\n/);
-        for (const line of lines) {
-            if (line.includes('4runr-os') || line.includes('gateway')) {
-                const match = line.match(/,(\d+)$/);
-                if (match) {
-                    const pid = parseInt(match[1], 10);
-                    if (pid > 0 && pid !== process.pid) {
-                        try {
-                            process.kill(pid, 'SIGTERM');
-                        }
-                        catch {
-                            // ignore
-                        }
-                    }
-                }
-            }
-        }
+        const ps = `Get-Process node -ErrorAction SilentlyContinue | Where-Object { $_.Path -like '*4runr-os*' -or $_.CommandLine -like '*gateway*' } | ForEach-Object { Stop-Process -Id $_.Id -Force -ErrorAction SilentlyContinue }`;
+        execSync(`powershell -NoProfile -Command "${ps}"`, {
+            stdio: 'ignore',
+            timeout: 10000,
+            windowsHide: true,
+        });
     }
     catch {
-        // Fallback: just kill all node.exe (aggressive but effective)
+        // Fallback: just kill all node except current process
         try {
-            execSync('taskkill /F /IM node.exe /FI "PID ne ' + process.pid + '"', {
+            execSync(`taskkill /F /IM node.exe /FI "PID ne ${process.pid}"`, {
                 stdio: 'ignore',
                 windowsHide: true,
             });
@@ -54,35 +42,6 @@ export function killStaleProcesses() {
         }
     }
 }
-/**
- * Wait for any in-progress npm install -g 4runr-os to complete
- */
-export async function waitForInProgressUpdate(maxWaitMs = 120000) {
-    const lockPath = path.join(os.tmpdir(), '4runr-os-gnpm-in-progress.lock');
-    const start = Date.now();
-    while (Date.now() - start < maxWaitMs) {
-        if (!fs.existsSync(lockPath)) {
-            return true;
-        }
-        // Check if lock is stale (>15 min)
-        try {
-            const { mtimeMs } = fs.statSync(lockPath);
-            if (Date.now() - mtimeMs > 15 * 60 * 1000) {
-                fs.unlinkSync(lockPath);
-                return true;
-            }
-        }
-        catch {
-            return true;
-        }
-        // Show progress every 5s
-        if ((Date.now() - start) % 5000 < 1000) {
-            process.stderr.write('.');
-        }
-        await new Promise(r => setTimeout(r, 1000));
-    }
-    return false;
-}
 /**
  * Check if Prisma client is properly generated
  */
@@ -144,6 +103,8 @@ async function repairInstall() {
  */
 export async function performBootSequence() {
     const warnings = [];
+    // Clear stale npm-update lock so manual `npm install -g` never stays blocked forever
+    forceClearGlobalDeferredNpmLock();
     // Step 1: Kill stale processes
     try {
         killStaleProcesses();
@@ -152,22 +113,7 @@ export async function performBootSequence() {
     catch (err) {
         warnings.push(`Could not kill stale processes: ${err instanceof Error ? err.message : String(err)}`);
     }
-    // Step 2: Wait for in-progress updates
-    const lockPath = path.join(os.tmpdir(), '4runr-os-gnpm-in-progress.lock');
-    if (fs.existsSync(lockPath)) {
-        process.stderr.write('⏳ Waiting for background update to complete');
-        const ok = await waitForInProgressUpdate(60000);
-        process.stderr.write('\n');
-        if (!ok) {
-            // Force clear stale lock
-            try {
-                fs.unlinkSync(lockPath);
-            }
-            catch {
-                // ignore
-            }
-        }
-    }
+    // Step 2: Lock already cleared above (legacy waits removed — they blocked recovery)
     // Step 3: Health checks
     const prismaOk = checkPrismaClient();
     const gatewayOk = checkGatewayBundle();

package/dist/boot-sequence.js.map

@@ -1 +1 @@
-{"version":3,"file":"boot-sequence.js","sourceRoot":"","sources":["../src/boot-sequence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"boot-sequence.js","sourceRoot":"","sources":["../src/boot-sequence.ts"],"names":[],"mappings":"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"}

package/dist/deferred-npm-install-lock.d.ts

@@ -1,7 +1,5 @@
 export declare const DEFERRED_NPM_INSTALL_LOCK = "4runr-os-gnpm-in-progress.lock";
 export declare function globalDeferredNpmLockPath(): string;
-export declare function tryClearStaleGlobalDeferredNpmLock(): void;
-/** True if a deferred background npm is likely still running. */
-export declare function isGlobalDeferredNpmInstallInProgress(): boolean;
-export declare function createGlobalDeferredNpmInstallLock(): void;
+/** Always remove lock (called at `4r` boot). */
+export declare function forceClearGlobalDeferredNpmLock(): void;
 //# sourceMappingURL=deferred-npm-install-lock.d.ts.map

package/dist/deferred-npm-install-lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deferred-npm-install-lock.d.ts","sourceRoot":"","sources":["../src/deferred-npm-install-lock.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAI1E,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAWzD;AAED,iEAAiE;AACjE,wBAAgB,oCAAoC,IAAI,OAAO,CAY9D;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD"}
+{"version":3,"file":"deferred-npm-install-lock.d.ts","sourceRoot":"","sources":["../src/deferred-npm-install-lock.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAE1E,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,gDAAgD;AAChD,wBAAgB,+BAA+B,IAAI,IAAI,CAOtD"}

package/dist/deferred-npm-install-lock.js

@@ -1,46 +1,22 @@
 /**
- * Single global `npm install -g 4runr-os` (Windows: deferred from 4r after exit) must not
- * run concurrently with another `npm` touching the same folder — that causes EBUSY rename errors.
+ * Legacy lock file in %TEMP% — cleared at every `4r` boot so it cannot block `npm install -g`.
  */
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 export const DEFERRED_NPM_INSTALL_LOCK = '4runr-os-gnpm-in-progress.lock';
-const STALE_MS = 12 * 60 * 1000; // 12 min — if PS dies, allow recovery
 export function globalDeferredNpmLockPath() {
     return path.join(os.tmpdir(), DEFERRED_NPM_INSTALL_LOCK);
 }
-export function tryClearStaleGlobalDeferredNpmLock() {
+/** Always remove lock (called at `4r` boot). */
+export function forceClearGlobalDeferredNpmLock() {
     const p = globalDeferredNpmLockPath();
-    if (!fs.existsSync(p))
-        return;
     try {
-        const { mtimeMs } = fs.statSync(p);
-        if (Date.now() - mtimeMs > STALE_MS) {
+        if (fs.existsSync(p))
             fs.unlinkSync(p);
-        }
     }
     catch {
         /* ignore */
     }
 }
-/** True if a deferred background npm is likely still running. */
-export function isGlobalDeferredNpmInstallInProgress() {
-    const p = globalDeferredNpmLockPath();
-    if (!fs.existsSync(p))
-        return false;
-    try {
-        const { mtimeMs } = fs.statSync(p);
-        if (Date.now() - mtimeMs > STALE_MS) {
-            return false;
-        }
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export function createGlobalDeferredNpmInstallLock() {
-    fs.writeFileSync(globalDeferredNpmLockPath(), new Date().toISOString(), 'utf-8');
-}
 //# sourceMappingURL=deferred-npm-install-lock.js.map

package/dist/deferred-npm-install-lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"deferred-npm-install-lock.js","sourceRoot":"","sources":["../src/deferred-npm-install-lock.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,CAAC,MAAM,yBAAyB,GAAG,gCAAgC,CAAC;AAE1E,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,sCAAsC;AAEvE,MAAM,UAAU,yBAAyB;IACvC,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,kCAAkC;IAChD,MAAM,CAAC,GAAG,yBAAyB,EAAE,CAAC;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QAAE,OAAO;IAC9B,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAC;YACpC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,YAAY;IACd,CAAC;AACH,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,oCAAoC;IAClD,MAAM,CAAC,GAAG,yBAAyB,EAAE,CAAC;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAC;YACpC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kCAAkC;IAChD,EAAE,CAAC,aAAa,CAAC,yBAAyB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;AACnF,CAAC"}
+{"version":3,"file":"deferred-npm-install-lock.js","sourceRoot":"","sources":["../src/deferred-npm-install-lock.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,CAAC,MAAM,yBAAyB,GAAG,gCAAgC,CAAC;AAE1E,MAAM,UAAU,yBAAyB;IACvC,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC;AAC3D,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,+BAA+B;IAC7C,MAAM,CAAC,GAAG,yBAAyB,EAAE,CAAC;IACtC,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,YAAY;IACd,CAAC;AACH,CAAC"}

package/dist/tui-handlers.js

@@ -1568,26 +1568,28 @@ async function isGatewayHealthy(url) {
     }
 }
 const TUI_LOCAL_REDIS_DEFAULT = 'redis://127.0.0.1:6379';
-function tuiAutostartRedisDisabledByEnv() {
+function tuiAutostartDockerStackDisabledByEnv() {
     if (process.env['FOURRUNR_NO_AUTO_REDIS'] === '1' || process.env['FOURRUNR_NO_AUTO_REDIS'] === 'true') {
         return true;
     }
+    if (process.env['FOURRUNR_NO_AUTO_DOCKER'] === '1' || process.env['FOURRUNR_NO_AUTO_DOCKER'] === 'true') {
+        return true;
+    }
     if (process.env['FOURRUNR_SPAWN_REDIS'] === '0' || process.env['FOURRUNR_SPAWN_REDIS'] === 'false') {
         return true;
     }
     return false;
 }
 /**
- * On TUI-spawned Gateway, start local Redis by default (Docker: container `4runr-redis` on 6379).
- * Skips if REDIS_URL is already set (you manage Redis yourself) or FOURRUNR_NO_AUTO_REDIS=1.
- * Redis is still a separate process; we only orchestrate a standard local container when Docker exists.
+ * Start Postgres + Redis together via the same compose file the Gateway uses.
+ * Previously we only ran a standalone Redis container, so Postgres never came up and Prisma stayed in memory mode.
  */
-function tryTuiAutostartRedisDocker(activityLog, getCurrentTimeFn) {
-    if (tuiAutostartRedisDisabledByEnv()) {
+function tryTuiAutostartDockerComposeStack(bundlePath, activityLog, getCurrentTimeFn) {
+    if (tuiAutostartDockerStackDisabledByEnv()) {
         activityLog.push({
             timestamp: getCurrentTimeFn(),
             level: 'info',
-            message: 'Autostart Redis: skipped (FOURRUNR_NO_AUTO_REDIS or FOURRUNR_SPAWN_REDIS=0).',
+            message: 'Autostart Docker stack: skipped (FOURRUNR_NO_AUTO_DOCKER / FOURRUNR_NO_AUTO_REDIS / FOURRUNR_SPAWN_REDIS=0).',
         });
         return undefined;
     }
@@ -1595,28 +1597,32 @@ function tryTuiAutostartRedisDocker(activityLog, getCurrentTimeFn) {
         activityLog.push({
             timestamp: getCurrentTimeFn(),
             level: 'info',
-            message: 'Autostart Redis: skipped (REDIS_URL already set in environment).',
+            message: 'Autostart Docker stack: skipped (REDIS_URL already set — manage Postgres yourself if needed).',
         });
         return undefined;
     }
-    // shell as string: some @types/child_process only allow `string` (not `true`) for shell.
-    const dockerShell = process.platform === 'win32' ? (process.env.ComSpec || 'cmd.exe') : '/bin/sh';
-    const dockerExecOpts = {
-        stdio: 'ignore',
-        windowsHide: true,
-        shell: dockerShell,
-    };
+    const composeFile = path.join(bundlePath, 'docker-compose.local.yml');
+    if (!fs.existsSync(composeFile)) {
+        activityLog.push({
+            timestamp: getCurrentTimeFn(),
+            level: 'warning',
+            message: `Autostart Docker stack: no compose file at ${composeFile}`,
+        });
+        return undefined;
+    }
+    const dockerShell = process.platform === 'win32' ? (process.env['ComSpec'] || 'cmd.exe') : '/bin/sh';
     try {
-        try {
-            execSync('docker start 4runr-redis', dockerExecOpts);
-        }
-        catch {
-            execSync('docker run -d --name 4runr-redis -p 6379:6379 redis:7-alpine', dockerExecOpts);
-        }
+        execSync(`docker compose -f "${composeFile}" up -d`, {
+            cwd: bundlePath,
+            stdio: 'ignore',
+            windowsHide: true,
+            timeout: 120000,
+            shell: dockerShell,
+        });
         activityLog.push({
             timestamp: getCurrentTimeFn(),
             level: 'success',
-            message: 'Redis: started via Docker (4runr-redis → 127.0.0.1:6379). Gateway will use REDIS_URL.',
+            message: 'Docker: Postgres + Redis started via docker-compose.local.yml (4runr-postgres :5432, 4runr-redis :6379).',
         });
         return TUI_LOCAL_REDIS_DEFAULT;
     }
@@ -1624,7 +1630,7 @@ function tryTuiAutostartRedisDocker(activityLog, getCurrentTimeFn) {
         activityLog.push({
             timestamp: getCurrentTimeFn(),
             level: 'warning',
-            message: `Autostart Redis: Docker not available or failed — ${errorMessage(e)}. Install Docker or set REDIS_URL manually.`,
+            message: `Autostart Docker stack failed — ${errorMessage(e)}. Gateway may fall back to memory DB without Postgres.`,
         });
         return undefined;
     }
@@ -1682,17 +1688,16 @@ async function startLocalGatewayAndWait(bundlePath, url, activityLog, getCurrent
     });
     killRecordedLocalGateway();
     await new Promise((r) => setTimeout(r, 400));
-    const tuiRedisUrl = tryTuiAutostartRedisDocker(activityLog, getCurrentTimeFn);
+    const tuiRedisUrl = tryTuiAutostartDockerComposeStack(bundlePath, activityLog, getCurrentTimeFn);
     if (tuiRedisUrl) {
-        // Brief pause so the container is accepting connections before the Gateway process connects
-        await new Promise((r) => setTimeout(r, 500));
+        await new Promise((r) => setTimeout(r, 1500));
     }
     const passThroughRedis = process.env['REDIS_URL'];
     if (!tuiRedisUrl && !String(passThroughRedis || '').trim()) {
         activityLog.push({
             timestamp: getCurrentTimeFn(),
             level: 'info',
-            message: 'Autostart: GATEWAY_PERSISTENCE=auto (Docker DB if available, memory fallback). Redis not running (install Docker for auto-Redis, or set REDIS_URL). Opt out: FOURRUNR_NO_AUTO_REDIS=1.',
+            message: 'Autostart: GATEWAY_PERSISTENCE=auto. No Docker stack started (install Docker Desktop, or set REDIS_URL). Opt out: FOURRUNR_NO_AUTO_DOCKER=1.',
         });
     }
     const pkgJsonPath = path.join(bundlePath, 'package.json');