thepopebot 1.2.76-beta.27 → 1.2.76-beta.28

package/api/index.js

@@ -7,7 +7,7 @@ import { dispatchCommand, dispatchPreAuthCommand } from '../lib/channels/command
 import { getByChannelChatId, setActiveThread } from '../lib/db/user-channels.js';
 import { chat, chatStream, summarizeAgentJob } from '../lib/ai/index.js';
 import { createNotification } from '../lib/db/notifications.js';
-import { loadTriggers } from '../lib/triggers.js';
+import { getFireTriggers } from '../lib/triggers.js';
 import { verifyApiKey } from '../lib/db/api-keys.js';
 import { getConfig } from '../lib/config.js';
 import { parseOAuthState, exchangeCodeForToken } from '../lib/oauth/helper.js';
@@ -19,8 +19,6 @@ const _refreshLocks = new Map();
 // Bot token — resolved from DB/env, can be overridden by /telegram/register
 let telegramBotToken = null;
 
-// Cached trigger firing function (initialized on first request)
-let _fireTriggers = null;
 
 function getTelegramBotToken() {
   if (!telegramBotToken) {
@@ -29,13 +27,6 @@ function getTelegramBotToken() {
   return telegramBotToken;
 }
 
-function getFireTriggers() {
-  if (!_fireTriggers) {
-    const result = loadTriggers();
-    _fireTriggers = result.fireTriggers;
-  }
-  return _fireTriggers;
-}
 
 // Routes that have their own authentication
 const PUBLIC_ROUTES = ['/telegram/webhook', '/github/webhook', '/ping', '/oauth/callback'];

package/config/instrumentation.js

@@ -52,7 +52,7 @@ export async function register() {
   }
 
   // Start cron scheduler
-  const { loadCrons } = await import('../lib/cron.js');
+  const { loadCrons, reloadCrons } = await import('../lib/cron.js');
   loadCrons();
 
   // Start built-in crons (version check)
@@ -74,5 +74,33 @@ export async function register() {
   const { startMaintenanceCron } = await import('../lib/maintenance.js');
   startMaintenanceCron();
 
+  // Watch config files for hot reload (avoids full pm2 restart on git pull)
+  const { reloadTriggers } = await import('../lib/triggers.js');
+  const { default: chokidar } = await import('chokidar');
+  const { PROJECT_ROOT } = await import('../lib/paths.js');
+  const path = await import('path');
+
+  const cronsPath = path.join(PROJECT_ROOT, 'agent-job/CRONS.json');
+  const triggersPath = path.join(PROJECT_ROOT, 'event-handler/TRIGGERS.json');
+
+  const watcher = chokidar.watch([cronsPath, triggersPath], {
+    ignoreInitial: true,
+    awaitWriteFinish: { stabilityThreshold: 500 },
+  });
+
+  watcher.on('change', (filePath) => {
+    if (filePath.endsWith('CRONS.json')) {
+      console.log('[config watch] CRONS.json changed, reloading...');
+      reloadCrons();
+    } else if (filePath.endsWith('TRIGGERS.json')) {
+      console.log('[config watch] TRIGGERS.json changed, reloading...');
+      reloadTriggers();
+    }
+  });
+
+  watcher.on('error', (err) => {
+    console.error('[config watch] Watcher error:', err.message);
+  });
+
   console.log('thepopebot initialized');
 }

package/lib/cron.js

@@ -4,6 +4,9 @@ import path from 'path';
 import { PROJECT_ROOT } from './paths.js';
 import { executeAction } from './actions.js';
 
+// Active user cron tasks (module-scoped so reloadCrons can stop them)
+let _cronTasks = [];
+
 function getInstalledVersion() {
   const pkgPath = path.join(process.cwd(), 'node_modules', 'thepopebot', 'package.json');
   return JSON.parse(fs.readFileSync(pkgPath, 'utf8')).version;
@@ -228,7 +231,6 @@ function startBuiltinCrons() {
 
 /**
  * Load and schedule crons from CRONS.json
- * @returns {Array} - Array of scheduled cron tasks
  */
 function loadCrons() {
   const cronFile = path.join(PROJECT_ROOT, 'agent-job/CRONS.json');
@@ -238,7 +240,8 @@ function loadCrons() {
   if (!fs.existsSync(cronFile)) {
     console.log('No CRONS.json found');
     console.log('-----------------\n');
-    return [];
+    _cronTasks = [];
+    return;
   }
 
   const crons = JSON.parse(fs.readFileSync(cronFile, 'utf8'));
@@ -276,7 +279,32 @@ function loadCrons() {
 
   console.log('-----------------\n');
 
-  return tasks;
+  _cronTasks = tasks;
+}
+
+/**
+ * Stop existing cron tasks and re-load from CRONS.json.
+ * If the new file is invalid, keeps existing tasks running.
+ */
+function reloadCrons() {
+  const cronFile = path.join(PROJECT_ROOT, 'agent-job/CRONS.json');
+
+  // Pre-validate before stopping anything
+  if (fs.existsSync(cronFile)) {
+    try {
+      JSON.parse(fs.readFileSync(cronFile, 'utf8'));
+    } catch (err) {
+      console.error(`[cron reload] Invalid JSON in CRONS.json, keeping existing schedule: ${err.message}`);
+      return;
+    }
+  }
+
+  for (const { task } of _cronTasks) {
+    task.stop();
+  }
+
+  loadCrons();
+  console.log('[cron reload] Cron schedule reloaded');
 }
 
-export { loadCrons, startBuiltinCrons, getUpdateAvailable, setUpdateAvailable, getInstalledVersion, isPrerelease, runVersionCheck };
+export { loadCrons, reloadCrons, startBuiltinCrons, getUpdateAvailable, setUpdateAvailable, getInstalledVersion, isPrerelease, runVersionCheck };

package/lib/triggers.js

@@ -3,6 +3,9 @@ import path from 'path';
 import { PROJECT_ROOT } from './paths.js';
 import { executeAction } from './actions.js';
 
+// Cached fire function (module-scoped so reloadTriggers can reset it)
+let _fireTriggers = null;
+
 /**
  * Replace {{body.field}} templates with values from request context
  * @param {string} template - String with {{body.field}} placeholders
@@ -102,4 +105,38 @@ function loadTriggers() {
   return { triggerMap, fireTriggers };
 }
 
-export { loadTriggers };
+/**
+ * Get the cached fire function, loading on first call.
+ */
+function getFireTriggers() {
+  if (!_fireTriggers) {
+    const result = loadTriggers();
+    _fireTriggers = result.fireTriggers;
+  }
+  return _fireTriggers;
+}
+
+/**
+ * Re-load triggers from TRIGGERS.json.
+ * If the new file is invalid, keeps existing triggers.
+ */
+function reloadTriggers() {
+  const triggerFile = path.join(PROJECT_ROOT, 'event-handler/TRIGGERS.json');
+
+  // Pre-validate before discarding anything
+  if (fs.existsSync(triggerFile)) {
+    try {
+      JSON.parse(fs.readFileSync(triggerFile, 'utf8'));
+    } catch (err) {
+      console.error(`[trigger reload] Invalid JSON in TRIGGERS.json, keeping existing triggers: ${err.message}`);
+      return;
+    }
+  }
+
+  _fireTriggers = null;
+  // Force re-load immediately so the log output shows
+  getFireTriggers();
+  console.log('[trigger reload] Triggers reloaded');
+}
+
+export { loadTriggers, getFireTriggers, reloadTriggers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.76-beta.27",
+  "version": "1.2.76-beta.28",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {

package/templates/.github/workflows/rebuild-event-handler.yml

@@ -68,11 +68,6 @@ jobs:
           docker exec thepopebot-event-handler rm -f /tmp/.rebuild-status
           echo "status=$STATUS" >> $GITHUB_OUTPUT
 
-      - name: Reload (no version change)
-        if: steps.pull.outputs.status == 'RELOAD'
-        run: |
-          docker exec thepopebot-event-handler gosu coding-agent pm2 reload all
-
       - name: Pull new image and restart container
         if: steps.pull.outputs.status == 'VERSION_CHANGED'
         run: |