@automagik/omni 2.260430.16 → 2.260501.1

package/dist/index.js

@@ -26733,6 +26733,9 @@ function createSubscription(options) {
   return {
     id: subscriptionId,
     pattern,
+    isAlive() {
+      return isActive;
+    },
     async unsubscribe() {
       isActive = false;
       abortController.abort();
@@ -34208,13 +34211,16 @@ var init_debounce = __esm(() => {
 // ../core/src/automations/engine.ts
 class AutomationEngine {
   config;
-  subscriptions = [];
+  subscriptions = new Map;
   instanceQueues = new Map;
   debounceManagers = new Map;
   automations = [];
   eventBus = null;
   deps;
   logger = null;
+  reconcileTimer = null;
+  reconcileEnabled = false;
+  reconcilePromise = null;
   constructor(config2) {
     this.config = config2;
     this.deps = {
@@ -34231,33 +34237,17 @@ class AutomationEngine {
       callAgent: deps.callAgent
     };
     this.automations = automations.filter((a) => a.enabled);
-    const triggerTypes = new Set(this.automations.map((a) => a.triggerEventType));
-    for (const eventType of triggerTypes) {
-      const durable = `automation-engine-${eventType.replace(/[^a-zA-Z0-9_-]/g, "-")}`;
-      const subscription = await eventBus.subscribePattern(`${eventType}.>`, async (event) => {
-        await this.handleEvent(event);
-      }, {
-        durable,
-        queue: "automation-engine",
-        startFrom: "new",
-        maxRetries: 3,
-        retryDelayMs: 1000
-      });
-      this.subscriptions.push(subscription);
-      logger4.info(`Subscribed to ${eventType}.*`, { durable });
-    }
-    for (const automation of this.automations) {
-      if (automation.debounce && automation.debounce.mode !== "none") {
-        this.setupDebounceManager(automation);
-      }
-    }
+    await this.reconcileSubscriptions();
+    this.rebuildDebounceManagers();
+    this.startReconcileTimer();
     logger4.info(`Automation engine started with ${this.automations.length} automations`);
   }
   async stop() {
-    for (const subscription of this.subscriptions) {
+    this.stopReconcileTimer();
+    for (const subscription of this.subscriptions.values()) {
       await subscription.unsubscribe();
     }
-    this.subscriptions = [];
+    this.subscriptions.clear();
     for (const manager of this.debounceManagers.values()) {
       manager.flushAll();
     }
@@ -34268,9 +34258,117 @@ class AutomationEngine {
     this.logger = logger5;
   }
   async reload(automations) {
-    await this.stop();
-    if (this.eventBus) {
-      await this.start(this.eventBus, automations, this.deps);
+    if (!this.eventBus) {
+      this.automations = automations.filter((a) => a.enabled);
+      return;
+    }
+    this.automations = automations.filter((a) => a.enabled);
+    await this.reconcileSubscriptions();
+    this.rebuildDebounceManagers();
+  }
+  async reconcile() {
+    if (!this.eventBus)
+      return;
+    await this.reconcileSubscriptions();
+  }
+  async reconcileSubscriptions() {
+    if (!this.eventBus)
+      return;
+    if (this.reconcilePromise)
+      return this.reconcilePromise;
+    this.reconcilePromise = this.doReconcileSubscriptions().finally(() => {
+      this.reconcilePromise = null;
+    });
+    return this.reconcilePromise;
+  }
+  async doReconcileSubscriptions() {
+    if (!this.eventBus)
+      return;
+    const expectedTriggers = new Set(this.automations.map((a) => a.triggerEventType));
+    for (const [eventType, subscription] of this.subscriptions) {
+      if (!expectedTriggers.has(eventType)) {
+        await subscription.unsubscribe().catch((err2) => {
+          logger4.warn("Failed to unsubscribe orphan trigger", { eventType, error: String(err2) });
+        });
+        this.subscriptions.delete(eventType);
+        logger4.info(`Unsubscribed from ${eventType}.* (no enabled automations)`);
+      }
+    }
+    for (const eventType of expectedTriggers) {
+      const existing = this.subscriptions.get(eventType);
+      if (existing && this.isSubscriptionAlive(existing)) {
+        continue;
+      }
+      if (existing) {
+        await existing.unsubscribe().catch(() => {});
+        this.subscriptions.delete(eventType);
+        logger4.warn("Replacing dead subscription", { eventType });
+      }
+      const subscription = await this.subscribeForTrigger(eventType);
+      this.subscriptions.set(eventType, subscription);
+    }
+  }
+  async subscribeForTrigger(eventType) {
+    if (!this.eventBus) {
+      throw new Error("Event bus not initialized");
+    }
+    const durable = `automation-engine-${eventType.replace(/[^a-zA-Z0-9_-]/g, "-")}`;
+    const subscription = await this.eventBus.subscribePattern(`${eventType}.>`, async (event) => {
+      await this.handleEvent(event);
+    }, {
+      durable,
+      queue: "automation-engine",
+      startFrom: "new",
+      maxRetries: 3,
+      retryDelayMs: 1000
+    });
+    logger4.info(`Subscribed to ${eventType}.*`, { durable });
+    return subscription;
+  }
+  isSubscriptionAlive(subscription) {
+    return subscription.isAlive ? subscription.isAlive() : true;
+  }
+  rebuildDebounceManagers() {
+    const enabledIds = new Set(this.automations.map((a) => a.id));
+    for (const id of this.debounceManagers.keys()) {
+      if (!enabledIds.has(id)) {
+        this.debounceManagers.get(id)?.flushAll();
+        this.debounceManagers.delete(id);
+      }
+    }
+    for (const automation of this.automations) {
+      if (automation.debounce && automation.debounce.mode !== "none" && !this.debounceManagers.has(automation.id)) {
+        this.setupDebounceManager(automation);
+      }
+    }
+  }
+  startReconcileTimer() {
+    this.stopReconcileTimer();
+    const intervalMs = this.config.reconcileIntervalMs ?? 30000;
+    if (intervalMs <= 0)
+      return;
+    this.reconcileEnabled = true;
+    this.scheduleNextReconcile(intervalMs);
+  }
+  scheduleNextReconcile(intervalMs) {
+    if (!this.reconcileEnabled)
+      return;
+    this.reconcileTimer = setTimeout(() => {
+      this.reconcileSubscriptions().catch((err2) => {
+        logger4.error("Reconciler tick failed", { error: String(err2) });
+      }).finally(() => {
+        this.scheduleNextReconcile(intervalMs);
+      });
+    }, intervalMs);
+    if (typeof this.reconcileTimer === "object" && this.reconcileTimer && "unref" in this.reconcileTimer) {
+      this.reconcileTimer.unref();
+    }
+  }
+  stopReconcileTimer() {
+    this.reconcileEnabled = false;
+    if (this.reconcileTimer) {
+      clearTimeout(this.reconcileTimer);
+      this.reconcileTimer = null;
     }
   }
   async handleEvent(event) {
@@ -114079,7 +114177,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260430.16",
+  version: "2.260501.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -21136,6 +21136,9 @@ function createSubscription(options) {
   return {
     id: subscriptionId,
     pattern,
+    isAlive() {
+      return isActive;
+    },
     async unsubscribe() {
       isActive = false;
       abortController.abort();
@@ -28371,13 +28374,16 @@ var init_debounce = __esm(() => {
 // ../core/src/automations/engine.ts
 class AutomationEngine {
   config;
-  subscriptions = [];
+  subscriptions = new Map;
   instanceQueues = new Map;
   debounceManagers = new Map;
   automations = [];
   eventBus = null;
   deps;
   logger = null;
+  reconcileTimer = null;
+  reconcileEnabled = false;
+  reconcilePromise = null;
   constructor(config2) {
     this.config = config2;
     this.deps = {
@@ -28394,33 +28400,17 @@ class AutomationEngine {
       callAgent: deps.callAgent
     };
     this.automations = automations.filter((a) => a.enabled);
-    const triggerTypes = new Set(this.automations.map((a) => a.triggerEventType));
-    for (const eventType of triggerTypes) {
-      const durable = `automation-engine-${eventType.replace(/[^a-zA-Z0-9_-]/g, "-")}`;
-      const subscription = await eventBus.subscribePattern(`${eventType}.>`, async (event) => {
-        await this.handleEvent(event);
-      }, {
-        durable,
-        queue: "automation-engine",
-        startFrom: "new",
-        maxRetries: 3,
-        retryDelayMs: 1000
-      });
-      this.subscriptions.push(subscription);
-      logger4.info(`Subscribed to ${eventType}.*`, { durable });
-    }
-    for (const automation of this.automations) {
-      if (automation.debounce && automation.debounce.mode !== "none") {
-        this.setupDebounceManager(automation);
-      }
-    }
+    await this.reconcileSubscriptions();
+    this.rebuildDebounceManagers();
+    this.startReconcileTimer();
     logger4.info(`Automation engine started with ${this.automations.length} automations`);
   }
   async stop() {
-    for (const subscription of this.subscriptions) {
+    this.stopReconcileTimer();
+    for (const subscription of this.subscriptions.values()) {
       await subscription.unsubscribe();
     }
-    this.subscriptions = [];
+    this.subscriptions.clear();
     for (const manager of this.debounceManagers.values()) {
       manager.flushAll();
     }
@@ -28431,9 +28421,117 @@ class AutomationEngine {
     this.logger = logger5;
   }
   async reload(automations) {
-    await this.stop();
-    if (this.eventBus) {
-      await this.start(this.eventBus, automations, this.deps);
+    if (!this.eventBus) {
+      this.automations = automations.filter((a) => a.enabled);
+      return;
+    }
+    this.automations = automations.filter((a) => a.enabled);
+    await this.reconcileSubscriptions();
+    this.rebuildDebounceManagers();
+  }
+  async reconcile() {
+    if (!this.eventBus)
+      return;
+    await this.reconcileSubscriptions();
+  }
+  async reconcileSubscriptions() {
+    if (!this.eventBus)
+      return;
+    if (this.reconcilePromise)
+      return this.reconcilePromise;
+    this.reconcilePromise = this.doReconcileSubscriptions().finally(() => {
+      this.reconcilePromise = null;
+    });
+    return this.reconcilePromise;
+  }
+  async doReconcileSubscriptions() {
+    if (!this.eventBus)
+      return;
+    const expectedTriggers = new Set(this.automations.map((a) => a.triggerEventType));
+    for (const [eventType, subscription] of this.subscriptions) {
+      if (!expectedTriggers.has(eventType)) {
+        await subscription.unsubscribe().catch((err) => {
+          logger4.warn("Failed to unsubscribe orphan trigger", { eventType, error: String(err) });
+        });
+        this.subscriptions.delete(eventType);
+        logger4.info(`Unsubscribed from ${eventType}.* (no enabled automations)`);
+      }
+    }
+    for (const eventType of expectedTriggers) {
+      const existing = this.subscriptions.get(eventType);
+      if (existing && this.isSubscriptionAlive(existing)) {
+        continue;
+      }
+      if (existing) {
+        await existing.unsubscribe().catch(() => {});
+        this.subscriptions.delete(eventType);
+        logger4.warn("Replacing dead subscription", { eventType });
+      }
+      const subscription = await this.subscribeForTrigger(eventType);
+      this.subscriptions.set(eventType, subscription);
+    }
+  }
+  async subscribeForTrigger(eventType) {
+    if (!this.eventBus) {
+      throw new Error("Event bus not initialized");
+    }
+    const durable = `automation-engine-${eventType.replace(/[^a-zA-Z0-9_-]/g, "-")}`;
+    const subscription = await this.eventBus.subscribePattern(`${eventType}.>`, async (event) => {
+      await this.handleEvent(event);
+    }, {
+      durable,
+      queue: "automation-engine",
+      startFrom: "new",
+      maxRetries: 3,
+      retryDelayMs: 1000
+    });
+    logger4.info(`Subscribed to ${eventType}.*`, { durable });
+    return subscription;
+  }
+  isSubscriptionAlive(subscription) {
+    return subscription.isAlive ? subscription.isAlive() : true;
+  }
+  rebuildDebounceManagers() {
+    const enabledIds = new Set(this.automations.map((a) => a.id));
+    for (const id of this.debounceManagers.keys()) {
+      if (!enabledIds.has(id)) {
+        this.debounceManagers.get(id)?.flushAll();
+        this.debounceManagers.delete(id);
+      }
+    }
+    for (const automation of this.automations) {
+      if (automation.debounce && automation.debounce.mode !== "none" && !this.debounceManagers.has(automation.id)) {
+        this.setupDebounceManager(automation);
+      }
+    }
+  }
+  startReconcileTimer() {
+    this.stopReconcileTimer();
+    const intervalMs = this.config.reconcileIntervalMs ?? 30000;
+    if (intervalMs <= 0)
+      return;
+    this.reconcileEnabled = true;
+    this.scheduleNextReconcile(intervalMs);
+  }
+  scheduleNextReconcile(intervalMs) {
+    if (!this.reconcileEnabled)
+      return;
+    this.reconcileTimer = setTimeout(() => {
+      this.reconcileSubscriptions().catch((err) => {
+        logger4.error("Reconciler tick failed", { error: String(err) });
+      }).finally(() => {
+        this.scheduleNextReconcile(intervalMs);
+      });
+    }, intervalMs);
+    if (typeof this.reconcileTimer === "object" && this.reconcileTimer && "unref" in this.reconcileTimer) {
+      this.reconcileTimer.unref();
+    }
+  }
+  stopReconcileTimer() {
+    this.reconcileEnabled = false;
+    if (this.reconcileTimer) {
+      clearTimeout(this.reconcileTimer);
+      this.reconcileTimer = null;
     }
   }
   async handleEvent(event) {
@@ -224556,7 +224654,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260430.16",
+    version: "2.260501.1",
     type: "module",
     exports: {
       ".": {
@@ -283438,11 +283536,12 @@ class FollowUpLifecycleService {
     if (lastInboundCustomerMessageAt) {
       set.lastInboundCustomerMessageAt = lastInboundCustomerMessageAt;
     }
-    const result = await this.db.update(chatFollowUpState).set(set).where(and2(eq(chatFollowUpState.chatId, chatId), eq(chatFollowUpState.instanceId, instanceId), isNull2(chatFollowUpState.disarmReason))).returning({ id: chatFollowUpState.id });
+    const reasonGuard = TERMINAL_DISARM_REASONS.has(reason) ? or2(isNull2(chatFollowUpState.disarmReason), notInArray(chatFollowUpState.disarmReason, TERMINAL_OVERRIDE_PROTECTED)) : isNull2(chatFollowUpState.disarmReason);
+    const result = await this.db.update(chatFollowUpState).set(set).where(and2(eq(chatFollowUpState.chatId, chatId), eq(chatFollowUpState.instanceId, instanceId), reasonGuard)).returning({ id: chatFollowUpState.id });
     return { disarmed: result.length > 0 };
   }
 }
-var log85, TERMINAL_DISARM_REASONS;
+var log85, TERMINAL_DISARM_REASONS, TERMINAL_OVERRIDE_PROTECTED;
 var init_follow_up_lifecycle = __esm(() => {
   init_src();
   init_src5();
@@ -283454,6 +283553,7 @@ var init_follow_up_lifecycle = __esm(() => {
     "archived",
     "window_expired"
   ]);
+  TERMINAL_OVERRIDE_PROTECTED = [...TERMINAL_DISARM_REASONS, "contact_closed"];
 });
 
 // ../api/src/services/follow-up-sweeper.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260430.16",
+  "version": "2.260501.1",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {
@@ -51,15 +51,15 @@
     "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {
-    "@omni/api": "2.260430.15",
-    "@omni/channel-discord": "2.260430.15",
-    "@omni/channel-gupshup": "2.260430.15",
-    "@omni/channel-sdk": "2.260430.15",
-    "@omni/channel-slack": "2.260430.15",
-    "@omni/channel-telegram": "2.260430.15",
-    "@omni/channel-whatsapp": "2.260430.15",
-    "@omni/core": "2.260430.15",
-    "@omni/sdk": "2.260430.15",
+    "@omni/api": "2.260430.16",
+    "@omni/channel-discord": "2.260430.16",
+    "@omni/channel-gupshup": "2.260430.16",
+    "@omni/channel-sdk": "2.260430.16",
+    "@omni/channel-slack": "2.260430.16",
+    "@omni/channel-telegram": "2.260430.16",
+    "@omni/channel-whatsapp": "2.260430.16",
+    "@omni/core": "2.260430.16",
+    "@omni/sdk": "2.260430.16",
     "@types/node": "^22.10.3",
     "@types/qrcode-terminal": "^0.12.2",
     "typescript": "^5.7.3"