@misterhuydo/sentinel 1.4.91 → 1.4.92

package/lib/.cairn/views/fb78ac_upgrade.js

@@ -62,7 +62,7 @@ module.exports = async function upgrade() {
   const { version: installed } = require(path.join(npmRootEarly, '@misterhuydo', 'sentinel', 'package.json'));
   if (installed !== current) {
     ok(`Upgraded: ${current} → ${installed} — re-running with new version...`);
-    const newBin = path.join(path.dirname(npmRootEarly), 'bin', 'sentinel');
+    const newBin = path.join(npmRootEarly, '..', '..', 'bin', 'sentinel');
     const r = spawnSync(newBin, ['upgrade'], { stdio: 'inherit' });
     process.exit(r.status || 0);
   }

package/lib/generate.js

@@ -312,6 +312,12 @@ for project_dir in "$WORKSPACE"/*/; do
 done
 echo "[sentinel] $stopped project(s) stopped"
 `, { mode: 0o755 });
+  // watchdog.sh - restarts any project that has stopped unexpectedly.
+  // Auto-installed as a cron job by `sentinel upgrade`.
+  fs.writeFileSync(path.join(workspace, 'watchdog.sh'),
+    "#!/usr/bin/env bash\n# Sentinel watchdog - auto-restart any project that has stopped unexpectedly.\n# Runs every minute via cron. Safe to run manually at any time.\nWORKSPACE=\"$(cd \"$(dirname \"$0\")\" && pwd)\"\nNON_PROJECT=\"code repos logs issues workspace\"\nfor project_dir in \"$WORKSPACE\"/*/; do\n  [[ -d \"$project_dir\" ]] || continue\n  name=$(basename \"$project_dir\")\n  echo \" $NON_PROJECT \" | grep -qw \"$name\" && continue\n  [[ -f \"$project_dir/start.sh\" ]] || continue\n  [[ -f \"$project_dir/config/sentinel.properties\" ]] || continue\n  PID_FILE=\"$project_dir/sentinel.pid\"\n  if [[ -f \"$PID_FILE\" ]] && kill -0 \"$(cat \"$PID_FILE\")\" 2>/dev/null; then\n    continue  # running fine\n  fi\n  echo \"[watchdog] $(date -u +%Y-%m-%dT%H:%M:%SZ) $name is down - restarting\"\n  bash \"$project_dir/start.sh\"\ndone\n",
+    { mode: 0o755 });
 }
-
+
+
 module.exports = { writeExampleProject, generateProjectScripts, generateWorkspaceScripts };

package/lib/upgrade.js

@@ -146,13 +146,51 @@ module.exports = async function upgrade() {
     warn('Could not regenerate project scripts: ' + e.message);
   }
 
+  // Install watchdog cron job if not already present
+  const watchdog = path.join(defaultWorkspace, 'watchdog.sh');
+  const logsDir  = path.join(defaultWorkspace, 'logs');
+  if (fs.existsSync(watchdog)) {
+    info('Installing watchdog cron job...');
+    try {
+      const existing = execSync('crontab -l 2>/dev/null || true', { encoding: 'utf8' });
+      if (existing.includes('watchdog.sh')) {
+        ok('Watchdog cron job already installed');
+      } else {
+        const cronLine = `* * * * * ${watchdog} >> ${logsDir}/watchdog.log 2>&1`;
+        const newCron = existing.trimEnd() + '\n' + cronLine + '\n';
+        execSync(`echo ${JSON.stringify(newCron)} | crontab -`);
+        ok('Watchdog cron job installed (runs every minute)');
+      }
+    } catch (e) {
+      warn('Could not install watchdog cron: ' + e.message);
+    }
+  }
+
   const startAll = path.join(defaultWorkspace, 'startAll.sh');
   const stopAll  = path.join(defaultWorkspace, 'stopAll.sh');
   if (fs.existsSync(stopAll) && fs.existsSync(startAll)) {
     info('Restarting Sentinel...');
     spawnSync('bash', [stopAll], { stdio: 'inherit' });
     spawnSync('bash', [startAll], { stdio: 'inherit' });
-    ok('Sentinel restarted');
+    // Verify restart succeeded — give processes 4 seconds to write PID files
+    execSync('sleep 4 || true');
+    let allUp = true;
+    try {
+      const entries = fs.readdirSync(defaultWorkspace, { withFileTypes: true });
+      const NON = new Set(['logs', 'code', 'repos', 'workspace', 'issues']);
+      for (const e of entries) {
+        if (!e.isDirectory() || e.name.startsWith('.') || NON.has(e.name)) continue;
+        const pidFile = path.join(defaultWorkspace, e.name, 'sentinel.pid');
+        if (!fs.existsSync(path.join(defaultWorkspace, e.name, 'config', 'sentinel.properties'))) continue;
+        if (!fs.existsSync(pidFile)) { allUp = false; continue; }
+        const pid = fs.readFileSync(pidFile, 'utf8').trim();
+        try { execSync(`kill -0 ${pid}`); } catch (_) {
+          warn(`${e.name} may have crashed after restart — watchdog will recover it within 1 minute`);
+          allUp = false;
+        }
+      }
+    } catch (_) {}
+    if (allUp) ok('Sentinel restarted');
   } else {
     warn('No startAll.sh found — restart manually');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misterhuydo/sentinel",
-  "version": "1.4.91",
+  "version": "1.4.92",
   "description": "Sentinel — Autonomous DevOps Agent installer and manager",
   "bin": {
     "sentinel": "./bin/sentinel.js"