@automagik/omni 2.260430.15 → 2.260501.1

package/dist/commands/doctor.d.ts.map

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

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.15",
+  version: "2.260501.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -118735,7 +118833,7 @@ init_output();
 var PGSERVE_REQUIRED_VERSION = "^2.1.0";
 async function isPgserveInstalled() {
   try {
-    const code = await Bun.spawn({ cmd: ["pgserve", "port"], stdout: "pipe", stderr: "pipe" }).exited;
+    const code = await Bun.spawn({ cmd: ["pgserve", "--help"], stdout: "pipe", stderr: "pipe" }).exited;
     return code === 0;
   } catch {
     return false;
@@ -119374,27 +119472,46 @@ function summarizeChecks(checks) {
   }
   return summary;
 }
+var CASCADE_PRONE_FIXES = new Set([
+  "cli-key-valid",
+  "omni-db-exists",
+  "pgserve-reachable"
+]);
+async function runPhase1MigrationFix(deps, checks, fixesApplied) {
+  const canonicalCheck = checks.find((c2) => c2.id === "pgserve-canonical");
+  if (!canonicalCheck || canonicalCheck.level === "OK") {
+    return { canonicalFailed: false, checks };
+  }
+  const result = await applyFix(deps, canonicalCheck);
+  if (result !== null)
+    fixesApplied.push(result);
+  const canonicalFailed = typeof result === "string" && result.startsWith("FAILED ");
+  const refreshed = await runAllChecks(deps);
+  return { canonicalFailed, checks: refreshed };
+}
+async function runPhase2Fixes(deps, checks, canonicalFailed, fixesApplied) {
+  for (const check of checks) {
+    if (check.level === "OK")
+      continue;
+    if (check.id === "pgserve-canonical")
+      continue;
+    if (canonicalFailed && CASCADE_PRONE_FIXES.has(check.id)) {
+      fixesApplied.push(`SKIPPED ${check.id}: blocked by failed canonical-pgserve migration \u2014 fix manually after \`pgserve install\``);
+      continue;
+    }
+    const result = await applyFix(deps, check);
+    if (result !== null)
+      fixesApplied.push(result);
+  }
+}
 async function runDoctor(options, depsOverride) {
   const deps = depsOverride ?? productionDeps();
   let checks = await runAllChecks(deps);
   const fixesApplied = [];
   if (options.fix) {
-    const canonicalCheck = checks.find((c2) => c2.id === "pgserve-canonical");
-    if (canonicalCheck && canonicalCheck.level !== "OK") {
-      const result = await applyFix(deps, canonicalCheck);
-      if (result !== null)
-        fixesApplied.push(result);
-      checks = await runAllChecks(deps);
-    }
-    for (const check of checks) {
-      if (check.level === "OK")
-        continue;
-      if (check.id === "pgserve-canonical")
-        continue;
-      const result = await applyFix(deps, check);
-      if (result !== null)
-        fixesApplied.push(result);
-    }
+    const phase1 = await runPhase1MigrationFix(deps, checks, fixesApplied);
+    checks = phase1.checks;
+    await runPhase2Fixes(deps, checks, phase1.canonicalFailed, fixesApplied);
     checks = await runAllChecks(deps);
   }
   return { checks, summary: summarizeChecks(checks), fixesApplied };

package/dist/lib/canonical-pgserve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canonical-pgserve.d.ts","sourceRoot":"","sources":["../../src/lib/canonical-pgserve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAwHH;;;;;;GAMG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASpE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iCAAiC,CACrD,WAAW,EAAE,OAAO,EACpB,GAAG,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,OAAO,CAAC,CA6BlB"}
+{"version":3,"file":"canonical-pgserve.d.ts","sourceRoot":"","sources":["../../src/lib/canonical-pgserve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAqIH;;;;;;GAMG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASpE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iCAAiC,CACrD,WAAW,EAAE,OAAO,EACpB,GAAG,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,OAAO,CAAC,CA6BlB"}

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.15",
+    version: "2.260501.1",
     type: "module",
     exports: {
       ".": {
@@ -233726,7 +233824,7 @@ var init_src5 = __esm(() => {
   init_schema2();
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/postgres.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/postgres.js
 import { EventEmitter as EventEmitter4 } from "events";
 import os6 from "os";
 import path2 from "path";
@@ -234699,7 +234797,7 @@ Output: ${startupOutput}`));
   };
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/logger.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/logger.js
 function formatTime2() {
   const now = new Date;
   return `${String(now.getHours()).padStart(2, "0")}:${String(now.getMinutes()).padStart(2, "0")}:${String(now.getSeconds()).padStart(2, "0")}`;
@@ -234763,7 +234861,7 @@ var init_logger4 = __esm(() => {
   LEVELS = { debug: 10, info: 20, warn: 30, error: 40 };
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/sync.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/sync.js
 var {SQL: SQL2 } = globalThis.Bun;
 function matchesPattern2(dbName, patterns) {
   if (!patterns || patterns.length === 0)
@@ -234980,7 +235078,7 @@ var init_sync = __esm(() => {
   init_logger4();
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/pg-wire.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/pg-wire.js
 import { createHash as createHash7 } from "crypto";
 
 class PgWireClient {
@@ -235552,7 +235650,7 @@ var init_pg_wire = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/restore.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/restore.js
 function matchesPattern3(dbName, patterns) {
   if (!patterns || patterns.length === 0)
     return true;
@@ -235905,7 +236003,7 @@ var init_restore = __esm(() => {
   init_logger4();
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/dashboard.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/dashboard.js
 import { readFileSync as readFileSync3 } from "fs";
 import { join as join14, dirname as dirname5 } from "path";
 import { fileURLToPath } from "url";
@@ -236049,7 +236147,7 @@ var init_dashboard = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/protocol.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/protocol.js
 function parseStartupMessage(data, fastPath = true) {
   const length = data.readInt32BE(0);
   const version4 = data.readInt32BE(4);
@@ -236202,7 +236300,7 @@ function buildErrorResponse({ severity = "FATAL", sqlstate, message: message2 })
 var PROTOCOL_VERSION_3 = 196608;
 var init_protocol = () => {};
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/router.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/router.js
 import fs10 from "fs";
 import { EventEmitter as EventEmitter5 } from "events";
 function flushPending(target, pending) {
@@ -236538,7 +236636,7 @@ var init_router = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/stats-collector.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/stats-collector.js
 class StatsCollector {
   constructor(options = {}) {
     this.pgManager = options.pgManager;
@@ -236857,7 +236955,7 @@ class StatsCollector {
 }
 var CPU_SAMPLE_MIN_INTERVAL_MS = 100, PROC_DISKSTATS_MIN_FIELDS = 14;
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/stats-dashboard.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/stats-dashboard.js
 class StatsDashboard {
   constructor(options = {}) {
     this.enabled = process.stdout.isTTY && !process.env.NO_COLOR;
@@ -237121,7 +237219,7 @@ var init_stats_dashboard = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/audit.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/audit.js
 import fs11 from "fs";
 import os7 from "os";
 import path3 from "path";
@@ -237217,7 +237315,7 @@ var init_audit = __esm(() => {
   });
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/fingerprint.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/fingerprint.js
 import crypto6 from "crypto";
 import { execFileSync } from "child_process";
 import fs12 from "fs";
@@ -237496,7 +237594,7 @@ var init_fingerprint = __esm(() => {
   init_audit();
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/tokens.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/tokens.js
 import crypto7 from "crypto";
 function mintToken() {
   const id = crypto7.randomBytes(TOKEN_ID_BYTES).toString("hex");
@@ -237550,7 +237648,7 @@ var init_tokens = __esm(() => {
   FP_RE = /^[0-9a-f]{12}$/;
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/control-db.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/control-db.js
 function query(client, text3, params = [], opts = {}) {
   if (client.supportsQueryOptions && opts && Object.keys(opts).length > 0) {
     return client.query(text3, params, opts);
@@ -237687,7 +237785,7 @@ var init_control_db = __esm(() => {
   init_tokens();
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/admin-client.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/admin-client.js
 var {SQL: SQL3 } = globalThis.Bun;
 import fs13 from "fs";
 import path5 from "path";
@@ -237830,7 +237928,7 @@ function removeAdminDiscovery(controlSocketDir) {
 }
 var init_admin_client = () => {};
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/tenancy.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/tenancy.js
 function sanitizeName(name) {
   const raw = (typeof name === "string" ? name : "").toLowerCase();
   const collapsed = raw.replace(/[^a-z0-9]+/g, "_");
@@ -237854,7 +237952,7 @@ function isFingerprintEnforcementDisabled(env2 = process.env) {
 }
 var KILL_SWITCH_ENV = "PGSERVE_DISABLE_FINGERPRINT_ENFORCEMENT", NAME_TRUNCATE = 30, MAX_DB_IDENT = 63;
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/daemon-shared.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/daemon-shared.js
 function flushPending2(target, pending) {
   const written = target.write(pending);
   if (written === pending.byteLength)
@@ -237864,7 +237962,7 @@ function flushPending2(target, pending) {
   return pending.subarray(written);
 }
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/daemon-control.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/daemon-control.js
 import fs14 from "fs";
 function attachControlHandlers(PgserveDaemon) {
   PgserveDaemon.prototype.handleSocketOpen = handleSocketOpen;
@@ -238199,7 +238297,7 @@ var init_daemon_control = __esm(() => {
   MAX_STARTUP_BUFFER_SIZE2 = 1024 * 1024;
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/daemon-tcp.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/daemon-tcp.js
 import fs15 from "fs";
 function attachTcpHandlers(PgserveDaemon) {
   PgserveDaemon.prototype.bindTcpListener = bindTcpListener;
@@ -238468,7 +238566,7 @@ var init_daemon_tcp = __esm(() => {
   MAX_STARTUP_BUFFER_SIZE3 = 1024 * 1024;
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/gc.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/gc.js
 function defaultIsProcessAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0)
     return false;
@@ -238684,7 +238782,7 @@ var init_gc = __esm(() => {
   HOURLY_MS = 60 * 60 * 1000;
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/daemon.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/daemon.js
 import fs16 from "fs";
 import path6 from "path";
 import { EventEmitter as EventEmitter6 } from "events";
@@ -239181,7 +239279,7 @@ var init_daemon = __esm(() => {
   attachTcpHandlers(PgserveDaemon);
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/sdk.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/sdk.js
 import { spawn as spawn4 } from "child_process";
 import fs17 from "fs";
 import path7 from "path";
@@ -239304,7 +239402,7 @@ var init_sdk4 = __esm(() => {
   __dirname2 = path7.dirname(fileURLToPath2(import.meta.url));
 });
 
-// ../../node_modules/.bun/pgserve@2.1.0/node_modules/pgserve/src/index.js
+// ../../node_modules/.bun/pgserve@2.1.2/node_modules/pgserve/src/index.js
 var exports_src2 = {};
 __export(exports_src2, {
   stopDaemon: () => stopDaemon,
@@ -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.15",
+  "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.14",
-    "@omni/channel-discord": "2.260430.14",
-    "@omni/channel-gupshup": "2.260430.14",
-    "@omni/channel-sdk": "2.260430.14",
-    "@omni/channel-slack": "2.260430.14",
-    "@omni/channel-telegram": "2.260430.14",
-    "@omni/channel-whatsapp": "2.260430.14",
-    "@omni/core": "2.260430.14",
-    "@omni/sdk": "2.260430.14",
+    "@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"