@automagik/omni 2.260405.2 → 2.260406.1

package/dist/index.js

@@ -5779,11 +5779,11 @@ var require_nuid = __commonJS((exports) => {
 var require_core = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -5799,7 +5799,7 @@ var require_core = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -6002,11 +6002,11 @@ var require_core = __commonJS((exports) => {
 var require_util = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -6022,7 +6022,7 @@ var require_util = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -6036,14 +6036,14 @@ var require_util = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -6102,9 +6102,9 @@ var require_util = __commonJS((exports) => {
   }
   function delay(ms = 0) {
     let methods;
-    const p = new Promise((resolve2) => {
+    const p = new Promise((resolve3) => {
       const timer = setTimeout(() => {
-        resolve2();
+        resolve3();
       }, ms);
       const cancel = () => {
         if (timer) {
@@ -6123,18 +6123,18 @@ var require_util = __commonJS((exports) => {
   }
   function deferred() {
     let methods = {};
-    const p = new Promise((resolve2, reject) => {
-      methods = { resolve: resolve2, reject };
+    const p = new Promise((resolve3, reject) => {
+      methods = { resolve: resolve3, reject };
     });
     return Object.assign(p, methods);
   }
   function debugDeferred() {
     let methods = {};
-    const p = new Promise((resolve2, reject) => {
+    const p = new Promise((resolve3, reject) => {
       methods = {
         resolve: (v) => {
           console.trace("resolve", v);
-          resolve2(v);
+          resolve3(v);
         },
         reject: (err) => {
           console.trace("reject");
@@ -6616,11 +6616,11 @@ var require_ipparser = __commonJS((exports) => {
 var require_servers = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -6636,7 +6636,7 @@ var require_servers = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -12045,11 +12045,11 @@ var require_options = __commonJS((exports) => {
 var require_protocol = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -12065,7 +12065,7 @@ var require_protocol = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -12079,14 +12079,14 @@ var require_protocol = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -12497,12 +12497,12 @@ var require_protocol = __commonJS((exports) => {
     }
     _doDial(srv) {
       return __awaiter(this, undefined, undefined, function* () {
-        const { resolve: resolve2 } = this.options;
+        const { resolve: resolve3 } = this.options;
         const alts = yield srv.resolve({
           fn: (0, transport_1.getResolveFn)(),
           debug: this.options.debug,
           randomize: !this.options.noRandomize,
-          resolve: resolve2
+          resolve: resolve3
         });
         let lastErr = null;
         for (const a of alts) {
@@ -13250,11 +13250,11 @@ var require_jsutil = __commonJS((exports) => {
 var require_jsbaseclient_api = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -13270,7 +13270,7 @@ var require_jsbaseclient_api = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -13378,11 +13378,11 @@ var require_jsbaseclient_api = __commonJS((exports) => {
 var require_jslister = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -13398,7 +13398,7 @@ var require_jslister = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -13875,11 +13875,11 @@ var require_types2 = __commonJS((exports) => {
 var require_jsmconsumer_api = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -13895,7 +13895,7 @@ var require_jsmconsumer_api = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -14144,11 +14144,11 @@ var require_mod2 = __commonJS((exports) => {
 var require_jsmsg = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -14164,7 +14164,7 @@ var require_jsmsg = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -14337,11 +14337,11 @@ var require_jsmsg = __commonJS((exports) => {
 var require_typedsub = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -14357,7 +14357,7 @@ var require_typedsub = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -15080,11 +15080,11 @@ var require_sha_digest_parser = __commonJS((exports) => {
 var require_objectstore = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -15100,7 +15100,7 @@ var require_objectstore = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -15114,14 +15114,14 @@ var require_objectstore = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -15888,11 +15888,11 @@ var require_idleheartbeat_monitor = __commonJS((exports) => {
 var require_jsclient = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -15908,7 +15908,7 @@ var require_jsclient = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -16632,11 +16632,11 @@ var require_jsclient = __commonJS((exports) => {
 var require_kv = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -16652,7 +16652,7 @@ var require_kv = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -16666,14 +16666,14 @@ var require_kv = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -17614,11 +17614,11 @@ var require_kv = __commonJS((exports) => {
 var require_consumer = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -17634,7 +17634,7 @@ var require_consumer = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -17648,14 +17648,14 @@ var require_consumer = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -18507,11 +18507,11 @@ var require_consumer = __commonJS((exports) => {
 var require_jsmstream_api = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -18527,7 +18527,7 @@ var require_jsmstream_api = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -18978,11 +18978,11 @@ var require_jsmstream_api = __commonJS((exports) => {
 var require_jsm = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -18998,7 +18998,7 @@ var require_jsm = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -19012,14 +19012,14 @@ var require_jsm = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -19209,11 +19209,11 @@ var require_jsm = __commonJS((exports) => {
 var require_service = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -19229,7 +19229,7 @@ var require_service = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -19697,11 +19697,11 @@ var require_service = __commonJS((exports) => {
 var require_serviceclient = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -19717,7 +19717,7 @@ var require_serviceclient = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -19731,14 +19731,14 @@ var require_serviceclient = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -19819,11 +19819,11 @@ var require_serviceclient = __commonJS((exports) => {
 var require_nats = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -19839,7 +19839,7 @@ var require_nats = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -19853,14 +19853,14 @@ var require_nats = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -19888,7 +19888,7 @@ var require_nats = __commonJS((exports) => {
       this.listeners = [];
     }
     static connect(opts = {}) {
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve3, reject) => {
         const nc = new NatsConnectionImpl(opts);
         protocol_1.ProtocolHandler.connect(nc.options, nc).then((ph) => {
           nc.protocol = ph;
@@ -19917,7 +19917,7 @@ var require_nats = __commonJS((exports) => {
               }
             });
           })();
-          resolve2(nc);
+          resolve3(nc);
         }).catch((err) => {
           reject(err);
         });
@@ -20308,11 +20308,11 @@ ${errCtx.stack}`;
 var require_bench = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve2) {
-        resolve2(value);
+      return value instanceof P ? value : new P(function(resolve3) {
+        resolve3(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve2, reject) {
+    return new (P || (P = Promise))(function(resolve3, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -20328,7 +20328,7 @@ var require_bench = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -20342,14 +20342,14 @@ var require_bench = __commonJS((exports) => {
     }, i);
     function verb(n) {
       i[n] = o[n] && function(v) {
-        return new Promise(function(resolve2, reject) {
-          v = o[n](v), settle(resolve2, reject, v.done, v.value);
+        return new Promise(function(resolve3, reject) {
+          v = o[n](v), settle(resolve3, reject, v.done, v.value);
         });
       };
     }
-    function settle(resolve2, reject, d, v) {
+    function settle(resolve3, reject, d, v) {
       Promise.resolve(v).then(function(v2) {
-        resolve2({ value: v2, done: d });
+        resolve3({ value: v2, done: d });
       }, reject);
     }
   };
@@ -21100,11 +21100,11 @@ var require_nats_base_client = __commonJS((exports) => {
 var require_node_transport = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
-      return value instanceof P ? value : new P(function(resolve3) {
-        resolve3(value);
+      return value instanceof P ? value : new P(function(resolve4) {
+        resolve4(value);
       });
     }
-    return new (P || (P = Promise))(function(resolve3, reject) {
+    return new (P || (P = Promise))(function(resolve4, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -21120,7 +21120,7 @@ var require_node_transport = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve4(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -21179,8 +21179,8 @@ var require_node_transport = __commonJS((exports) => {
   var net_1 = __require("net");
   var util_1 = require_util();
   var tls_1 = __require("tls");
-  var { resolve: resolve2 } = __require("path");
-  var { readFile: readFile2, existsSync: existsSync6 } = __require("fs");
+  var { resolve: resolve3 } = __require("path");
+  var { readFile: readFile2, existsSync: existsSync7 } = __require("fs");
   var dns = __require("dns");
   var VERSION2 = "2.29.3";
   var LANG = "nats.js";
@@ -21295,8 +21295,8 @@ var require_node_transport = __commonJS((exports) => {
       }
       const d = (0, nats_base_client_1.deferred)();
       try {
-        fn = resolve2(fn);
-        if (!existsSync6(fn)) {
+        fn = resolve3(fn);
+        if (!existsSync7(fn)) {
           d.reject(new Error(`${fn} doesn't exist`));
         }
         readFile2(fn, (err, data2) => {
@@ -23511,7 +23511,7 @@ var require_pushgateway = __commonJS((exports, module) => {
     const options = Object.assign(requestParams, this.requestOptions, {
       method
     });
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       if (method === "DELETE" && options.headers) {
         delete options.headers["Content-Encoding"];
       }
@@ -23525,7 +23525,7 @@ var require_pushgateway = __commonJS((exports, module) => {
           if (resp.statusCode >= 400) {
             reject(new Error(`push failed with status ${resp.statusCode}, ${body}`));
           } else {
-            resolve2({ resp, body });
+            resolve3({ resp, body });
           }
         });
       });
@@ -25829,7 +25829,7 @@ var require_cluster = __commonJS((exports, module) => {
     }
     clusterMetrics() {
       const requestId = requestCtr++;
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve3, reject) => {
         let settled = false;
         function done(err, result) {
           if (settled)
@@ -25838,7 +25838,7 @@ var require_cluster = __commonJS((exports, module) => {
           if (err)
             reject(err);
           else
-            resolve2(result);
+            resolve3(result);
         }
         const request = {
           responses: [],
@@ -28542,8 +28542,8 @@ var require_promise = __commonJS((exports) => {
     _resolve;
     _reject;
     constructor() {
-      this._promise = new Promise((resolve3, reject) => {
-        this._resolve = resolve3;
+      this._promise = new Promise((resolve4, reject) => {
+        this._resolve = resolve4;
         this._reject = reject;
       });
     }
@@ -28631,10 +28631,10 @@ var require_exporter = __commonJS((exports) => {
   var api_1 = require_src();
   var suppress_tracing_1 = require_suppress_tracing();
   function _export(exporter, arg) {
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       api_1.context.with((0, suppress_tracing_1.suppressTracing)(api_1.context.active()), () => {
         exporter.export(arg, (result) => {
-          resolve3(result);
+          resolve4(result);
         });
       });
     });
@@ -30879,8 +30879,8 @@ var require_import_in_the_middle = __commonJS((exports, module) => {
     }).unref();
     function waitForAllMessagesAcknowledged() {
       const timer = setInterval(() => {}, 1000);
-      const promise = new Promise((resolve3) => {
-        resolveFn = resolve3;
+      const promise = new Promise((resolve4) => {
+        resolveFn = resolve4;
       }).then(() => {
         clearInterval(timer);
       });
@@ -33508,7 +33508,7 @@ var require_string = __commonJS((exports) => {
   Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
   var is = require_is();
   var stacktrace = require_stacktrace();
-  function truncate3(str, max = 0) {
+  function truncate4(str, max = 0) {
     if (typeof str !== "string" || max === 0) {
       return str;
     }
@@ -33581,7 +33581,7 @@ var require_string = __commonJS((exports) => {
   exports.safeJoin = safeJoin;
   exports.snipLine = snipLine;
   exports.stringMatchesSomePattern = stringMatchesSomePattern;
-  exports.truncate = truncate3;
+  exports.truncate = truncate4;
 });
 
 // ../../node_modules/.bun/@sentry+core@10.43.0/node_modules/@sentry/core/build/cjs/utils/misc.js
@@ -36769,8 +36769,8 @@ var require_syncpromise = __commonJS((exports) => {
   var STATE_RESOLVED = 1;
   var STATE_REJECTED = 2;
   function resolvedSyncPromise(value) {
-    return new SyncPromise((resolve3) => {
-      resolve3(value);
+    return new SyncPromise((resolve4) => {
+      resolve4(value);
     });
   }
   function rejectedSyncPromise(reason) {
@@ -36786,15 +36786,15 @@ var require_syncpromise = __commonJS((exports) => {
       this._runExecutor(executor);
     }
     then(onfulfilled, onrejected) {
-      return new SyncPromise((resolve3, reject) => {
+      return new SyncPromise((resolve4, reject) => {
         this._handlers.push([
           false,
           (result) => {
             if (!onfulfilled) {
-              resolve3(result);
+              resolve4(result);
             } else {
               try {
-                resolve3(onfulfilled(result));
+                resolve4(onfulfilled(result));
               } catch (e) {
                 reject(e);
               }
@@ -36805,7 +36805,7 @@ var require_syncpromise = __commonJS((exports) => {
               reject(reason);
             } else {
               try {
-                resolve3(onrejected(reason));
+                resolve4(onrejected(reason));
               } catch (e) {
                 reject(e);
               }
@@ -36819,7 +36819,7 @@ var require_syncpromise = __commonJS((exports) => {
       return this.then((val) => val, onrejected);
     }
     finally(onfinally) {
-      return new SyncPromise((resolve3, reject) => {
+      return new SyncPromise((resolve4, reject) => {
         let val;
         let isRejected;
         return this.then((value) => {
@@ -36839,7 +36839,7 @@ var require_syncpromise = __commonJS((exports) => {
             reject(val);
             return;
           }
-          resolve3(val);
+          resolve4(val);
         });
       });
     }
@@ -36868,21 +36868,21 @@ var require_syncpromise = __commonJS((exports) => {
           return;
         }
         if (is.isThenable(value)) {
-          value.then(resolve3, reject);
+          value.then(resolve4, reject);
           return;
         }
         this._state = state;
         this._value = value;
         this._executeHandlers();
       };
-      const resolve3 = (value) => {
+      const resolve4 = (value) => {
         setResult(STATE_RESOLVED, value);
       };
       const reject = (reason) => {
         setResult(STATE_REJECTED, reason);
       };
       try {
-        executor(resolve3, reject);
+        executor(resolve4, reject);
       } catch (e) {
         reject(e);
       }
@@ -38133,7 +38133,7 @@ var require_promisebuffer = __commonJS((exports) => {
       }
       const promises = [
         drainPromise,
-        new Promise((resolve3) => timer.safeUnref(setTimeout(() => resolve3(false), timeout)))
+        new Promise((resolve4) => timer.safeUnref(setTimeout(() => resolve4(false), timeout)))
       ];
       return Promise.race(promises);
     }
@@ -38675,7 +38675,7 @@ var require_client = __commonJS((exports) => {
     async _isClientDoneProcessing(timeout) {
       let ticked = 0;
       while (!timeout || ticked < timeout) {
-        await new Promise((resolve3) => setTimeout(resolve3, 1));
+        await new Promise((resolve4) => setTimeout(resolve4, 1));
         if (!this._numProcessing) {
           return true;
         }
@@ -41092,7 +41092,7 @@ var require_path = __commonJS((exports) => {
     const parts = splitPathRe.exec(truncated);
     return parts ? parts.slice(1) : [];
   }
-  function resolve3(...args) {
+  function resolve4(...args) {
     let resolvedPath = "";
     let resolvedAbsolute = false;
     for (let i = args.length - 1;i >= -1 && !resolvedAbsolute; i--) {
@@ -41125,8 +41125,8 @@ var require_path = __commonJS((exports) => {
     return arr.slice(start, end - start + 1);
   }
   function relative(from, to) {
-    from = resolve3(from).slice(1);
-    to = resolve3(to).slice(1);
+    from = resolve4(from).slice(1);
+    to = resolve4(to).slice(1);
     const fromParts = trim(from.split("/"));
     const toParts = trim(to.split("/"));
     const length = Math.min(fromParts.length, toParts.length);
@@ -41159,7 +41159,7 @@ var require_path = __commonJS((exports) => {
   function isAbsolute(path) {
     return path.charAt(0) === "/";
   }
-  function join9(...args) {
+  function join10(...args) {
     return normalizePath(args.join("/"));
   }
   function dirname6(path) {
@@ -41184,10 +41184,10 @@ var require_path = __commonJS((exports) => {
   exports.basename = basename6;
   exports.dirname = dirname6;
   exports.isAbsolute = isAbsolute;
-  exports.join = join9;
+  exports.join = join10;
   exports.normalizePath = normalizePath;
   exports.relative = relative;
-  exports.resolve = resolve3;
+  exports.resolve = resolve4;
 });
 
 // ../../node_modules/.bun/@sentry+core@10.43.0/node_modules/@sentry/core/build/cjs/integrations/rewriteframes.js
@@ -49627,8 +49627,8 @@ var require_promise2 = __commonJS((exports) => {
     _resolve;
     _reject;
     constructor() {
-      this._promise = new Promise((resolve3, reject) => {
-        this._resolve = resolve3;
+      this._promise = new Promise((resolve4, reject) => {
+        this._resolve = resolve4;
         this._reject = reject;
       });
     }
@@ -49716,9 +49716,9 @@ var require_exporter2 = __commonJS((exports) => {
   var api_1 = require_src();
   var suppress_tracing_1 = require_suppress_tracing2();
   function _export(exporter, arg) {
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       api_1.context.with((0, suppress_tracing_1.suppressTracing)(api_1.context.active()), () => {
-        exporter.export(arg, resolve3);
+        exporter.export(arg, resolve4);
       });
     });
   }
@@ -52199,14 +52199,14 @@ var require_BatchSpanProcessorBase = __commonJS((exports) => {
       this._maybeStartTimer();
     }
     _flushAll() {
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         const promises = [];
         const count = Math.ceil(this._finishedSpans.length / this._maxExportBatchSize);
         for (let i = 0, j = count;i < j; i++) {
           promises.push(this._flushOneBatch());
         }
         Promise.all(promises).then(() => {
-          resolve3();
+          resolve4();
         }).catch(reject);
       });
     }
@@ -52215,7 +52215,7 @@ var require_BatchSpanProcessorBase = __commonJS((exports) => {
       if (this._finishedSpans.length === 0) {
         return Promise.resolve();
       }
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         const timer = setTimeout(() => {
           reject(new Error("Timeout"));
         }, this._exportTimeoutMillis);
@@ -52230,7 +52230,7 @@ var require_BatchSpanProcessorBase = __commonJS((exports) => {
           const doExport = () => this._exporter.export(spans, (result) => {
             clearTimeout(timer);
             if (result.code === core_1.ExportResultCode.SUCCESS) {
-              resolve3();
+              resolve4();
             } else {
               reject(result.error ?? new Error("BatchSpanProcessor: span export failed"));
             }
@@ -52574,12 +52574,12 @@ var require_MultiSpanProcessor = __commonJS((exports) => {
       for (const spanProcessor of this._spanProcessors) {
         promises.push(spanProcessor.forceFlush());
       }
-      return new Promise((resolve3) => {
+      return new Promise((resolve4) => {
         Promise.all(promises).then(() => {
-          resolve3();
+          resolve4();
         }).catch((error2) => {
           (0, core_1.globalErrorHandler)(error2 || new Error("MultiSpanProcessor: forceFlush failed"));
-          resolve3();
+          resolve4();
         });
       });
     }
@@ -52605,9 +52605,9 @@ var require_MultiSpanProcessor = __commonJS((exports) => {
       for (const spanProcessor of this._spanProcessors) {
         promises.push(spanProcessor.shutdown());
       }
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         Promise.all(promises).then(() => {
-          resolve3();
+          resolve4();
         }, reject);
       });
     }
@@ -52660,32 +52660,32 @@ var require_BasicTracerProvider = __commonJS((exports) => {
     forceFlush() {
       const timeout = this._config.forceFlushTimeoutMillis;
       const promises = this._activeSpanProcessor["_spanProcessors"].map((spanProcessor) => {
-        return new Promise((resolve3) => {
+        return new Promise((resolve4) => {
           let state;
           const timeoutInterval = setTimeout(() => {
-            resolve3(new Error(`Span processor did not completed within timeout period of ${timeout} ms`));
+            resolve4(new Error(`Span processor did not completed within timeout period of ${timeout} ms`));
             state = ForceFlushState.timeout;
           }, timeout);
           spanProcessor.forceFlush().then(() => {
             clearTimeout(timeoutInterval);
             if (state !== ForceFlushState.timeout) {
               state = ForceFlushState.resolved;
-              resolve3(state);
+              resolve4(state);
             }
           }).catch((error2) => {
             clearTimeout(timeoutInterval);
             state = ForceFlushState.error;
-            resolve3(error2);
+            resolve4(error2);
           });
         });
       });
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         Promise.all(promises).then((results) => {
           const errors3 = results.filter((result) => result !== ForceFlushState.resolved);
           if (errors3.length > 0) {
             reject(errors3);
           } else {
-            resolve3();
+            resolve4();
           }
         }).catch((error2) => reject([error2]));
       });
@@ -54543,13 +54543,13 @@ var require_context3 = __commonJS((exports) => {
       version: `10.${Number(os3.release().split(".")[0]) - 4}`
     };
     try {
-      const output = await new Promise((resolve3, reject) => {
+      const output = await new Promise((resolve4, reject) => {
         node_child_process.execFile("/usr/bin/sw_vers", (error2, stdout) => {
           if (error2) {
             reject(error2);
             return;
           }
-          resolve3(stdout);
+          resolve4(stdout);
         });
       });
       darwinInfo.name = matchFirst(/^ProductName:\s+(.*)$/m, output);
@@ -54726,14 +54726,14 @@ var require_contextlines = __commonJS((exports) => {
     return out;
   }
   function getContextLinesFromFile(path, ranges, output) {
-    return new Promise((resolve3, _reject) => {
+    return new Promise((resolve4, _reject) => {
       const stream = node_fs.createReadStream(path);
       const lineReaded = node_readline.createInterface({
         input: stream
       });
       function destroyStreamAndResolve() {
         stream.destroy();
-        resolve3();
+        resolve4();
       }
       let lineNumber = 0;
       let currentRangeIndex = 0;
@@ -55876,7 +55876,7 @@ var require_parse_proxy_response = __commonJS((exports) => {
     core.debug.log("[https-proxy-agent:parse-proxy-response]", ...args);
   }
   function parseProxyResponse(socket) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       let buffersLength = 0;
       const buffers = [];
       function read() {
@@ -55945,7 +55945,7 @@ var require_parse_proxy_response = __commonJS((exports) => {
         }
         debugLog("got proxy server response: %o %o", firstLine, headers);
         cleanup();
-        resolve3({
+        resolve4({
           connect: {
             statusCode,
             statusText,
@@ -56121,7 +56121,7 @@ var require_http3 = __commonJS((exports) => {
   function createRequestExecutor(options3, httpModule, agent3) {
     const { hostname, pathname, port, protocol, search } = new URL(options3.url);
     return function makeRequest(request) {
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         core.suppressTracing(() => {
           let body = streamFromBody(request.body);
           const headers = { ...options3.headers };
@@ -56145,7 +56145,7 @@ var require_http3 = __commonJS((exports) => {
             res.setEncoding("utf8");
             const retryAfterHeader = res.headers["retry-after"] ?? null;
             const rateLimitsHeader = res.headers["x-sentry-rate-limits"] ?? null;
-            resolve3({
+            resolve4({
               statusCode: res.statusCode,
               headers: {
                 "retry-after": retryAfterHeader,
@@ -58261,7 +58261,7 @@ var require_instrumentation3 = __commonJS((exports) => {
       };
       const functionWithOriginalProperties = patchedFunctionWithOriginalProperties(patchedFunction, original);
       const promisified = function(path) {
-        return new Promise((resolve3) => functionWithOriginalProperties(path, resolve3));
+        return new Promise((resolve4) => functionWithOriginalProperties(path, resolve4));
       };
       Object.defineProperty(promisified, "name", { value: functionName });
       Object.defineProperty(functionWithOriginalProperties, util_1.promisify.custom, {
@@ -67720,11 +67720,11 @@ var require_instrumentation17 = __commonJS((exports) => {
           }
           if (result instanceof Promise) {
             return result.then((result2) => {
-              return new Promise((resolve3) => {
+              return new Promise((resolve4) => {
                 utils.handleExecutionResult(plugin.getConfig(), span, result2);
                 recordDuration();
                 span.end();
-                resolve3(result2);
+                resolve4(result2);
               });
             }).catch((error2) => {
               return new Promise((_2, reject) => {
@@ -71545,18 +71545,18 @@ var require_instrumentation25 = __commonJS((exports) => {
       return `00-${sc.traceId}-${sc.spanId}-0${Number(sc.traceFlags || api.TraceFlags.NONE).toString(16)}`;
     }
     _injectContextInfo(connection, tediousModule, traceparent) {
-      return new Promise((resolve3) => {
+      return new Promise((resolve4) => {
         try {
           const sql = "set context_info @opentelemetry_traceparent";
           const req = new tediousModule.Request(sql, (_err) => {
-            resolve3();
+            resolve4();
           });
           Object.defineProperty(req, exports.INJECTED_CTX, { value: true });
           const buf = Buffer.from(traceparent, "utf8");
           req.addParameter("opentelemetry_traceparent", tediousModule.TYPES.VarBinary, buf, { length: buf.length });
           connection.execSql(req);
         } catch {
-          resolve3();
+          resolve4();
         }
       });
     }
@@ -76887,7 +76887,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260405.2",
+  version: "2.260406.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -77794,6 +77794,44 @@ function pm2NotFoundError() {
   Then retry: omni start`, undefined, 1);
 }
 
+// src/runtime-env.ts
+import { join as join3 } from "path";
+var LEGACY_DEFAULT_DATABASE_URL = "postgresql://postgres:postgres@localhost:5432/omni";
+var DEFAULT_PGSERVE_PORT = 8432;
+function buildEmbeddedDatabaseUrl(pgservePort = DEFAULT_PGSERVE_PORT) {
+  return `postgresql://postgres:postgres@localhost:${pgservePort}/omni`;
+}
+function resolvePgservePort(serverConfig) {
+  const maybe = serverConfig.pgservePort;
+  if (typeof maybe === "number" && Number.isFinite(maybe) && maybe > 0) {
+    return maybe;
+  }
+  return DEFAULT_PGSERVE_PORT;
+}
+function resolveDatabaseUrl(serverConfig) {
+  const stored = serverConfig.databaseUrl?.trim() ?? "";
+  if (stored && stored !== LEGACY_DEFAULT_DATABASE_URL) {
+    return stored;
+  }
+  return buildEmbeddedDatabaseUrl(resolvePgservePort(serverConfig));
+}
+function buildRuntimeEnv(serverConfig, cliConfig) {
+  const pgservePort = resolvePgservePort(serverConfig);
+  return {
+    API_PORT: String(serverConfig.port),
+    DATABASE_URL: resolveDatabaseUrl(serverConfig),
+    OMNI_API_KEY: cliConfig.apiKey ?? "",
+    MEDIA_STORAGE_PATH: join3(serverConfig.dataDir, "media"),
+    OMNI_PACKAGES_DIR: join3(serverConfig.dataDir, "packages"),
+    PGSERVE_EMBEDDED: "true",
+    PGSERVE_DATA: join3(serverConfig.dataDir, "pgserve"),
+    PGSERVE_PORT: String(pgservePort),
+    NATS_URL: "nats://localhost:4222",
+    NODE_ENV: serverConfig.nodeEnv,
+    LOG_LEVEL: serverConfig.logLevel
+  };
+}
+
 // src/utils/keys.ts
 function generateApiKey() {
   const bytes = new Uint8Array(16);
@@ -77844,8 +77882,11 @@ async function restartApiWithNewKey(newKey) {
     if (!proc) {
       continue;
     }
+    const serverConfig = loadServerConfig();
+    const cliConfig = loadConfig();
+    const runtimeEnv = { ...buildRuntimeEnv(serverConfig, cliConfig), OMNI_API_KEY: newKey };
     await runPm2(["set", `${name}:OMNI_API_KEY`, newKey]);
-    const restartCode = await runPm2(["restart", name, "--update-env"], { OMNI_API_KEY: newKey });
+    const restartCode = await runPm2(["restart", name], runtimeEnv);
     return { success: restartCode === 0, processName: name };
   }
   return { success: false, processName: null };
@@ -77880,9 +77921,9 @@ function printManualInstructions(newKey) {
   raw(`       omni auth login --api-key ${key}`);
   raw("");
   raw("  3. Or to rotate to a new key:");
-  raw("     a. Stop the API:  pm2 stop omni-v2-api");
+  raw("     a. Stop the API:  omni stop");
   raw("     b. Delete primary key from DB manually");
-  raw(`     c. Restart with:  OMNI_API_KEY=${key} pm2 restart omni-v2-api --update-env`);
+  raw(`     c. Restart:       OMNI_API_KEY=${key} omni start`);
   raw(`     d. Login:         omni auth login --api-key ${key}`);
   raw("");
 }
@@ -77953,8 +77994,9 @@ async function handleRotationSuccess(apiUrl, newKey, processName, apiUrlOverride
   warn("Config updated with new key, but validation failed.");
   raw("");
   raw("  The API may still be starting up, or the primary key was not deleted from DB.");
-  raw("  If the primary key row still exists in the database, delete it and restart:");
-  raw(`    pm2 restart ${processName} --update-env`);
+  raw("  If the primary key row still exists in the database, delete it and run:");
+  raw("    omni restart");
+  raw("  Or diagnose with: omni doctor --fix");
   raw("  Then verify with: omni status");
   raw("");
   console.log(`  New key (save this): ${newKey}`);
@@ -79935,7 +79977,7 @@ async function findOrCreateAgent(client, agentName, providerId) {
   }
 }
 function createConnectCommand() {
-  return new Command("connect").description("Connect an Omni instance to a Genie agent via NATS").argument("<instance-id>", "Omni instance ID").argument("<agent-name>", "Genie agent name (from genie directory)").option("--nats-url <url>", "NATS server URL", "localhost:4222").action(async (instanceId, agentName, options) => {
+  return new Command("connect").description("Connect an Omni instance to a Genie agent via NATS").argument("<instance-id>", "Omni instance ID").argument("<agent-name>", "Genie agent name (from genie directory)").option("--nats-url <url>", "NATS server URL", "localhost:4222").option("--mode <mode>", "Trigger mode: turn-based (round-trip) or fire-and-forget", "turn-based").option("--reply-filter <filter>", "Reply filter: all (reply to everything) or filtered", "all").action(async (instanceId, agentName, options) => {
     const client = getClient();
     info(`Discovering agent "${agentName}" from genie directory...`);
     let agentEntry;
@@ -79967,20 +80009,33 @@ Make sure genie is installed and the agent is registered:
     const agentId = await findOrCreateAgent(client, agentName, providerId);
     if (!agentId)
       return;
+    const triggerMode = options.mode === "turn-based" ? "round-trip" : "fire-and-forget";
+    const replyFilterMode = options.replyFilter;
+    const agentReplyFilter = { mode: replyFilterMode, conditions: {} };
     info("Updating instance agent assignment...");
     try {
-      await client.instances.update(instanceId, { agentProviderId: providerId });
+      await client.instances.update(instanceId, {
+        agentId,
+        agentProviderId: providerId,
+        agentReplyFilter,
+        triggerMode
+      });
     } catch {
       warn("Could not update instance agent assignment automatically.");
-      info(`Set manually: omni instances update ${instanceId} --agent-provider-id ${providerId}`);
+      info(`Set manually: omni instances update ${instanceId} --agent-id ${agentId} --agent-provider-id ${providerId}`);
+      return;
     }
-    success(`Connected instance "${instanceId}" to genie agent "${agentName}".
-  NATS topics:
-    Inbound:  omni.message.${instanceId}.*
-    Outbound: omni.reply.${instanceId}.*
-
-  Next: Start the genie bridge:
-    genie omni start`);
+    success(`Connected instance "${instanceId}" to genie agent "${agentName}".`);
+    header("Configuration Summary");
+    keyValue("Agent ID", agentId);
+    keyValue("Provider ID", providerId);
+    keyValue("Reply Filter", replyFilterMode);
+    keyValue("Trigger Mode", `${triggerMode} (--mode ${options.mode})`);
+    header("NATS Topics");
+    keyValue("Inbound", `omni.message.${instanceId}.*`);
+    keyValue("Outbound", `omni.reply.${instanceId}.*`);
+    header("Next Step");
+    info("Start the genie bridge:  genie omni start");
   });
 }
 
@@ -80074,59 +80129,476 @@ function createDeadLettersCommand() {
   return deadLetters;
 }
 
+// src/commands/doctor.ts
+import { existsSync as existsSync3, readdirSync, statSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join5, resolve } from "path";
+init_config();
+
+// src/health.ts
+var DEFAULT_API_PORT = 8882;
+var HEALTH_TIMEOUT_MS = 15000;
+var HEALTH_POLL_INTERVAL_MS = 500;
+function getHealthCheckUrl(port) {
+  return `http://localhost:${port}/api/v2/health`;
+}
+async function waitForHealth(port, timeoutMs = HEALTH_TIMEOUT_MS) {
+  const healthCheckUrl = getHealthCheckUrl(port);
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      const resp = await fetch(healthCheckUrl, { signal: AbortSignal.timeout(1000) });
+      if (resp.ok)
+        return true;
+    } catch {}
+    await Bun.sleep(HEALTH_POLL_INTERVAL_MS);
+  }
+  return false;
+}
+
+// src/commands/doctor.ts
+init_output();
+
+// src/server-bundle.ts
+init_output();
+import { dirname as dirname2, join as join4 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function getServerBundlePath() {
+  try {
+    const thisFile = fileURLToPath2(import.meta.url);
+    const distDir = dirname2(thisFile);
+    return join4(distDir, "server", "index.js");
+  } catch {
+    return join4(process.cwd(), "dist", "server", "index.js");
+  }
+}
+function getServerLauncherPath() {
+  try {
+    const thisFile = fileURLToPath2(import.meta.url);
+    const distDir = dirname2(thisFile);
+    return join4(distDir, "..", "bin", "omni-server");
+  } catch {
+    return join4(process.cwd(), "bin", "omni-server");
+  }
+}
+function bundleNotFoundError(bundlePath) {
+  error(`Server bundle not found at: ${bundlePath}
+  This command requires @automagik/omni installed from npm.
+  Install: bun add -g @automagik/omni
+  Or build locally: make cli-build-full`, undefined, 1);
+}
+
+// src/commands/doctor.ts
+async function getPm2Processes2() {
+  const { code, stdout } = await capturePm2("jlist");
+  if (code !== 0 || !stdout.trim()) {
+    return null;
+  }
+  try {
+    return JSON.parse(stdout);
+  } catch {
+    return null;
+  }
+}
+function readPm2EnvKey(entry, key) {
+  if (!entry.pm2_env)
+    return;
+  const nested = entry.pm2_env.env?.[key];
+  if (typeof nested === "string")
+    return nested;
+  const flat = entry.pm2_env[key];
+  if (typeof flat === "string")
+    return flat;
+  return;
+}
+function productionDeps() {
+  return {
+    getPm2Processes: getPm2Processes2,
+    canConnect: async (port) => {
+      try {
+        const socket = await Bun.connect({
+          hostname: "127.0.0.1",
+          port,
+          socket: { data() {} }
+        });
+        socket.end();
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    omniDbExists: async () => {
+      try {
+        const serverConfig = loadServerConfig();
+        const resp = await fetch(getHealthCheckUrl(serverConfig.port), {
+          signal: AbortSignal.timeout(1500),
+          headers: { "Accept-Encoding": "identity" }
+        });
+        if (!resp.ok)
+          return false;
+        const body = await resp.json();
+        return body?.checks?.database?.status === "ok";
+      } catch {
+        return false;
+      }
+    },
+    findOrphanedDataDirs: () => {
+      const roots = [process.cwd(), join5(homedir2(), "workspace"), join5(homedir2(), "repos")];
+      const found = [];
+      for (const root of roots) {
+        if (!existsSync3(root))
+          continue;
+        try {
+          scanForOrphans(root, found, 0);
+        } catch {}
+      }
+      return found;
+    },
+    fetchHealthVersion: async (apiPort) => {
+      try {
+        const resp = await fetch(getHealthCheckUrl(apiPort), {
+          signal: AbortSignal.timeout(1500),
+          headers: { "Accept-Encoding": "identity" }
+        });
+        if (!resp.ok)
+          return null;
+        const body = await resp.json();
+        return body.version ?? null;
+      } catch {
+        return null;
+      }
+    },
+    validateStoredKey: async (apiPort) => {
+      const cliConfig = loadConfig();
+      if (!cliConfig.apiKey)
+        return false;
+      const baseUrl = cliConfig.apiUrl ?? `http://localhost:${apiPort}`;
+      try {
+        const client = createOmniClient({ baseUrl, apiKey: cliConfig.apiKey, cliVersion: VERSION });
+        const result = await client.auth.validate();
+        return result.valid === true;
+      } catch {
+        return false;
+      }
+    },
+    loadState: () => ({
+      serverConfig: loadServerConfig(),
+      cliConfig: loadConfig()
+    }),
+    runPm2,
+    saveCliConfig: saveConfig,
+    reloadCliConfig: loadConfig,
+    generateApiKey,
+    sleepMs: (ms) => Bun.sleep(ms)
+  };
+}
+function scanForOrphans(dir, acc, depth, maxDepth = 4) {
+  if (depth > maxDepth)
+    return;
+  let entries;
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return;
+  }
+  for (const name of entries) {
+    if (name === "node_modules" || name === ".git")
+      continue;
+    const full = join5(dir, name);
+    let stats;
+    try {
+      stats = statSync(full);
+    } catch {
+      continue;
+    }
+    if (!stats.isDirectory())
+      continue;
+    if (name === ".pgserve-data") {
+      acc.push(resolve(full));
+      continue;
+    }
+    scanForOrphans(full, acc, depth + 1, maxDepth);
+  }
+}
+async function checkPm2EnvDrift(deps) {
+  const processes = await deps.getPm2Processes();
+  if (!processes) {
+    return { id: "pm2-env-drift", level: "WARN", detail: "pm2 not reachable \u2014 cannot compare env" };
+  }
+  const apiEntry = processes.find((p) => p.name === PM2_PROCESSES.api);
+  if (!apiEntry) {
+    return { id: "pm2-env-drift", level: "WARN", detail: `${PM2_PROCESSES.api} not found in pm2` };
+  }
+  const { serverConfig, cliConfig } = deps.loadState();
+  const expected = buildRuntimeEnv(serverConfig, cliConfig);
+  const storedDbUrl = readPm2EnvKey(apiEntry, "DATABASE_URL");
+  const storedPgserveData = readPm2EnvKey(apiEntry, "PGSERVE_DATA");
+  if (storedPgserveData && storedPgserveData !== expected.PGSERVE_DATA) {
+    return {
+      id: "pm2-env-drift",
+      level: "FAIL",
+      detail: `PGSERVE_DATA drift: pm2="${storedPgserveData}" expected="${expected.PGSERVE_DATA}"`
+    };
+  }
+  if (storedDbUrl && storedDbUrl !== expected.DATABASE_URL) {
+    return {
+      id: "pm2-env-drift",
+      level: "WARN",
+      detail: `DATABASE_URL drift: pm2="${storedDbUrl}" expected="${expected.DATABASE_URL}"`
+    };
+  }
+  return { id: "pm2-env-drift", level: "OK", detail: "pm2 stored env matches config" };
+}
+async function checkCliKeyValid(deps) {
+  const { serverConfig } = deps.loadState();
+  const valid = await deps.validateStoredKey(serverConfig.port);
+  if (valid) {
+    return { id: "cli-key-valid", level: "OK", detail: "stored CLI key validates against server" };
+  }
+  return { id: "cli-key-valid", level: "FAIL", detail: "stored CLI key does not validate" };
+}
+async function checkPgserveReachable(deps) {
+  const { serverConfig } = deps.loadState();
+  const port = resolvePgservePort(serverConfig);
+  const ok = await deps.canConnect(port);
+  if (ok) {
+    return { id: "pgserve-reachable", level: "OK", detail: `pgserve listening on :${port}` };
+  }
+  return { id: "pgserve-reachable", level: "FAIL", detail: `cannot connect to pgserve on :${port}` };
+}
+async function checkOmniDbExists(deps) {
+  const exists = await deps.omniDbExists();
+  if (exists) {
+    return { id: "omni-db-exists", level: "OK", detail: "omni database is reachable" };
+  }
+  return { id: "omni-db-exists", level: "FAIL", detail: "omni database is not reachable" };
+}
+function checkOrphanedDataDirs(deps) {
+  const found = deps.findOrphanedDataDirs();
+  if (found.length === 0) {
+    return { id: "orphaned-data-dirs", level: "OK", detail: "no orphaned data directories found" };
+  }
+  return {
+    id: "orphaned-data-dirs",
+    level: "WARN",
+    detail: `orphaned data dirs: ${found.join(", ")}`
+  };
+}
+async function checkVersionMatch(deps) {
+  const { serverConfig } = deps.loadState();
+  const serverVersion = await deps.fetchHealthVersion(serverConfig.port);
+  if (!serverVersion) {
+    return { id: "version-match", level: "WARN", detail: "could not reach /api/v2/health" };
+  }
+  const cliClean = VERSION.split("+")[0];
+  const serverClean = serverVersion.split("+")[0];
+  if (cliClean === serverClean) {
+    return { id: "version-match", level: "OK", detail: `cli=v${cliClean} server=v${serverClean}` };
+  }
+  return {
+    id: "version-match",
+    level: "WARN",
+    detail: `version mismatch: cli=v${cliClean} server=v${serverClean}`
+  };
+}
+async function checkPm2Status(deps) {
+  const processes = await deps.getPm2Processes();
+  if (!processes) {
+    return { id: "pm2-status", level: "WARN", detail: "pm2 not reachable" };
+  }
+  const api = processes.find((p) => p.name === PM2_PROCESSES.api);
+  const nats = processes.find((p) => p.name === PM2_PROCESSES.nats);
+  const apiStatus = api?.pm2_env?.status ?? "missing";
+  const natsStatus = nats?.pm2_env?.status ?? "missing";
+  if (apiStatus === "online" && natsStatus === "online") {
+    return { id: "pm2-status", level: "OK", detail: "omni-api and omni-nats online" };
+  }
+  return {
+    id: "pm2-status",
+    level: "FAIL",
+    detail: `pm2 status: omni-api=${apiStatus} omni-nats=${natsStatus}`
+  };
+}
+async function fixPm2EnvDrift(deps) {
+  const { serverConfig, cliConfig } = deps.loadState();
+  const env2 = buildRuntimeEnv(serverConfig, cliConfig);
+  await deps.runPm2(["delete", PM2_PROCESSES.api], env2);
+  const launcherPath = getServerLauncherPath();
+  const startCode = await deps.runPm2(["start", launcherPath, "--name", PM2_PROCESSES.api, "--interpreter", "bash"], env2);
+  if (startCode !== 0) {
+    throw new Error(`pm2 start ${PM2_PROCESSES.api} exited ${startCode}`);
+  }
+  return `relaunched ${PM2_PROCESSES.api} with sanitized env`;
+}
+async function fixCliKeyValid(deps) {
+  const { serverConfig, cliConfig } = deps.loadState();
+  const newKey = deps.generateApiKey();
+  const env2 = { ...buildRuntimeEnv(serverConfig, { ...cliConfig, apiKey: newKey }), OMNI_API_KEY: newKey };
+  await deps.runPm2(["set", `${PM2_PROCESSES.api}:OMNI_API_KEY`, newKey]);
+  const restartCode = await deps.runPm2(["restart", PM2_PROCESSES.api], env2);
+  if (restartCode !== 0) {
+    throw new Error(`pm2 restart ${PM2_PROCESSES.api} exited ${restartCode}`);
+  }
+  await deps.sleepMs(1000);
+  const valid = await deps.validateStoredKey(serverConfig.port);
+  if (!valid) {
+    const updated2 = deps.reloadCliConfig();
+    updated2.apiKey = newKey;
+    deps.saveCliConfig(updated2);
+    throw new Error("rotated key does not validate; manually delete __primary__ from api_keys and rerun");
+  }
+  const updated = deps.reloadCliConfig();
+  updated.apiKey = newKey;
+  deps.saveCliConfig(updated);
+  return "rotated CLI key and re-validated";
+}
+function fixOrphanedDataDirs(deps) {
+  const found = deps.findOrphanedDataDirs();
+  if (found.length === 0) {
+    return "no orphaned data dirs to clean";
+  }
+  raw("");
+  warn("Review these commands before running them \u2014 orphaned dirs are not auto-deleted:");
+  for (const dir of found) {
+    raw(`  rm -rf ${dir}`);
+  }
+  raw("");
+  return `printed ${found.length} rm-rf suggestion(s)`;
+}
+async function runAllChecks(deps) {
+  return [
+    await checkPm2EnvDrift(deps),
+    await checkCliKeyValid(deps),
+    await checkPgserveReachable(deps),
+    await checkOmniDbExists(deps),
+    checkOrphanedDataDirs(deps),
+    await checkVersionMatch(deps),
+    await checkPm2Status(deps)
+  ];
+}
+async function applyFix(deps, check) {
+  try {
+    if (check.id === "pm2-env-drift")
+      return await fixPm2EnvDrift(deps);
+    if (check.id === "cli-key-valid")
+      return await fixCliKeyValid(deps);
+    if (check.id === "orphaned-data-dirs")
+      return fixOrphanedDataDirs(deps);
+    return null;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return `FAILED ${check.id}: ${msg}`;
+  }
+}
+function summarizeChecks(checks) {
+  const summary = { ok: 0, warn: 0, fail: 0 };
+  for (const c2 of checks) {
+    if (c2.level === "OK")
+      summary.ok++;
+    else if (c2.level === "WARN")
+      summary.warn++;
+    else
+      summary.fail++;
+  }
+  return summary;
+}
+async function runDoctor(options, depsOverride) {
+  const deps = depsOverride ?? productionDeps();
+  let checks = await runAllChecks(deps);
+  const fixesApplied = [];
+  if (options.fix) {
+    for (const check of checks) {
+      if (check.level === "OK")
+        continue;
+      const result = await applyFix(deps, check);
+      if (result !== null) {
+        fixesApplied.push(result);
+      }
+    }
+    checks = await runAllChecks(deps);
+  }
+  return { checks, summary: summarizeChecks(checks), fixesApplied };
+}
+function renderHuman(report) {
+  raw("");
+  raw("  omni doctor \u2014 checks:");
+  raw("");
+  for (const check of report.checks) {
+    const marker = check.level === "OK" ? "\u2713" : check.level === "WARN" ? "\u26A0" : "\u2717";
+    raw(`  ${marker} ${check.id.padEnd(20)} ${check.detail}`);
+  }
+  raw("");
+  raw(`  summary: ${report.summary.ok} OK, ${report.summary.warn} WARN, ${report.summary.fail} FAIL`);
+  if (report.fixesApplied.length > 0) {
+    raw("");
+    raw("  fixes applied:");
+    for (const fix of report.fixesApplied) {
+      raw(`    - ${fix}`);
+    }
+  }
+  raw("");
+}
+function createDoctorCommand() {
+  return new Command("doctor").description("Diagnose and repair the embedded omni runtime (env drift, stale keys, version mismatch)").option("--fix", "Attempt to repair WARN/FAIL checks in-place (never touches ~/.omni/data/pgserve)").option("--json", "Emit the full report as structured JSON").option("--verbose", "Include additional diagnostic detail").addHelpText("after", `
+Checks:
+  pm2-env-drift      pm2 stored env vs. buildRuntimeEnv() from config
+  cli-key-valid      CLI-stored key validates against running server
+  pgserve-reachable  TCP connect to embedded pgserve port
+  omni-db-exists     omni database is reachable on embedded pgserve
+  orphaned-data-dirs .pgserve-data directories outside ~/.omni
+  version-match      CLI version vs. /api/v2/health version field
+  pm2-status         omni-api and omni-nats both online in pm2
+
+Safety:
+  --fix NEVER touches ~/.omni/data/pgserve \u2014 it only operates on the pm2
+  process lifecycle, stored env, and ~/.omni/config.json. Data directories
+  are never auto-deleted; orphaned dirs print rm-rf commands for review.
+`).action(async (options) => {
+    if (!await isPm2Available()) {
+      warn("pm2 is not available in PATH \u2014 pm2-dependent checks will be WARN.");
+    }
+    const report = await runDoctor(options);
+    if (options.json === true) {
+      console.log(JSON.stringify(report, null, 2));
+      return;
+    }
+    renderHuman(report);
+    if (report.summary.fail > 0) {
+      process.exit(1);
+    }
+  });
+}
+
 // src/commands/done.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import { basename, extname } from "path";
 
 // src/context.ts
 init_config();
 async function resolveContext(flags) {
-  if (flags?.instance || flags?.chat || flags?.message) {
-    return {
-      instanceId: flags.instance ?? null,
-      chatId: flags.chat ?? null,
-      messageId: flags.message ?? null,
-      source: "flags"
-    };
-  }
+  const flagInstance = flags?.instance;
+  const flagChat = flags?.chat;
+  const flagMessage = flags?.message;
   const envInstance = process.env.OMNI_INSTANCE;
   const envChat = process.env.OMNI_CHAT;
   const envMessage = process.env.OMNI_MESSAGE;
-  if (envInstance || envChat || envMessage) {
-    return {
-      instanceId: envInstance ?? null,
-      chatId: envChat ?? null,
-      messageId: envMessage ?? null,
-      source: "env"
-    };
-  }
+  let apiInstance;
+  let apiChat;
+  let apiMessage;
   try {
     const client = getClient();
     const ctx = await client.context.get();
-    if (ctx.instanceId || ctx.chatId || ctx.messageId) {
-      return {
-        instanceId: ctx.instanceId,
-        chatId: ctx.chatId,
-        messageId: ctx.messageId,
-        source: "api"
-      };
-    }
+    apiInstance = ctx.instanceId ?? undefined;
+    apiChat = ctx.chatId ?? undefined;
+    apiMessage = ctx.messageId ?? undefined;
   } catch {}
   const config = loadConfig();
-  if (config.defaultInstance) {
-    return {
-      instanceId: config.defaultInstance,
-      chatId: null,
-      messageId: null,
-      source: "config"
-    };
-  }
-  return {
-    instanceId: null,
-    chatId: null,
-    messageId: null,
-    source: "none"
-  };
+  const configInstance = config.defaultInstance;
+  const instanceId = flagInstance ?? envInstance ?? apiInstance ?? configInstance ?? null;
+  const chatId = flagChat ?? envChat ?? apiChat ?? null;
+  const messageId = flagMessage ?? envMessage ?? apiMessage ?? null;
+  const source = flagInstance || flagChat || flagMessage ? "flags" : envInstance || envChat || envMessage ? "env" : apiInstance || apiChat || apiMessage ? "api" : configInstance ? "config" : "none";
+  return { instanceId, chatId, messageId, source };
 }
 async function resolveInstanceFromContext(explicitInstance) {
   if (explicitInstance)
@@ -80201,7 +80673,7 @@ async function handleReact(client, ctx, emoji) {
   await closeTurn(client, "react", `Reacted ${emoji} + turn closed`);
 }
 async function handleMedia(client, ctx, mediaPath, caption) {
-  if (!existsSync3(mediaPath)) {
+  if (!existsSync4(mediaPath)) {
     return error(`File not found: ${mediaPath}`);
   }
   try {
@@ -80241,8 +80713,7 @@ function createDoneCommand() {
     const client = getClient();
     const ctx = await resolveContext({
       instance: options.instance,
-      chat: options.chat,
-      message: options.message
+      chat: options.chat
     });
     if (!ctx.instanceId) {
       return error("No instance in context. Set OMNI_INSTANCE, use --instance, or run: omni use <instance>");
@@ -80250,14 +80721,16 @@ function createDoneCommand() {
     if (!ctx.chatId) {
       return error("No chat in context. Set OMNI_CHAT, use --chat, or run: omni open <contact>");
     }
+    const messageId = await resolveReplyTo(options.message);
+    const ctxWithMessage = { ...ctx, messageId };
     if (options.skip)
       return handleSkip(client, options.reason);
     if (options.react)
-      return handleReact(client, ctx, options.react);
+      return handleReact(client, ctxWithMessage, options.react);
     if (options.media)
-      return handleMedia(client, ctx, options.media, options.caption);
+      return handleMedia(client, ctxWithMessage, options.media, options.caption);
     if (text)
-      return handleText(client, ctx, text);
+      return handleText(client, ctxWithMessage, text);
     error('Specify what to do: omni done "text", omni done --media <file>, omni done --react <emoji>, or omni done --skip');
   });
 }
@@ -81473,9 +81946,104 @@ function createFilmCommand() {
   });
 }
 
+// src/commands/history.ts
+init_output();
+function truncate2(str, maxLen) {
+  if (str.length <= maxLen)
+    return str;
+  return `${str.slice(0, maxLen - 1)}\u2026`;
+}
+function formatTime2(ts) {
+  try {
+    const d = new Date(ts);
+    return d.toLocaleString("en-US", {
+      month: "short",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      hour12: false
+    });
+  } catch {
+    return ts;
+  }
+}
+function senderLabel(msg) {
+  if (msg.senderDisplayName)
+    return msg.senderDisplayName;
+  if (msg.isFromMe)
+    return "me";
+  if (msg.senderPlatformUserId)
+    return msg.senderPlatformUserId;
+  return "unknown";
+}
+function contentPreview(msg, full) {
+  const maxLen = full ? 0 : 80;
+  const parts = [];
+  if (msg.textContent) {
+    parts.push(msg.textContent);
+  }
+  if (msg.transcription) {
+    parts.push(`[transcription] ${msg.transcription}`);
+  }
+  if (msg.mediaLocalPath) {
+    parts.push(`[file] ${msg.mediaLocalPath}`);
+  } else if (msg.mediaUrl) {
+    parts.push(`[media] ${msg.mediaUrl}`);
+  }
+  const combined = parts.join(" | ") || "-";
+  return maxLen > 0 ? truncate2(combined, maxLen) : combined;
+}
+function createHistoryCommand() {
+  return new Command("history").description("Show recent messages in the open chat").option("--limit <n>", "Number of messages to fetch (default: 10)").option("--before <msg-id>", "Fetch messages before this message ID (pagination)").option("--full", "Show full content without truncation").option("--instance <id>", "Override instance (default: from context)").option("--chat <id>", "Override chat (default: from context)").action(async (options) => {
+    const client = getClient();
+    const ctx = await resolveContext({
+      instance: options.instance,
+      chat: options.chat
+    });
+    if (!ctx.instanceId) {
+      return error("No instance in context. Set OMNI_INSTANCE, use --instance, or run: omni use <instance>");
+    }
+    if (!ctx.chatId) {
+      return error("No chat in context. Set OMNI_CHAT, use --chat, or run: omni open <contact>");
+    }
+    const limit = options.limit ? Number.parseInt(options.limit, 10) : 10;
+    if (Number.isNaN(limit) || limit < 1) {
+      return error("--limit must be a positive integer");
+    }
+    try {
+      const messages = await client.chats.getMessages(ctx.chatId, {
+        limit,
+        before: options.before
+      });
+      if (messages.length === 0) {
+        return info("No messages found.");
+      }
+      const format = getCurrentFormat();
+      if (format === "json") {
+        console.log(JSON.stringify(messages, null, 2));
+        return;
+      }
+      if (options.full) {
+        setMaxCellWidth(0);
+      }
+      const rows = messages.map((msg) => ({
+        ID: msg.externalId,
+        TIME: formatTime2(msg.platformTimestamp),
+        SENDER: senderLabel(msg),
+        TYPE: msg.messageType,
+        CONTENT: contentPreview(msg, !!options.full)
+      }));
+      list(rows, { rawData: messages });
+    } catch (err) {
+      const message = err instanceof Error ? err.message : "Unknown error";
+      error(`Failed to fetch history: ${message}`);
+    }
+  });
+}
+
 // src/commands/imagine.ts
 import { writeFileSync as writeFileSync3 } from "fs";
-import { basename as basename2, dirname as dirname2, extname as extname2, join as join3 } from "path";
+import { basename as basename2, dirname as dirname3, extname as extname2, join as join6 } from "path";
 init_output();
 var ALLOWED_ASPECT_RATIOS = ["1:1", "4:3", "3:4", "16:9", "9:16", "3:2", "2:3"];
 function extensionForMime(mimeType) {
@@ -81486,13 +82054,13 @@ function extensionForMime(mimeType) {
   return ".png";
 }
 function buildOutputPath(outputBase, index, total, mimeType) {
-  const dir = dirname2(outputBase);
+  const dir = dirname3(outputBase);
   const ext = extname2(outputBase) || extensionForMime(mimeType);
   const stem = basename2(outputBase, extname2(outputBase));
   if (total <= 1) {
-    return join3(dir, `${stem}${ext}`);
+    return join6(dir, `${stem}${ext}`);
   }
-  return join3(dir, `${stem}-${index + 1}${ext}`);
+  return join6(dir, `${stem}-${index + 1}${ext}`);
 }
 function parseAspectRatio(value) {
   if (!value)
@@ -81610,71 +82178,26 @@ function createImagineCommand() {
 }
 
 // src/commands/install.ts
-import { chmodSync, existsSync as existsSync4, mkdirSync as mkdirSync2, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join5 } from "path";
+import { chmodSync, existsSync as existsSync5, mkdirSync as mkdirSync2, writeFileSync as writeFileSync4 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join7 } from "path";
 import { createInterface as createInterface2 } from "readline";
 init_config();
-
-// src/health.ts
-var DEFAULT_API_PORT = 8882;
-var HEALTH_TIMEOUT_MS = 15000;
-var HEALTH_POLL_INTERVAL_MS = 500;
-function getHealthCheckUrl(port) {
-  return `http://localhost:${port}/api/v2/health`;
-}
-async function waitForHealth(port, timeoutMs = HEALTH_TIMEOUT_MS) {
-  const healthCheckUrl = getHealthCheckUrl(port);
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    try {
-      const resp = await fetch(healthCheckUrl, { signal: AbortSignal.timeout(1000) });
-      if (resp.ok)
-        return true;
-    } catch {}
-    await Bun.sleep(HEALTH_POLL_INTERVAL_MS);
-  }
-  return false;
-}
-
-// src/commands/install.ts
-init_output();
-
-// src/server-bundle.ts
 init_output();
-import { dirname as dirname3, join as join4 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-function getServerBundlePath() {
-  try {
-    const thisFile = fileURLToPath2(import.meta.url);
-    const distDir = dirname3(thisFile);
-    return join4(distDir, "server", "index.js");
-  } catch {
-    return join4(process.cwd(), "dist", "server", "index.js");
-  }
+var DEFAULT_DATA_DIR = join7(homedir3(), ".omni", "data");
+var OMNI_DIR = join7(homedir3(), ".omni");
+var NATS_BINARY_PATH = join7(OMNI_DIR, "nats-server");
+var NATS_VERSION = "v2.12.4";
+function computeDefaultDatabaseUrl() {
+  return buildEmbeddedDatabaseUrl();
 }
-function getServerLauncherPath() {
-  try {
-    const thisFile = fileURLToPath2(import.meta.url);
-    const distDir = dirname3(thisFile);
-    return join4(distDir, "..", "bin", "omni-server");
-  } catch {
-    return join4(process.cwd(), "bin", "omni-server");
+function resolveInstallDatabaseUrl(options) {
+  const flag = options.databaseUrlFlag?.trim();
+  if (flag && flag.length > 0) {
+    return flag;
   }
+  return computeDefaultDatabaseUrl();
 }
-function bundleNotFoundError(bundlePath) {
-  error(`Server bundle not found at: ${bundlePath}
-  This command requires @automagik/omni installed from npm.
-  Install: bun add -g @automagik/omni
-  Or build locally: make cli-build-full`, undefined, 1);
-}
-
-// src/commands/install.ts
-var DEFAULT_DATA_DIR = join5(homedir2(), ".omni", "data");
-var DEFAULT_DATABASE_URL = process.env.DATABASE_URL ?? "postgresql://postgres:postgres@localhost:5432/omni";
-var OMNI_DIR = join5(homedir2(), ".omni");
-var NATS_BINARY_PATH = join5(OMNI_DIR, "nats-server");
-var NATS_VERSION = "v2.12.4";
 async function isBunAvailable() {
   try {
     const proc = Bun.spawn({
@@ -81742,10 +82265,10 @@ async function downloadNats() {
       return false;
     }
     const arrayBuf = await resp.arrayBuffer();
-    const tarPath = join5(OMNI_DIR, fileName);
+    const tarPath = join7(OMNI_DIR, fileName);
     writeFileSync4(tarPath, Buffer.from(arrayBuf));
     spinner.text = "Extracting NATS binary...";
-    const tmpDir = join5(OMNI_DIR, "nats-tmp");
+    const tmpDir = join7(OMNI_DIR, "nats-tmp");
     mkdirSync2(tmpDir, { recursive: true });
     const tarProc = Bun.spawn({
       cmd: ["tar", "-xzf", tarPath, "-C", tmpDir],
@@ -81793,11 +82316,11 @@ async function promptLine(question, defaultValue = "") {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     rl.question(question, (answer) => {
       rl.close();
       const trimmed = answer.trim();
-      resolve(trimmed === "" ? defaultValue : trimmed);
+      resolve2(trimmed === "" ? defaultValue : trimmed);
     });
   });
 }
@@ -81806,29 +82329,24 @@ async function promptYesNo(question, defaultYes = true) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     rl.question(question, (answer) => {
       rl.close();
       const trimmed = answer.trim().toLowerCase();
       if (trimmed === "")
-        return resolve(defaultYes);
-      resolve(trimmed === "y" || trimmed === "yes");
+        return resolve2(defaultYes);
+      resolve2(trimmed === "y" || trimmed === "yes");
     });
   });
 }
-function buildApiRuntimeEnv(cfg) {
-  return {
-    API_PORT: String(cfg.port),
-    DATABASE_URL: cfg.databaseUrl,
-    OMNI_API_KEY: cfg.apiKey,
-    MEDIA_STORAGE_PATH: join5(cfg.dataDir, "media"),
-    OMNI_PACKAGES_DIR: join5(cfg.dataDir, "packages"),
-    PGSERVE_EMBEDDED: "true",
-    PGSERVE_DATA: join5(cfg.dataDir, "pgserve"),
-    NATS_URL: "nats://localhost:4222",
-    NODE_ENV: "production",
-    LOG_LEVEL: "info"
+function buildWizardRuntimeEnv(cfg) {
+  const serverConfig = {
+    ...DEFAULT_SERVER_CONFIG,
+    port: cfg.port,
+    databaseUrl: cfg.databaseUrl,
+    dataDir: cfg.dataDir
   };
+  return buildRuntimeEnv(serverConfig, { apiKey: cfg.apiKey });
 }
 async function writeSystemdUnit(_cfg) {
   const apiUnit = `[Unit]
@@ -81842,7 +82360,7 @@ ExecStart=/usr/bin/env omni start
 ExecStop=/usr/bin/env omni stop
 ExecReload=/usr/bin/env omni restart
 Restart=on-failure
-PIDFile=${homedir2()}/.pm2/pm2.pid
+PIDFile=${homedir3()}/.pm2/pm2.pid
 
 [Install]
 WantedBy=multi-user.target
@@ -81853,7 +82371,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart="${NATS_BINARY_PATH}" -js -sd "${join5(_cfg.dataDir, "nats")}"
+ExecStart="${NATS_BINARY_PATH}" -js -sd "${join7(_cfg.dataDir, "nats")}"
 Restart=on-failure
 RestartSec=5
 
@@ -81903,7 +82421,7 @@ async function runSystemChecks(port) {
   return { bunOk, portOk };
 }
 async function ensureNats() {
-  if (existsSync4(NATS_BINARY_PATH)) {
+  if (existsSync5(NATS_BINARY_PATH)) {
     raw(`  \u2713 NATS binary found at ${NATS_BINARY_PATH}`);
     return;
   }
@@ -81927,22 +82445,23 @@ async function chooseProcessManager(nonInteractive, forceSystemd) {
     return "manual";
   return "pm2";
 }
-async function promptConfig(nonInteractive, portOverride) {
+async function promptConfig(nonInteractive, portOverride, databaseUrlOverride) {
+  const resolvedDatabaseUrl = resolveInstallDatabaseUrl({ databaseUrlFlag: databaseUrlOverride });
   if (nonInteractive) {
     return {
       port: portOverride ?? DEFAULT_API_PORT,
       dataDir: DEFAULT_DATA_DIR,
-      databaseUrl: DEFAULT_DATABASE_URL
+      databaseUrl: resolvedDatabaseUrl
     };
   }
   const portStr = await promptLine(`  API port [${DEFAULT_API_PORT}]: `, String(portOverride ?? DEFAULT_API_PORT));
   const port = Number.parseInt(portStr, 10);
   const dataDir = await promptLine(`  Data directory [${DEFAULT_DATA_DIR}]: `, DEFAULT_DATA_DIR);
-  const databaseUrl = await promptLine(`  Database URL [${DEFAULT_DATABASE_URL}]: `, DEFAULT_DATABASE_URL);
+  const databaseUrl = databaseUrlOverride ? databaseUrlOverride : await promptLine(`  Database URL [${resolvedDatabaseUrl}]: `, resolvedDatabaseUrl);
   return {
     port: Number.isNaN(port) ? DEFAULT_API_PORT : port,
     dataDir: dataDir || DEFAULT_DATA_DIR,
-    databaseUrl: databaseUrl || DEFAULT_DATABASE_URL
+    databaseUrl: databaseUrl || resolvedDatabaseUrl
   };
 }
 async function promptApiKey(nonInteractive) {
@@ -81972,13 +82491,13 @@ async function startServices(cfg) {
     return;
   }
   const bundlePath = getServerBundlePath();
-  if (!existsSync4(bundlePath)) {
+  if (!existsSync5(bundlePath)) {
     warn(`Server bundle not found at: ${bundlePath}
   Install @automagik/omni from npm: bun add -g @automagik/omni
   Or build locally: make cli-build-full`);
     return;
   }
-  const runtimeEnv = buildApiRuntimeEnv(cfg);
+  const runtimeEnv = buildWizardRuntimeEnv(cfg);
   const apiSpinner = ora(`Starting ${PM2_PROCESSES.api} on port ${cfg.port}...`).start();
   const launcherPath = getServerLauncherPath();
   const apiCode = await runPm2(["start", launcherPath, "--name", PM2_PROCESSES.api, "--interpreter", "bash"], runtimeEnv);
@@ -81987,9 +82506,9 @@ async function startServices(cfg) {
   } else {
     apiSpinner.succeed(`${PM2_PROCESSES.api} started`);
   }
-  if (existsSync4(NATS_BINARY_PATH)) {
+  if (existsSync5(NATS_BINARY_PATH)) {
     const natsSpinner = ora(`Starting ${PM2_PROCESSES.nats}...`).start();
-    const natsDataDir = join5(cfg.dataDir, "nats");
+    const natsDataDir = join7(cfg.dataDir, "nats");
     mkdirSync2(natsDataDir, { recursive: true });
     const natsCode = await runPm2([
       "start",
@@ -82027,7 +82546,7 @@ function writeConfigFile(port, apiKey) {
     format: "human"
   };
   saveConfig(config);
-  success(`Config written to ${join5(homedir2(), ".omni", "config.json")}`);
+  success(`Config written to ${join7(homedir3(), ".omni", "config.json")}`);
 }
 async function printDoneBanner(port, apiKey, nonInteractive, showFullGeneratedKey) {
   const displayedKey = showFullGeneratedKey ? apiKey : maskApiKey(apiKey);
@@ -82057,6 +82576,7 @@ async function runInstall(options) {
   const nonInteractive = options.nonInteractive === true;
   const forceSystemd = options.systemd === true;
   const portOverride = options.port !== undefined ? Number.parseInt(options.port, 10) : undefined;
+  const databaseUrlOverride = options.databaseUrl && options.databaseUrl.trim().length > 0 ? options.databaseUrl.trim() : undefined;
   printBanner();
   const effectivePort = portOverride ?? DEFAULT_API_PORT;
   const { bunOk, portOk } = await runSystemChecks(effectivePort);
@@ -82068,7 +82588,7 @@ async function runInstall(options) {
   }
   await ensureNats();
   const processManager = await chooseProcessManager(nonInteractive, forceSystemd);
-  const { port, dataDir, databaseUrl } = await promptConfig(nonInteractive, portOverride);
+  const { port, dataDir, databaseUrl } = await promptConfig(nonInteractive, portOverride, databaseUrlOverride);
   const { apiKey, generated: apiKeyGenerated } = await promptApiKey(nonInteractive);
   const cfg = { port, dataDir, databaseUrl, apiKey, processManager };
   await startServices(cfg);
@@ -82085,7 +82605,7 @@ async function runInstall(options) {
   process.exit(0);
 }
 function createInstallCommand() {
-  return new Command("install").description("Interactive setup wizard \u2014 bootstraps Omni server from zero").option("--non-interactive", "Use all defaults, skip prompts (for CI/scripted installs)").option("--systemd", "Write systemd unit instead of using PM2 (requires sudo)").option("--port <port>", `API port to use (default: ${DEFAULT_API_PORT})`).action(runInstall);
+  return new Command("install").description("Interactive setup wizard \u2014 bootstraps Omni server from zero").option("--non-interactive", "Use all defaults, skip prompts (for CI/scripted installs)").option("--systemd", "Write systemd unit instead of using PM2 (requires sudo)").option("--port <port>", `API port to use (default: ${DEFAULT_API_PORT})`).option("--database-url <url>", "External PostgreSQL URL (opt-in external-DB mode; defaults to embedded pgserve)").action(runInstall);
 }
 
 // src/commands/instances.ts
@@ -82343,12 +82863,12 @@ function createInstancesCommand() {
     const client = getClient();
     const id = await resolveInstanceId(rawId);
     const renderQrAscii = async (qrData, expiresAt) => {
-      return new Promise((resolve) => {
+      return new Promise((resolve2) => {
         import_qrcode_terminal.default.generate(qrData, { small: true }, (qrArt) => {
           raw(qrArt);
           if (expiresAt)
             dim(`Expires: ${expiresAt}`);
-          resolve();
+          resolve2();
         });
       });
     };
@@ -83416,8 +83936,8 @@ function createLogsCommand() {
 }
 
 // src/commands/media.ts
-import { createWriteStream, existsSync as existsSync5, mkdirSync as mkdirSync3, statSync } from "fs";
-import { basename as basename4, dirname as dirname4, resolve } from "path";
+import { createWriteStream, existsSync as existsSync6, mkdirSync as mkdirSync3, statSync as statSync2 } from "fs";
+import { basename as basename4, dirname as dirname4, resolve as resolve2 } from "path";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
 init_config();
@@ -83474,18 +83994,18 @@ function resolveOutputPath(outputPath, result) {
   const fallbackName = result.mediaLocalPath ? basename4(result.mediaLocalPath) : "";
   const filename = fallbackName || `${result.messageId}`;
   if (!outputPath)
-    return resolve(process.cwd(), filename);
+    return resolve2(process.cwd(), filename);
   const isDirHint = outputPath.endsWith("/") || outputPath.endsWith("\\");
-  const resolved = resolve(outputPath);
+  const resolved = resolve2(outputPath);
   if (isDirHint)
-    return resolve(resolved, filename);
-  if (existsSync5(resolved) && statSync(resolved).isDirectory())
-    return resolve(resolved, filename);
+    return resolve2(resolved, filename);
+  if (existsSync6(resolved) && statSync2(resolved).isDirectory())
+    return resolve2(resolved, filename);
   return resolved;
 }
 async function downloadToFile(url, apiKey, destinationPath) {
   const destDir = dirname4(destinationPath);
-  if (!existsSync5(destDir))
+  if (!existsSync6(destDir))
     mkdirSync3(destDir, { recursive: true });
   const resp = await fetch(url, {
     method: "GET",
@@ -83713,7 +84233,7 @@ function formatDate(date) {
   const d = typeof date === "string" ? new Date(date) : date;
   return d.toLocaleDateString("en-US", { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" });
 }
-function truncate2(text, maxLen) {
+function truncate3(text, maxLen) {
   if (!text)
     return "-";
   const clean = text.replace(/\n/g, " ").trim();
@@ -83778,10 +84298,10 @@ function formatSearchResults(messages, chatMap) {
     const chat = chatMap.get(m.chatId);
     const chatName = chat?.name ?? chat?.externalId ?? m.chatId.slice(0, 8);
     return {
-      chat: truncate2(chatName, 20),
+      chat: truncate3(chatName, 20),
       time: formatDate(m.platformTimestamp),
       type: m.messageType,
-      content: truncate2(getContentPreview(m), 50)
+      content: truncate3(getContentPreview(m), 50)
     };
   });
 }
@@ -84583,7 +85103,7 @@ var LEVEL_LABELS = {
   warn: "WARN ",
   error: "ERROR"
 };
-function formatTime2(timestamp) {
+function formatTime3(timestamp) {
   const date = new Date(timestamp);
   const hours = date.getHours().toString().padStart(2, "0");
   const minutes = date.getMinutes().toString().padStart(2, "0");
@@ -84634,7 +85154,7 @@ function formatData(data2) {
 }
 function formatPretty(entry) {
   const { level, time, module, msg, ...data2 } = entry;
-  const timeStr = formatTime2(time);
+  const timeStr = formatTime3(time);
   const levelColor = COLORS[level];
   const levelStr = `${levelColor}${LEVEL_LABELS[level]}${COLORS.reset}`;
   const moduleStr = formatModule(module);
@@ -89136,7 +89656,7 @@ function createSubscription(options) {
         if (!isActive)
           break;
         if (activeCount >= concurrency) {
-          await new Promise((resolve2) => pendingMessages.push(resolve2));
+          await new Promise((resolve3) => pendingMessages.push(resolve3));
         }
         activeCount++;
         processMessage(msg).catch((error2) => {
@@ -89149,7 +89669,7 @@ function createSubscription(options) {
         });
       }
       while (activeCount > 0) {
-        await new Promise((resolve2) => setTimeout(resolve2, 100));
+        await new Promise((resolve3) => setTimeout(resolve3, 100));
       }
     } catch (error2) {
       if (isActive) {
@@ -89558,7 +90078,7 @@ class NatsEventBus {
     return Math.min(delay, maxDelayMs);
   }
   sleep(ms) {
-    return new Promise((resolve2) => setTimeout(resolve2, ms));
+    return new Promise((resolve3) => setTimeout(resolve3, ms));
   }
 }
 // ../core/src/events/dead-letter.ts
@@ -91715,12 +92235,12 @@ class AutomationEngine {
       throw new QueueFullError(instanceId, queue.pending.length, maxQueueDepth);
     }
     const queueRef = queue;
-    return new Promise((resolve2) => {
+    return new Promise((resolve3) => {
       queueRef.pending.push({
         automation,
         event,
         context,
-        resolve: resolve2
+        resolve: resolve3
       });
       logger4.debug("Execution queued", {
         automationId: automation.id,
@@ -92020,13 +92540,13 @@ class OpenClawClient {
     }
     const id = crypto.randomUUID();
     const frame = { type: "req", id, method, params };
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const timeout = setTimeout(() => {
         this.pending.delete(id);
         reject(new Error(`Request ${method} timed out after ${timeoutMs}ms`));
       }, timeoutMs);
       this.pending.set(id, {
-        resolve: resolve2,
+        resolve: resolve3,
         reject,
         timeout,
         method
@@ -92045,7 +92565,7 @@ class OpenClawClient {
       return;
     if (this.closed)
       throw new Error("Client is stopped");
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const timeout = setTimeout(() => {
         cleanup();
         reject(new Error(`Connection not ready within ${timeoutMs}ms`));
@@ -92053,7 +92573,7 @@ class OpenClawClient {
       const check = () => {
         if (this.connected) {
           cleanup();
-          resolve2();
+          resolve3();
         } else if (this.closed) {
           cleanup();
           reject(new Error("Client stopped while waiting for connection"));
@@ -92376,8 +92896,8 @@ var log15 = createLogger("provider:a2a");
 // ../core/src/providers/nats-genie-provider.ts
 var import_nats4 = __toESM(require_mod4(), 1);
 import { mkdir, writeFile } from "fs/promises";
-import { homedir as homedir3 } from "os";
-import { join as join6 } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join8 } from "path";
 var log16 = createLogger("provider:nats-genie");
 
 class NatsGenieProvider {
@@ -92456,15 +92976,16 @@ class NatsGenieProvider {
     await this.ensureConnected();
     if (!this.nc)
       return;
-    const topic = `omni.reply.${this.config.instanceId}.*`;
+    const topic = `omni.reply.${this.config.instanceId}.>`;
     const sub = this.nc.subscribe(topic);
     this.replySubscription = sub;
     log16.info("Subscribed to agent replies", { topic });
+    const subjectPrefix = `omni.reply.${this.config.instanceId}.`;
     (async () => {
       for await (const msg of sub) {
         try {
           const data2 = JSON.parse(this.sc.decode(msg.data));
-          const chatId = data2.chat_id || msg.subject.split(".").pop() || "";
+          const chatId = data2.chat_id || (msg.subject.startsWith(subjectPrefix) ? msg.subject.slice(subjectPrefix.length) : msg.subject.split(".").pop() || "");
           if (data2.content && this.config.onReply) {
             await this.config.onReply(chatId, data2.content, {
               agent: data2.agent,
@@ -92494,6 +93015,41 @@ class NatsGenieProvider {
       };
     }
   }
+  async resetSession(sessionKey, chatId, instanceId) {
+    const resolvedInstanceId = instanceId ?? this.config.instanceId;
+    if (!chatId) {
+      log16.warn("NATS session reset skipped: missing chatId", {
+        providerId: this.id,
+        sessionKey
+      });
+      throw new Error("chatId is required to reset NATS Genie session");
+    }
+    const topic = `omni.session.reset.${resolvedInstanceId}.${chatId}`;
+    const payload = {
+      action: "kill",
+      sessionKey,
+      agent: this.config.agentName,
+      instance_id: resolvedInstanceId,
+      chat_id: chatId,
+      timestamp: new Date().toISOString()
+    };
+    try {
+      await this.ensureConnected();
+      this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)));
+      log16.info("Published session reset to NATS", {
+        topic,
+        providerId: this.id,
+        sessionKey,
+        chatId
+      });
+    } catch (error2) {
+      log16.error("Failed to publish NATS session reset", {
+        topic,
+        error: error2 instanceof Error ? error2.message : String(error2)
+      });
+      throw error2;
+    }
+  }
   async dispose() {
     if (this.replySubscription) {
       this.replySubscription.unsubscribe();
@@ -92532,10 +93088,10 @@ class NatsGenieProvider {
   }
   async writeDeadLetter(payload, error2) {
     try {
-      const dlDir = join6(homedir3(), ".omni", "dead-letters");
+      const dlDir = join8(homedir4(), ".omni", "dead-letters");
       await mkdir(dlDir, { recursive: true });
       const filename = `nats-genie-${Date.now()}-${payload.chatId}.json`;
-      await writeFile(join6(dlDir, filename), JSON.stringify({
+      await writeFile(join8(dlDir, filename), JSON.stringify({
         payload,
         error: error2 instanceof Error ? error2.message : String(error2),
         timestamp: new Date().toISOString()
@@ -92883,9 +93439,9 @@ init_output();
 // src/commands/providers-setup.ts
 import { execFileSync as execFileSync2, execSync } from "child_process";
 import * as nodeCrypto2 from "crypto";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir4 } from "os";
-import { dirname as dirname5, resolve as resolve2 } from "path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir5 } from "os";
+import { dirname as dirname5, resolve as resolve3 } from "path";
 import { createInterface as createInterface3 } from "readline";
 init_config();
 init_output();
@@ -92894,11 +93450,11 @@ async function promptLine2(question, defaultValue = "") {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     rl.question(question, (answer) => {
       rl.close();
       const trimmed = answer.trim();
-      resolve3(trimmed === "" ? defaultValue : trimmed);
+      resolve4(trimmed === "" ? defaultValue : trimmed);
     });
   });
 }
@@ -92916,7 +93472,7 @@ async function promptSecret(question) {
   }
   process.stdin.resume();
   process.stdin.setEncoding("utf8");
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     let input = "";
     const onData = (ch) => {
       const c2 = ch.toString();
@@ -92928,7 +93484,7 @@ async function promptSecret(question) {
         process.stdin.removeListener("data", onData);
         process.stdout.write(`
 `);
-        resolve3(input.trim());
+        resolve4(input.trim());
       } else if (c2 === "\x03") {
         process.exit(1);
       } else if (isBackspace(c2)) {
@@ -92943,7 +93499,7 @@ async function promptSecret(question) {
 function sendWsRequest(ws, method, params, timeoutMs = 15000) {
   const id = nodeCrypto2.randomUUID();
   const frame = { type: "req", id, method, params };
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const timeout = setTimeout(() => {
       cleanup();
       reject(new Error(`WS request "${method}" timed out after ${timeoutMs}ms`));
@@ -92959,7 +93515,7 @@ function sendWsRequest(ws, method, params, timeoutMs = 15000) {
         return;
       cleanup();
       if (res.ok) {
-        resolve3(res.payload);
+        resolve4(res.payload);
       } else {
         reject(new Error(res.error?.message ?? `Request "${method}" failed`));
       }
@@ -92979,13 +93535,13 @@ function sendWsRequest(ws, method, params, timeoutMs = 15000) {
   });
 }
 function waitForWsEvent(ws, eventName, buffered = [], timeoutMs = 1e4) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     for (let i = 0;i < buffered.length; i++) {
       try {
         const parsed = JSON.parse(String(buffered[i].data));
         if (parsed.type === "event" && parsed.event === eventName) {
           buffered.splice(i, 1);
-          resolve3(parsed);
+          resolve4(parsed);
           return;
         }
       } catch {}
@@ -93004,7 +93560,7 @@ function waitForWsEvent(ws, eventName, buffered = [], timeoutMs = 1e4) {
       if (frame.type !== "event" || frame.event !== eventName)
         return;
       cleanup();
-      resolve3(frame);
+      resolve4(frame);
     };
     const closeHandler = (ev) => {
       cleanup();
@@ -93020,7 +93576,7 @@ function waitForWsEvent(ws, eventName, buffered = [], timeoutMs = 1e4) {
   });
 }
 function openWs(url) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const ws = new WebSocket(url);
     const buffered = [];
     const bufferListener = (event) => {
@@ -93029,7 +93585,7 @@ function openWs(url) {
     ws.addEventListener("message", bufferListener);
     const onOpen = () => {
       ws.removeEventListener("error", onError);
-      resolve3([ws, buffered, bufferListener]);
+      resolve4([ws, buffered, bufferListener]);
     };
     const onError = () => {
       ws.removeEventListener("open", onOpen);
@@ -93111,10 +93667,10 @@ async function pairDevice(gatewayUrl, gatewayToken, keypair, spinner) {
     ws.close(1000, "pairing complete");
   }
 }
-var OPENCLAW_CONFIG_PATH = resolve2(homedir4(), ".openclaw", "openclaw.json");
+var OPENCLAW_CONFIG_PATH = resolve3(homedir5(), ".openclaw", "openclaw.json");
 var PLUGIN_MARKER = "plugin-openclaw/omni.ts";
 function readOpenClawConfig(configPath) {
-  if (!existsSync6(configPath))
+  if (!existsSync7(configPath))
     return {};
   const raw2 = readFileSync4(configPath, "utf-8").trim();
   if (!raw2)
@@ -93155,10 +93711,10 @@ function isValidUuid(value) {
 }
 function resolvePluginPath(explicit) {
   if (explicit) {
-    return existsSync6(explicit) ? resolve2(explicit) : null;
+    return existsSync7(explicit) ? resolve3(explicit) : null;
   }
-  const cwdCandidate = resolve2(process.cwd(), "packages/plugin-openclaw/omni.ts");
-  return existsSync6(cwdCandidate) ? cwdCandidate : null;
+  const cwdCandidate = resolve3(process.cwd(), "packages/plugin-openclaw/omni.ts");
+  return existsSync7(cwdCandidate) ? cwdCandidate : null;
 }
 function registerPlugin(config2, pluginPath, configPath) {
   if (hasOpenClawCli()) {
@@ -93676,8 +94232,7 @@ function createReactCommand() {
     const client = getClient();
     const ctx = await resolveContext({
       instance: options.instance,
-      chat: options.chat,
-      message: options.message
+      chat: options.chat
     });
     if (!ctx.instanceId) {
       return error("No instance in context. Set OMNI_INSTANCE, use --instance, or run: omni use <instance>");
@@ -93844,34 +94399,19 @@ ${formatExamples(examples)}`);
 }
 
 // src/commands/restart.ts
-import { join as join7 } from "path";
 init_config();
 init_output();
 var RESTART_HEALTH_TIMEOUT_MS = 1e4;
-function buildApiRuntimeEnv2() {
-  const serverConfig = loadServerConfig();
-  const config2 = loadConfig();
-  return {
-    API_PORT: String(serverConfig.port),
-    DATABASE_URL: serverConfig.databaseUrl,
-    OMNI_API_KEY: config2.apiKey ?? "",
-    MEDIA_STORAGE_PATH: join7(serverConfig.dataDir, "media"),
-    PGSERVE_EMBEDDED: "true",
-    PGSERVE_DATA: join7(serverConfig.dataDir, "pgserve"),
-    NATS_URL: "nats://localhost:4222",
-    NODE_ENV: serverConfig.nodeEnv,
-    LOG_LEVEL: serverConfig.logLevel
-  };
-}
 async function runRestart() {
   if (!await isPm2Available()) {
     pm2NotFoundError();
   }
   const serverConfig = loadServerConfig();
+  const cliConfig = loadConfig();
   const apiPort = serverConfig.port;
   info("Restarting omni services...");
-  const env2 = buildApiRuntimeEnv2();
-  const code = await runPm2(["restart", PM2_PROCESSES.api, PM2_PROCESSES.nats, "--update-env"], env2);
+  const env2 = buildRuntimeEnv(serverConfig, cliConfig);
+  const code = await runPm2(["restart", PM2_PROCESSES.api, PM2_PROCESSES.nats], env2);
   if (code !== 0) {
     warn("Some services may not have restarted cleanly \u2014 check pm2 status");
   }
@@ -94038,7 +94578,7 @@ function createSayCommand() {
 }
 
 // src/commands/see.ts
-import { existsSync as existsSync7, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync5, statSync as statSync3 } from "fs";
 import { extname as extname4 } from "path";
 init_output();
 var MIME_BY_EXT = {
@@ -94070,10 +94610,10 @@ function parseMaxTokens(value) {
   return n2;
 }
 function loadMedia(file) {
-  if (!existsSync7(file)) {
+  if (!existsSync8(file)) {
     error(`File not found: ${file}`);
   }
-  const stat = statSync2(file);
+  const stat = statSync3(file);
   if (!stat.isFile()) {
     error(`Not a regular file: ${file}`);
   }
@@ -94156,7 +94696,7 @@ function createSeeCommand() {
 }
 
 // src/commands/send.ts
-import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
 import { basename as basename5, extname as extname5 } from "path";
 init_source();
 init_config();
@@ -94197,7 +94737,7 @@ var messageSenders = {
     const { to, media } = options3;
     if (!to || !media)
       return;
-    if (!existsSync8(media)) {
+    if (!existsSync9(media)) {
       error(`File not found: ${media}`);
       return;
     }
@@ -94729,50 +95269,35 @@ function pickFilename(mimeType, provider) {
 }
 
 // src/commands/start.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync5 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join8 } from "path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync5 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join9 } from "path";
 init_config();
 init_output();
 var START_HEALTH_TIMEOUT_MS = 1e4;
-function buildApiRuntimeEnv3() {
-  const serverConfig = loadServerConfig();
-  const config2 = loadConfig();
-  return {
-    API_PORT: String(serverConfig.port),
-    DATABASE_URL: serverConfig.databaseUrl,
-    OMNI_API_KEY: config2.apiKey ?? "",
-    MEDIA_STORAGE_PATH: join8(serverConfig.dataDir, "media"),
-    OMNI_PACKAGES_DIR: join8(serverConfig.dataDir, "packages"),
-    PGSERVE_EMBEDDED: "true",
-    PGSERVE_DATA: join8(serverConfig.dataDir, "pgserve"),
-    NATS_URL: "nats://localhost:4222",
-    NODE_ENV: serverConfig.nodeEnv,
-    LOG_LEVEL: serverConfig.logLevel
-  };
-}
 async function runStart() {
   if (!await isPm2Available()) {
     pm2NotFoundError();
   }
   const bundlePath = getServerBundlePath();
-  if (!existsSync9(bundlePath)) {
+  if (!existsSync10(bundlePath)) {
     bundleNotFoundError(bundlePath);
   }
   const serverConfig = loadServerConfig();
   const apiPort = serverConfig.port;
   info(`Starting ${PM2_PROCESSES.api} (port ${apiPort})...`);
-  const env2 = buildApiRuntimeEnv3();
+  const cliConfig = loadConfig();
+  const env2 = buildRuntimeEnv(serverConfig, cliConfig);
   const launcherPath = getServerLauncherPath();
   const apiCode = await runPm2(["start", launcherPath, "--name", PM2_PROCESSES.api, "--interpreter", "bash"], env2);
   if (apiCode !== 0) {
     error(`Failed to start ${PM2_PROCESSES.api} (pm2 exit code ${apiCode})`, undefined, 1);
     return;
   }
-  const natsPath = join8(homedir5(), ".omni", "nats-server");
-  if (existsSync9(natsPath)) {
+  const natsPath = join9(homedir6(), ".omni", "nats-server");
+  if (existsSync10(natsPath)) {
     info(`Starting ${PM2_PROCESSES.nats}...`);
-    const natsDataDir = join8(serverConfig.dataDir, "nats");
+    const natsDataDir = join9(serverConfig.dataDir, "nats");
     mkdirSync5(natsDataDir, { recursive: true });
     const natsCode = await runPm2(["start", natsPath, "--name", PM2_PROCESSES.nats, "--", "-js", "-sd", natsDataDir]);
     if (natsCode !== 0) {
@@ -94968,10 +95493,193 @@ function createTtsCommand() {
 
 // src/commands/update.ts
 import { createInterface as createInterface4 } from "readline";
+init_source();
 init_config();
 init_output();
+
+// src/sidecar-cleanup.ts
+var SIDECAR_BASENAME = "nats-reply-sidecar.mjs";
+var SIDECAR_NAME_HINT = "nats-reply-sidecar";
+function pm2EntryToMatch(entry) {
+  if (!entry || typeof entry !== "object")
+    return null;
+  const name = typeof entry.name === "string" ? entry.name : "";
+  const scriptPath = typeof entry.pm2_env?.pm_exec_path === "string" ? entry.pm2_env.pm_exec_path : "";
+  const pmId = typeof entry.pm_id === "number" ? entry.pm_id : null;
+  const nameMatch = name.includes(SIDECAR_NAME_HINT);
+  const pathMatch = scriptPath.endsWith(`/${SIDECAR_BASENAME}`) || scriptPath.endsWith(SIDECAR_BASENAME);
+  if (!nameMatch && !pathMatch)
+    return null;
+  return {
+    name,
+    pmId,
+    scriptPath,
+    matchedBy: nameMatch ? "name" : "script-path"
+  };
+}
+function parsePm2SidecarMatches(rawJson) {
+  const trimmed = rawJson.trim();
+  if (trimmed.length === 0 || trimmed === "[]")
+    return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(trimmed);
+  } catch {
+    return [];
+  }
+  if (!Array.isArray(parsed))
+    return [];
+  const matches = [];
+  for (const entry of parsed) {
+    const match = pm2EntryToMatch(entry);
+    if (match !== null)
+      matches.push(match);
+  }
+  return matches;
+}
+function parseRawSidecarMatches(rawPgrep) {
+  const lines = rawPgrep.split(`
+`);
+  const matches = [];
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed.length === 0)
+      continue;
+    const firstSpace = trimmed.indexOf(" ");
+    if (firstSpace === -1)
+      continue;
+    const pidStr = trimmed.slice(0, firstSpace);
+    const command = trimmed.slice(firstSpace + 1);
+    const pid = Number.parseInt(pidStr, 10);
+    if (!Number.isFinite(pid) || pid <= 0)
+      continue;
+    if (!command.includes(SIDECAR_BASENAME))
+      continue;
+    matches.push({ pid, command });
+  }
+  return matches;
+}
+async function detectPm2Sidecars() {
+  try {
+    const proc = Bun.spawn({
+      cmd: ["pm2", "jlist"],
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const [stdout, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited]);
+    if (exitCode !== 0)
+      return [];
+    return parsePm2SidecarMatches(stdout);
+  } catch {
+    return [];
+  }
+}
+async function detectRawSidecars() {
+  try {
+    const proc = Bun.spawn({
+      cmd: ["pgrep", "-fa", SIDECAR_BASENAME],
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const [stdout, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited]);
+    if (exitCode !== 0 && exitCode !== 1)
+      return [];
+    const matches = parseRawSidecarMatches(stdout);
+    const ownPid = process.pid;
+    return matches.filter((m2) => m2.pid !== ownPid);
+  } catch {
+    return [];
+  }
+}
+async function stopPm2Sidecar(match) {
+  const target = match.name.length > 0 ? match.name : match.pmId !== null ? String(match.pmId) : null;
+  if (target === null)
+    return false;
+  for (const verb of ["stop", "delete"]) {
+    const proc = Bun.spawn({
+      cmd: ["pm2", verb, target],
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0)
+      return false;
+  }
+  return true;
+}
+async function killRawSidecar(match) {
+  try {
+    process.kill(match.pid, "SIGTERM");
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function cleanupSidecars() {
+  const [pm2Detected, rawDetected] = await Promise.all([detectPm2Sidecars(), detectRawSidecars()]);
+  const pm2Stopped = [];
+  const pm2Failed = [];
+  for (const match of pm2Detected) {
+    const ok = await stopPm2Sidecar(match);
+    if (ok) {
+      pm2Stopped.push(match);
+    } else {
+      pm2Failed.push(match);
+    }
+  }
+  const rawKilled = [];
+  const rawFailed = [];
+  for (const match of rawDetected) {
+    const ok = await killRawSidecar(match);
+    if (ok) {
+      rawKilled.push(match);
+    } else {
+      rawFailed.push(match);
+    }
+  }
+  return {
+    pm2Detected,
+    rawDetected,
+    pm2Stopped,
+    pm2Failed,
+    rawKilled,
+    rawFailed
+  };
+}
+function formatCleanupSummary(result) {
+  const totalDetected = result.pm2Detected.length + result.rawDetected.length;
+  if (totalDetected === 0)
+    return "";
+  const lines = [];
+  lines.push(`Found ${totalDetected} legacy nats-reply-sidecar process(es) \u2014 stopping to prevent duplicate replies.`);
+  for (const match of result.pm2Stopped) {
+    const label = match.name || `pm_id=${match.pmId}`;
+    lines.push(`  \u2713 pm2: stopped and deleted "${label}" (matched by ${match.matchedBy})`);
+  }
+  for (const match of result.pm2Failed) {
+    const label = match.name || `pm_id=${match.pmId}`;
+    lines.push(`  \u2717 pm2: failed to stop "${label}" \u2014 run \`pm2 stop ${label} && pm2 delete ${label}\` manually`);
+  }
+  for (const match of result.rawKilled) {
+    lines.push(`  \u2713 raw: SIGTERM sent to pid ${match.pid}`);
+  }
+  for (const match of result.rawFailed) {
+    lines.push(`  \u2717 raw: failed to signal pid ${match.pid} \u2014 kill it manually with \`kill ${match.pid}\``);
+  }
+  if (result.pm2Failed.length > 0 || result.rawFailed.length > 0) {
+    lines.push("See docs/migration/nats-genie-sidecar-decommission.md for the manual cleanup runbook.");
+  }
+  return lines.join(`
+`);
+}
+function cleanupSucceeded(result) {
+  return result.pm2Failed.length === 0 && result.rawFailed.length === 0;
+}
+
+// src/commands/update.ts
 var PACKAGE_NAME = "@automagik/omni";
 var UPDATE_HEALTH_TIMEOUT_MS = 1e4;
+var VERIFY_POLL_INTERVAL_MS = 500;
 async function fetchLatestVersion() {
   try {
     const proc = Bun.spawn({
@@ -95028,12 +95736,16 @@ async function installLatest() {
   return exitCode === 0;
 }
 async function restartPm2Services(processNames) {
+  const serverConfig = loadServerConfig();
+  const cliConfig = loadConfig();
+  const runtimeEnv = buildRuntimeEnv(serverConfig, cliConfig);
   let allSucceeded = true;
   for (const name of processNames) {
     const proc = Bun.spawn({
       cmd: ["pm2", "restart", name],
       stdout: "pipe",
-      stderr: "pipe"
+      stderr: "pipe",
+      env: { ...process.env, ...runtimeEnv }
     });
     const exitCode = await proc.exited;
     if (exitCode !== 0) {
@@ -95042,34 +95754,123 @@ async function restartPm2Services(processNames) {
   }
   return allSucceeded;
 }
-async function restartServicesAndVerify(servicesToRestart, latest) {
+function normalizeVersion(version) {
+  return version.split("+")[0] ?? version;
+}
+function decideUpdateVerify(args) {
+  const cliVersion = normalizeVersion(args.latest);
+  if (args.healthBody === null) {
+    return { kind: "health-unreachable", apiPort: args.apiPort };
+  }
+  const serverVersion = args.healthBody.version ? normalizeVersion(args.healthBody.version) : null;
+  if (!serverVersion || serverVersion !== cliVersion) {
+    return { kind: "version-mismatch", cliVersion, serverVersion };
+  }
+  if (!args.keyValid) {
+    return { kind: "auth-invalid" };
+  }
+  return { kind: "ok", cliVersion, serverVersion };
+}
+function updateErrorVersionMismatch(cli, server) {
+  return `Server version mismatch: cli=v${cli} server=v${server ?? "unknown"}. Run: omni doctor`;
+}
+var UPDATE_ERROR_AUTH_INVALID = "Auth key invalid after restart. Run: omni doctor --fix";
+async function fetchHealthBody(apiPort, timeoutMs) {
+  const url = getHealthCheckUrl(apiPort);
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      const resp = await fetch(url, {
+        signal: AbortSignal.timeout(1500),
+        headers: { "Accept-Encoding": "identity" }
+      });
+      if (resp.ok) {
+        const body = await resp.json();
+        return body;
+      }
+    } catch {}
+    await Bun.sleep(VERIFY_POLL_INTERVAL_MS);
+  }
+  return null;
+}
+async function validateStoredKey(apiPort) {
+  const cliConfig = loadConfig();
+  if (!cliConfig.apiKey) {
+    return false;
+  }
+  const baseUrl = cliConfig.apiUrl ?? `http://localhost:${apiPort}`;
+  try {
+    const client = createOmniClient({ baseUrl, apiKey: cliConfig.apiKey, cliVersion: VERSION });
+    const result = await client.auth.validate();
+    return result.valid === true;
+  } catch {
+    return false;
+  }
+}
+function printVerifyBanner(latest) {
+  console.log(`${source_default.green("\u2713")} CLI:    v${latest}`);
+  console.log(`${source_default.green("\u2713")} Server: v${latest} (healthy)`);
+  console.log(`${source_default.green("\u2713")} Auth:   key valid`);
+}
+async function runSidecarCleanup() {
+  const cleanupSpinner = ora("Checking for legacy nats-reply-sidecar processes...").start();
+  const result = await cleanupSidecars();
+  cleanupSpinner.stop();
+  const summary = formatCleanupSummary(result);
+  if (summary.length > 0) {
+    console.log(summary);
+  }
+  return result;
+}
+async function restartServicesAndVerify(servicesToRestart, latest, options3) {
   const apiPort = loadServerConfig().port;
   const restartSpinner = ora("Restarting services...").start();
   const restartSucceeded = await restartPm2Services(servicesToRestart);
   restartSpinner.stop();
-  const healthy = await waitForHealth(apiPort, UPDATE_HEALTH_TIMEOUT_MS);
-  if (restartSucceeded && healthy) {
-    success("Services restarted successfully.");
-    return;
+  if (!restartSucceeded) {
+    warn(`omni CLI updated to v${latest}, but one or more service restarts failed. Run \`omni status\`.`);
+    process.exit(1);
+  }
+  let sidecarCleanupResult = null;
+  if (options3.sidecarCleanup) {
+    sidecarCleanupResult = await runSidecarCleanup();
+  }
+  const verifySpinner = ora("Verifying server version...").start();
+  const healthBody = await fetchHealthBody(apiPort, UPDATE_HEALTH_TIMEOUT_MS);
+  verifySpinner.stop();
+  const keyValid = healthBody !== null ? await validateStoredKey(apiPort) : false;
+  const result = decideUpdateVerify({ latest, apiPort, healthBody, keyValid });
+  switch (result.kind) {
+    case "ok":
+      printVerifyBanner(result.cliVersion);
+      if (sidecarCleanupResult !== null && !cleanupSucceeded(sidecarCleanupResult)) {
+        warn("One or more legacy nats-reply-sidecar processes could not be stopped automatically. " + "See messages above and docs/migration/nats-genie-sidecar-decommission.md.");
+      }
+      return;
+    case "health-unreachable":
+      warn(`omni CLI updated to v${latest}, but health check failed on port ${result.apiPort}. Run \`omni status\`.`);
+      process.exit(1);
+      break;
+    case "version-mismatch":
+      console.error(`${source_default.red("\u2717")} ${updateErrorVersionMismatch(result.cliVersion, result.serverVersion)}`);
+      process.exit(1);
+      break;
+    case "auth-invalid":
+      console.error(`${source_default.red("\u2717")} ${UPDATE_ERROR_AUTH_INVALID}`);
+      process.exit(1);
+      break;
   }
-  const failures = [];
-  if (!restartSucceeded)
-    failures.push("one or more service restarts failed");
-  if (!healthy)
-    failures.push(`health check failed on port ${apiPort}`);
-  warn(`omni CLI updated to v${latest}, but ${failures.join(" and ")}. Run \`omni status\`.`);
-  process.exit(1);
 }
 async function promptConfirm(question) {
   const rl = createInterface4({
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     rl.question(question, (answer) => {
       rl.close();
       const trimmed = answer.trim().toLowerCase();
-      resolve3(trimmed === "" || trimmed === "y" || trimmed === "yes");
+      resolve4(trimmed === "" || trimmed === "y" || trimmed === "yes");
     });
   });
 }
@@ -95103,18 +95904,37 @@ async function runUpdate(options3) {
     process.exit(1);
   }
   if (servicesToRestart.length > 0) {
-    await restartServicesAndVerify(servicesToRestart, latest);
+    await restartServicesAndVerify(servicesToRestart, latest, {
+      sidecarCleanup: options3.sidecarCleanup !== false
+    });
+    return;
   }
   success(`omni updated to v${latest}`);
 }
 function createUpdateCommand() {
-  return new Command("update").description(`Update ${PACKAGE_NAME} to the latest version (restart only services already running)`).option("-y, --yes", "Skip confirmation prompts (non-interactive)").option("--no-restart", "Update CLI only; skip service restarts and API health check on configured API port").addHelpText("after", `
+  return new Command("update").description(`Update ${PACKAGE_NAME} to the latest version (restart only services already running)`).option("-y, --yes", "Skip confirmation prompts (non-interactive)").option("--no-restart", "Update CLI only; skip service restarts and verification").option("--no-sidecar-cleanup", "Skip the legacy nats-reply-sidecar.mjs cleanup step").addHelpText("after", `
 Behavior:
   - Installs the latest CLI package first.
   - Restarts tracked Omni services only when they were online before the update.
-  - When that restart path runs, update checks API health on the configured API port.
-  - Use --no-restart to skip restart and API health-check steps.
-  - Exits non-zero if install succeeds but restart or API health check fails in that restart path.
+  - When that restart path runs, update performs 3-step verification:
+      1. Server version matches the new CLI version (via /api/v2/health).
+      2. Stored CLI API key still validates against the server.
+      3. On success, prints:
+           \u2713 CLI:    v<latest>
+           \u2713 Server: v<latest> (healthy)
+           \u2713 Auth:   key valid
+  - On mismatch, exits non-zero with:
+      "Server version mismatch: cli=v<X> server=v<Y>. Run: omni doctor"
+  - On auth failure, exits non-zero with:
+      "Auth key invalid after restart. Run: omni doctor --fix"
+  - After a successful restart, scans for any legacy nats-reply-sidecar.mjs
+    process (PM2-managed or raw) and stops it. The sidecar was an external
+    workaround for bugs that were fixed in #362; leaving it running causes
+    every agent reply to be delivered twice. Skippable with
+    --no-sidecar-cleanup. Manual runbook:
+      docs/migration/nats-genie-sidecar-decommission.md
+  - Use --no-restart to skip restart + verification entirely. --no-restart
+    also skips sidecar cleanup; manage the sidecar manually.
   - Verify runtime health after update with: omni status
 `).action(runUpdate);
 }
@@ -95505,6 +96325,12 @@ var COMMANDS = [
     helpGroup: "Core",
     helpDescription: "Describe an image or video via Gemini Vision (verb command)"
   },
+  {
+    create: createHistoryCommand,
+    category: "core",
+    helpGroup: "Core",
+    helpDescription: "Show recent messages in the open chat (verb command)"
+  },
   { create: createChatsCommand, category: "core", helpGroup: "Core", helpDescription: "List and manage conversations" },
   {
     create: createMessagesCommand,
@@ -95655,6 +96481,12 @@ var COMMANDS = [
     helpGroup: "System",
     helpDescription: "Interactive setup wizard (bootstrap Omni server)"
   },
+  {
+    create: createDoctorCommand,
+    category: "standard",
+    helpGroup: "System",
+    helpDescription: "Diagnose and repair the embedded omni runtime"
+  },
   {
     create: createMediaCommand,
     category: "standard",