@carllee1983/dbcli 1.20.1 → 1.20.2

package/dist/cli.mjs

@@ -7151,15 +7151,15 @@ var init_config_v2 = __esm(() => {
 });
 
 // node_modules/lru-cache/dist/esm/node/index.min.js
-import { tracingChannel as I, channel as G } from "diagnostics_channel";
-var S, W, C, D = () => S.hasSubscribers || W.hasSubscribers, U, L, P = (u, e, t2, i) => {
+import { tracingChannel as j, channel as G } from "diagnostics_channel";
+var w, W, C, D = () => w.hasSubscribers || W.hasSubscribers, I, L, P = (u, e, t2, i) => {
   typeof L.emitWarning == "function" ? L.emitWarning(u, e, t2, i) : console.error(`[${t2}] ${e}: ${u}`);
-}, H = (u) => !U.has(u), X, F = (u) => !!u && u === Math.floor(u) && u > 0 && isFinite(u), j = (u) => F(u) ? u <= Math.pow(2, 8) ? Uint8Array : u <= Math.pow(2, 16) ? Uint16Array : u <= Math.pow(2, 32) ? Uint32Array : u <= Number.MAX_SAFE_INTEGER ? O : null : null, O, R = class u {
+}, H = (u) => !I.has(u), T = (u) => !!u && u === Math.floor(u) && u > 0 && isFinite(u), U = (u) => T(u) ? u <= Math.pow(2, 8) ? Uint8Array : u <= Math.pow(2, 16) ? Uint16Array : u <= Math.pow(2, 32) ? Uint32Array : u <= Number.MAX_SAFE_INTEGER ? O : null : null, O, R = class u {
   heap;
   length;
   static #o = false;
   static create(e) {
-    let t2 = j(e);
+    let t2 = U(e);
     if (!t2)
       return [];
     u.#o = true;
@@ -7179,12 +7179,11 @@ var S, W, C, D = () => S.hasSubscribers || W.hasSubscribers, U, L, P = (u, e, t2
   }
 }, M;
 var init_index_min = __esm(() => {
-  S = G("lru-cache:metrics");
-  W = I("lru-cache");
+  w = G("lru-cache:metrics");
+  W = j("lru-cache");
   C = typeof performance == "object" && performance && typeof performance.now == "function" ? performance : Date;
-  U = new Set;
+  I = new Set;
   L = typeof process == "object" && process ? process : {};
-  X = Symbol("type");
   O = class extends Array {
     constructor(e) {
       super(e), this.fill(0);
@@ -7192,12 +7191,12 @@ var init_index_min = __esm(() => {
   };
   M = class u2 {
     #o;
-    #u;
+    #c;
     #w;
-    #x;
+    #O;
     #S;
     #M;
-    #U;
+    #I;
     #m;
     get perf() {
       return this.#m;
@@ -7222,9 +7221,9 @@ var init_index_min = __esm(() => {
     #s;
     #i;
     #t;
-    #a;
-    #c;
     #l;
+    #u;
+    #a;
     #h;
     #y;
     #r;
@@ -7233,12 +7232,12 @@ var init_index_min = __esm(() => {
     #d;
     #g;
     #T;
-    #W;
+    #U;
     #f;
-    #j;
+    #x;
     static unsafeExposeInternals(e) {
-      return { starts: e.#F, ttls: e.#d, autopurgeTimers: e.#g, sizes: e.#_, keyMap: e.#s, keyList: e.#i, valList: e.#t, next: e.#a, prev: e.#c, get head() {
-        return e.#l;
+      return { starts: e.#F, ttls: e.#d, autopurgeTimers: e.#g, sizes: e.#_, keyMap: e.#s, keyList: e.#i, valList: e.#t, next: e.#l, prev: e.#u, get head() {
+        return e.#a;
       }, get tail() {
         return e.#h;
       }, free: e.#y, isBackgroundFetch: (t2) => e.#e(t2), backgroundFetch: (t2, i, s, n) => e.#P(t2, i, s, n), moveToTail: (t2) => e.#L(t2), indexes: (t2) => e.#A(t2), rindexes: (t2) => e.#z(t2), isStale: (t2) => e.#p(t2) };
@@ -7247,7 +7246,7 @@ var init_index_min = __esm(() => {
       return this.#o;
     }
     get maxSize() {
-      return this.#u;
+      return this.#c;
     }
     get calculatedSize() {
       return this.#b;
@@ -7259,53 +7258,53 @@ var init_index_min = __esm(() => {
       return this.#M;
     }
     get memoMethod() {
-      return this.#U;
+      return this.#I;
     }
     get dispose() {
       return this.#w;
     }
     get onInsert() {
-      return this.#x;
+      return this.#O;
     }
     get disposeAfter() {
       return this.#S;
     }
     constructor(e) {
-      let { max: t2 = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: r, allowStale: h, dispose: l, onInsert: c, disposeAfter: f, noDisposeOnSet: g, noUpdateTTL: p, maxSize: T = 0, maxEntrySize: w = 0, sizeCalculation: y, fetchMethod: a, memoMethod: m, noDeleteOnFetchRejection: _, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: z, perf: x } = e;
+      let { max: t2 = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: r, updateAgeOnHas: h, allowStale: a, dispose: o, onInsert: p, disposeAfter: m, noDisposeOnSet: _, noUpdateTTL: c, maxSize: d = 0, maxEntrySize: f = 0, sizeCalculation: y, fetchMethod: l, memoMethod: S, noDeleteOnFetchRejection: F, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: g, allowStaleOnFetchAbort: A, ignoreFetchAbort: z, perf: x } = e;
       if (x !== undefined && typeof x?.now != "function")
         throw new TypeError("perf option must have a now() method if specified");
-      if (this.#m = x ?? C, t2 !== 0 && !F(t2))
+      if (this.#m = x ?? C, t2 !== 0 && !T(t2))
         throw new TypeError("max option must be a nonnegative integer");
-      let v = t2 ? j(t2) : Array;
-      if (!v)
+      let E = t2 ? U(t2) : Array;
+      if (!E)
         throw new Error("invalid max value: " + t2);
-      if (this.#o = t2, this.#u = T, this.maxEntrySize = w || this.#u, this.sizeCalculation = y, this.sizeCalculation) {
-        if (!this.#u && !this.maxEntrySize)
+      if (this.#o = t2, this.#c = d, this.maxEntrySize = f || this.#c, this.sizeCalculation = y, this.sizeCalculation) {
+        if (!this.#c && !this.maxEntrySize)
           throw new TypeError("cannot set sizeCalculation without setting maxSize or maxEntrySize");
         if (typeof this.sizeCalculation != "function")
           throw new TypeError("sizeCalculation set to non-function");
       }
-      if (m !== undefined && typeof m != "function")
+      if (S !== undefined && typeof S != "function")
         throw new TypeError("memoMethod must be a function if defined");
-      if (this.#U = m, a !== undefined && typeof a != "function")
+      if (this.#I = S, l !== undefined && typeof l != "function")
         throw new TypeError("fetchMethod must be a function if specified");
-      if (this.#M = a, this.#W = !!a, this.#s = new Map, this.#i = Array.from({ length: t2 }).fill(undefined), this.#t = Array.from({ length: t2 }).fill(undefined), this.#a = new v(t2), this.#c = new v(t2), this.#l = 0, this.#h = 0, this.#y = R.create(t2), this.#n = 0, this.#b = 0, typeof l == "function" && (this.#w = l), typeof c == "function" && (this.#x = c), typeof f == "function" ? (this.#S = f, this.#r = []) : (this.#S = undefined, this.#r = undefined), this.#T = !!this.#w, this.#j = !!this.#x, this.#f = !!this.#S, this.noDisposeOnSet = !!g, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!_, this.allowStaleOnFetchRejection = !!d, this.allowStaleOnFetchAbort = !!A, this.ignoreFetchAbort = !!z, this.maxEntrySize !== 0) {
-        if (this.#u !== 0 && !F(this.#u))
+      if (this.#M = l, this.#U = !!l, this.#s = new Map, this.#i = Array.from({ length: t2 }).fill(undefined), this.#t = Array.from({ length: t2 }).fill(undefined), this.#l = new E(t2), this.#u = new E(t2), this.#a = 0, this.#h = 0, this.#y = R.create(t2), this.#n = 0, this.#b = 0, typeof o == "function" && (this.#w = o), typeof p == "function" && (this.#O = p), typeof m == "function" ? (this.#S = m, this.#r = []) : (this.#S = undefined, this.#r = undefined), this.#T = !!this.#w, this.#x = !!this.#O, this.#f = !!this.#S, this.noDisposeOnSet = !!_, this.noUpdateTTL = !!c, this.noDeleteOnFetchRejection = !!F, this.allowStaleOnFetchRejection = !!g, this.allowStaleOnFetchAbort = !!A, this.ignoreFetchAbort = !!z, this.maxEntrySize !== 0) {
+        if (this.#c !== 0 && !T(this.#c))
           throw new TypeError("maxSize must be a positive integer if specified");
-        if (!F(this.maxEntrySize))
+        if (!T(this.maxEntrySize))
           throw new TypeError("maxEntrySize must be a positive integer if specified");
         this.#X();
       }
-      if (this.allowStale = !!h, this.noDeleteOnStaleGet = !!b, this.updateAgeOnGet = !!o, this.updateAgeOnHas = !!r, this.ttlResolution = F(s) || s === 0 ? s : 1, this.ttlAutopurge = !!n, this.ttl = i || 0, this.ttl) {
-        if (!F(this.ttl))
+      if (this.allowStale = !!a, this.noDeleteOnStaleGet = !!b, this.updateAgeOnGet = !!r, this.updateAgeOnHas = !!h, this.ttlResolution = T(s) || s === 0 ? s : 1, this.ttlAutopurge = !!n, this.ttl = i || 0, this.ttl) {
+        if (!T(this.ttl))
           throw new TypeError("ttl must be a positive integer if specified");
         this.#H();
       }
-      if (this.#o === 0 && this.ttl === 0 && this.#u === 0)
+      if (this.#o === 0 && this.ttl === 0 && this.#c === 0)
         throw new TypeError("At least one of max, maxSize, or ttl is required");
-      if (!this.ttlAutopurge && !this.#o && !this.#u) {
-        let E = "LRU_CACHE_UNBOUNDED";
-        H(E) && (U.add(E), P("TTL caching without ttlAutopurge, max, or maxSize can result in unbounded memory consumption.", "UnboundedCacheWarning", E, u2));
+      if (!this.ttlAutopurge && !this.#o && !this.#c) {
+        let v = "LRU_CACHE_UNBOUNDED";
+        H(v) && (I.add(v), P("TTL caching without ttlAutopurge, max, or maxSize can result in unbounded memory consumption.", "UnboundedCacheWarning", v, u2));
       }
     }
     getRemainingTTL(e) {
@@ -7315,75 +7314,75 @@ var init_index_min = __esm(() => {
       let e = new O(this.#o), t2 = new O(this.#o);
       this.#d = e, this.#F = t2;
       let i = this.ttlAutopurge ? Array.from({ length: this.#o }) : undefined;
-      this.#g = i, this.#N = (r, h, l = this.#m.now()) => {
-        t2[r] = h !== 0 ? l : 0, e[r] = h, s(r, h);
-      }, this.#D = (r) => {
-        t2[r] = e[r] !== 0 ? this.#m.now() : 0, s(r, e[r]);
+      this.#g = i, this.#N = (h, a, o = this.#m.now()) => {
+        t2[h] = a !== 0 ? o : 0, e[h] = a, s(h, a);
+      }, this.#D = (h) => {
+        t2[h] = e[h] !== 0 ? this.#m.now() : 0, s(h, e[h]);
       };
-      let s = this.ttlAutopurge ? (r, h) => {
-        if (i?.[r] && (clearTimeout(i[r]), i[r] = undefined), h && h !== 0 && i) {
-          let l = setTimeout(() => {
-            this.#p(r) && this.#v(this.#i[r], "expire");
-          }, h + 1);
-          l.unref && l.unref(), i[r] = l;
+      let s = this.ttlAutopurge ? (h, a) => {
+        if (i?.[h] && (clearTimeout(i[h]), i[h] = undefined), a && a !== 0 && i) {
+          let o = setTimeout(() => {
+            this.#p(h) && this.#E(this.#i[h], "expire");
+          }, a + 1);
+          o.unref && o.unref(), i[h] = o;
         }
       } : () => {};
-      this.#E = (r, h) => {
-        if (e[h]) {
-          let l = e[h], c = t2[h];
-          if (!l || !c)
+      this.#v = (h, a) => {
+        if (e[a]) {
+          let o = e[a], p = t2[a];
+          if (!o || !p)
             return;
-          r.ttl = l, r.start = c, r.now = n || o();
-          let f = r.now - c;
-          r.remainingTTL = l - f;
+          h.ttl = o, h.start = p, h.now = n || r();
+          let m = h.now - p;
+          h.remainingTTL = o - m;
         }
       };
-      let n = 0, o = () => {
-        let r = this.#m.now();
+      let n = 0, r = () => {
+        let h = this.#m.now();
         if (this.ttlResolution > 0) {
-          n = r;
-          let h = setTimeout(() => n = 0, this.ttlResolution);
-          h.unref && h.unref();
+          n = h;
+          let a = setTimeout(() => n = 0, this.ttlResolution);
+          a.unref && a.unref();
         }
-        return r;
+        return h;
       };
-      this.getRemainingTTL = (r) => {
-        let h = this.#s.get(r);
-        if (h === undefined)
+      this.getRemainingTTL = (h) => {
+        let a = this.#s.get(h);
+        if (a === undefined)
           return 0;
-        let l = e[h], c = t2[h];
-        if (!l || !c)
+        let o = e[a], p = t2[a];
+        if (!o || !p)
           return 1 / 0;
-        let f = (n || o()) - c;
-        return l - f;
-      }, this.#p = (r) => {
-        let h = t2[r], l = e[r];
-        return !!l && !!h && (n || o()) - h > l;
+        let m = (n || r()) - p;
+        return o - m;
+      }, this.#p = (h) => {
+        let a = t2[h], o = e[h];
+        return !!o && !!a && (n || r()) - a > o;
       };
     }
     #D = () => {};
-    #E = () => {};
+    #v = () => {};
     #N = () => {};
     #p = () => false;
     #X() {
       let e = new O(this.#o);
       this.#b = 0, this.#_ = e, this.#R = (t2) => {
         this.#b -= e[t2], e[t2] = 0;
-      }, this.#k = (t2, i, s, n) => {
+      }, this.#V = (t2, i, s, n) => {
         if (this.#e(i))
           return 0;
-        if (!F(s))
+        if (!T(s))
           if (n) {
             if (typeof n != "function")
               throw new TypeError("sizeCalculation must be a function");
-            if (s = n(i, t2), !F(s))
+            if (s = n(i, t2), !T(s))
               throw new TypeError("sizeCalculation return invalid (expect positive integer)");
           } else
             throw new TypeError("invalid size value (must be positive integer). When maxSize or maxEntrySize is used, sizeCalculation or size must be set.");
         return s;
-      }, this.#I = (t2, i, s) => {
-        if (e[t2] = i, this.#u) {
-          let n = this.#u - e[t2];
+      }, this.#j = (t2, i, s) => {
+        if (e[t2] = i, this.#c) {
+          let n = this.#c - e[t2];
           for (;this.#b > n; )
             this.#G(true);
         }
@@ -7391,23 +7390,23 @@ var init_index_min = __esm(() => {
       };
     }
     #R = (e) => {};
-    #I = (e, t2, i) => {};
-    #k = (e, t2, i, s) => {
+    #j = (e, t2, i) => {};
+    #V = (e, t2, i, s) => {
       if (i || s)
         throw new TypeError("cannot set size without setting maxSize or maxEntrySize on cache");
       return 0;
     };
     *#A({ allowStale: e = this.allowStale } = {}) {
       if (this.#n)
-        for (let t2 = this.#h;this.#V(t2) && ((e || !this.#p(t2)) && (yield t2), t2 !== this.#l); )
-          t2 = this.#c[t2];
+        for (let t2 = this.#h;this.#B(t2) && ((e || !this.#p(t2)) && (yield t2), t2 !== this.#a); )
+          t2 = this.#u[t2];
     }
     *#z({ allowStale: e = this.allowStale } = {}) {
       if (this.#n)
-        for (let t2 = this.#l;this.#V(t2) && ((e || !this.#p(t2)) && (yield t2), t2 !== this.#h); )
-          t2 = this.#a[t2];
+        for (let t2 = this.#a;this.#B(t2) && ((e || !this.#p(t2)) && (yield t2), t2 !== this.#h); )
+          t2 = this.#l[t2];
     }
-    #V(e) {
+    #B(e) {
       return e !== undefined && this.#s.get(this.#i[e]) === e;
     }
     *entries() {
@@ -7464,7 +7463,7 @@ var init_index_min = __esm(() => {
     purgeStale() {
       let e = false;
       for (let t2 of this.#z({ allowStale: true }))
-        this.#p(t2) && (this.#v(this.#i[t2], "expire"), e = true);
+        this.#p(t2) && (this.#E(this.#i[t2], "expire"), e = true);
       return e;
     }
     info(e) {
@@ -7476,10 +7475,10 @@ var init_index_min = __esm(() => {
         return;
       let n = { value: s };
       if (this.#d && this.#F) {
-        let o = this.#d[t2], r = this.#F[t2];
-        if (o && r) {
-          let h = o - (this.#m.now() - r);
-          n.ttl = h, n.start = Date.now();
+        let r = this.#d[t2], h = this.#F[t2];
+        if (r && h) {
+          let a = r - (this.#m.now() - h);
+          n.ttl = a, n.start = Date.now();
         }
       }
       return this.#_ && (n.size = this.#_[t2]), n;
@@ -7490,13 +7489,13 @@ var init_index_min = __esm(() => {
         let i = this.#i[t2], s = this.#t[t2], n = this.#e(s) ? s.__staleWhileFetching : s;
         if (n === undefined || i === undefined)
           continue;
-        let o = { value: n };
+        let r = { value: n };
         if (this.#d && this.#F) {
-          o.ttl = this.#d[t2];
-          let r = this.#m.now() - this.#F[t2];
-          o.start = Math.floor(Date.now() - r);
+          r.ttl = this.#d[t2];
+          let h = this.#m.now() - this.#F[t2];
+          r.start = Math.floor(Date.now() - h);
         }
-        this.#_ && (o.size = this.#_[t2]), e.unshift([i, o]);
+        this.#_ && (r.size = this.#_[t2]), e.unshift([i, r]);
       }
       return e;
     }
@@ -7507,57 +7506,56 @@ var init_index_min = __esm(() => {
           let s = Date.now() - i.start;
           i.start = this.#m.now() - s;
         }
-        this.#O(t2, i.value, i);
+        this.#W(t2, i.value, i);
       }
     }
     set(e, t2, i = {}) {
-      let { status: s = S.hasSubscribers ? {} : undefined } = i;
-      i.status = s, s && (s.op = "set", s.key = e, t2 !== undefined && (s.value = t2));
-      let n = this.#O(e, t2, i);
-      return s && S.hasSubscribers && S.publish(s), n;
+      let { status: s = w.hasSubscribers ? {} : undefined } = i;
+      i.status = s, s && (s.op = "set", s.key = e, t2 !== undefined && (s.value = t2), s.cache = this);
+      let n = this.#W(e, t2, i);
+      return s && w.hasSubscribers && w.publish(s), n;
     }
-    #O(e, t2, i = {}) {
-      let { ttl: s = this.ttl, start: n, noDisposeOnSet: o = this.noDisposeOnSet, sizeCalculation: r = this.sizeCalculation, status: h } = i;
+    #W(e, t2, i, s) {
+      let { ttl: n = this.ttl, start: r, noDisposeOnSet: h = this.noDisposeOnSet, sizeCalculation: a = this.sizeCalculation, status: o } = i;
       if (t2 === undefined)
-        return h && (h.set = "deleted"), this.delete(e), this;
-      let { noUpdateTTL: l = this.noUpdateTTL } = i;
-      h && !this.#e(t2) && (h.value = t2);
-      let c = this.#k(e, t2, i.size || 0, r, h);
-      if (this.maxEntrySize && c > this.maxEntrySize)
-        return this.#v(e, "set"), h && (h.set = "miss", h.maxEntrySizeExceeded = true), this;
-      let f = this.#n === 0 ? undefined : this.#s.get(e);
-      if (f === undefined)
-        f = this.#n === 0 ? this.#h : this.#y.length !== 0 ? this.#y.pop() : this.#n === this.#o ? this.#G(false) : this.#n, this.#i[f] = e, this.#t[f] = t2, this.#s.set(e, f), this.#a[this.#h] = f, this.#c[f] = this.#h, this.#h = f, this.#n++, this.#I(f, c, h), h && (h.set = "add"), l = false, this.#j && this.#x?.(t2, e, "add");
+        return o && (o.set = "deleted"), this.delete(e), this;
+      let { noUpdateTTL: p = this.noUpdateTTL } = i, m = this.#e(t2);
+      o && !m && (o.value = t2);
+      let _ = this.#V(e, t2, i.size || 0, a, o);
+      if (this.maxEntrySize && _ > this.maxEntrySize)
+        return this.#E(e, "set"), o && (o.set = "miss", o.maxEntrySizeExceeded = true), this;
+      let c = this.#n === 0 ? undefined : this.#s.get(e);
+      if (c === undefined)
+        c = this.#n === 0 ? this.#h : this.#y.length !== 0 ? this.#y.pop() : this.#n === this.#o ? this.#G(false) : this.#n, this.#i[c] = e, this.#t[c] = t2, this.#s.set(e, c), this.#l[this.#h] = c, this.#u[c] = this.#h, this.#h = c, this.#n++, this.#j(c, _, o), o && (o.set = "add"), p = false, this.#x && !m && this.#O?.(t2, e, "add");
       else {
-        this.#L(f);
-        let g = this.#t[f];
-        if (t2 !== g) {
-          if (this.#W && this.#e(g)) {
-            g.__abortController.abort(new Error("replaced"));
-            let { __staleWhileFetching: p } = g;
-            p !== undefined && !o && (this.#T && this.#w?.(p, e, "set"), this.#f && this.#r?.push([p, e, "set"]));
-          } else
-            o || (this.#T && this.#w?.(g, e, "set"), this.#f && this.#r?.push([g, e, "set"]));
-          if (this.#R(f), this.#I(f, c, h), this.#t[f] = t2, h) {
-            h.set = "replace";
-            let p = g && this.#e(g) ? g.__staleWhileFetching : g;
-            p !== undefined && (h.oldValue = p);
+        this.#L(c);
+        let d = this.#t[c];
+        if (t2 !== d) {
+          if (!h)
+            if (this.#e(d)) {
+              d !== s && d.__abortController.abort(new Error("replaced"));
+              let { __staleWhileFetching: f } = d;
+              f !== undefined && f !== t2 && (this.#T && this.#w?.(f, e, "set"), this.#f && this.#r?.push([f, e, "set"]));
+            } else
+              this.#T && this.#w?.(d, e, "set"), this.#f && this.#r?.push([d, e, "set"]);
+          if (this.#R(c), this.#j(c, _, o), this.#t[c] = t2, !m) {
+            let f = d && this.#e(d) ? d.__staleWhileFetching : d, y = f === undefined ? "add" : t2 !== f ? "replace" : "update";
+            o && (o.set = y, f !== undefined && (o.oldValue = f)), this.#x && this.onInsert?.(t2, e, y);
           }
         } else
-          h && (h.set = "update");
-        this.#j && this.onInsert?.(t2, e, t2 === g ? "update" : "replace");
+          m || (o && (o.set = "update"), this.#x && this.onInsert?.(t2, e, "update"));
       }
-      if (s !== 0 && !this.#d && this.#H(), this.#d && (l || this.#N(f, s, n), h && this.#E(h, f)), !o && this.#f && this.#r) {
-        let g = this.#r, p;
-        for (;p = g?.shift(); )
-          this.#S?.(...p);
+      if (n !== 0 && !this.#d && this.#H(), this.#d && (p || this.#N(c, n, r), o && this.#v(o, c)), !h && this.#f && this.#r) {
+        let d = this.#r, f;
+        for (;f = d?.shift(); )
+          this.#S?.(...f);
       }
       return this;
     }
     pop() {
       try {
         for (;this.#n; ) {
-          let e = this.#t[this.#l];
+          let e = this.#t[this.#a];
           if (this.#G(true), this.#e(e)) {
             if (e.__staleWhileFetching)
               return e.__staleWhileFetching;
@@ -7573,34 +7571,36 @@ var init_index_min = __esm(() => {
       }
     }
     #G(e) {
-      let t2 = this.#l, i = this.#i[t2], s = this.#t[t2];
-      return this.#W && this.#e(s) ? s.__abortController.abort(new Error("evicted")) : (this.#T || this.#f) && (this.#T && this.#w?.(s, i, "evict"), this.#f && this.#r?.push([s, i, "evict"])), this.#R(t2), this.#g?.[t2] && (clearTimeout(this.#g[t2]), this.#g[t2] = undefined), e && (this.#i[t2] = undefined, this.#t[t2] = undefined, this.#y.push(t2)), this.#n === 1 ? (this.#l = this.#h = 0, this.#y.length = 0) : this.#l = this.#a[t2], this.#s.delete(i), this.#n--, t2;
+      let t2 = this.#a, i = this.#i[t2], s = this.#t[t2], n = this.#e(s);
+      n && s.__abortController.abort(new Error("evicted"));
+      let r = n ? s.__staleWhileFetching : s;
+      return (this.#T || this.#f) && r !== undefined && (this.#T && this.#w?.(r, i, "evict"), this.#f && this.#r?.push([r, i, "evict"])), this.#R(t2), this.#g?.[t2] && (clearTimeout(this.#g[t2]), this.#g[t2] = undefined), e && (this.#i[t2] = undefined, this.#t[t2] = undefined, this.#y.push(t2)), this.#n === 1 ? (this.#a = this.#h = 0, this.#y.length = 0) : this.#a = this.#l[t2], this.#s.delete(i), this.#n--, t2;
     }
     has(e, t2 = {}) {
-      let { status: i = S.hasSubscribers ? {} : undefined } = t2;
-      t2.status = i, i && (i.op = "has", i.key = e);
+      let { status: i = w.hasSubscribers ? {} : undefined } = t2;
+      t2.status = i, i && (i.op = "has", i.key = e, i.cache = this);
       let s = this.#Y(e, t2);
-      return S.hasSubscribers && S.publish(i), s;
+      return w.hasSubscribers && w.publish(i), s;
     }
     #Y(e, t2 = {}) {
       let { updateAgeOnHas: i = this.updateAgeOnHas, status: s } = t2, n = this.#s.get(e);
       if (n !== undefined) {
-        let o = this.#t[n];
-        if (this.#e(o) && o.__staleWhileFetching === undefined)
+        let r = this.#t[n];
+        if (this.#e(r) && r.__staleWhileFetching === undefined)
           return false;
         if (this.#p(n))
-          s && (s.has = "stale", this.#E(s, n));
+          s && (s.has = "stale", this.#v(s, n));
         else
-          return i && this.#D(n), s && (s.has = "hit", this.#E(s, n)), true;
+          return i && this.#D(n), s && (s.has = "hit", this.#v(s, n)), true;
       } else
         s && (s.has = "miss");
       return false;
     }
     peek(e, t2 = {}) {
       let { status: i = D() ? {} : undefined } = t2;
-      i && (i.op = "peek", i.key = e), t2.status = i;
+      i && (i.op = "peek", i.key = e, i.cache = this), t2.status = i;
       let s = this.#J(e, t2);
-      return S.hasSubscribers && S.publish(i), s;
+      return w.hasSubscribers && w.publish(i), s;
     }
     #J(e, t2) {
       let { status: i, allowStale: s = this.allowStale } = t2, n = this.#s.get(e);
@@ -7608,39 +7608,39 @@ var init_index_min = __esm(() => {
         i && (i.peek = n === undefined ? "miss" : "stale");
         return;
       }
-      let o = this.#t[n], r = this.#e(o) ? o.__staleWhileFetching : o;
-      return i && (r !== undefined ? (i.peek = "hit", i.value = r) : i.peek = "miss"), r;
+      let r = this.#t[n], h = this.#e(r) ? r.__staleWhileFetching : r;
+      return i && (h !== undefined ? (i.peek = "hit", i.value = h) : i.peek = "miss"), h;
     }
     #P(e, t2, i, s) {
       let n = t2 === undefined ? undefined : this.#t[t2];
       if (this.#e(n))
         return n;
-      let o = new AbortController, { signal: r } = i;
-      r?.addEventListener("abort", () => o.abort(r.reason), { signal: o.signal });
-      let h = { signal: o.signal, options: i, context: s }, l = (w, y = false) => {
-        let { aborted: a } = o.signal, m = i.ignoreFetchAbort && w !== undefined, _ = i.ignoreFetchAbort || !!(i.allowStaleOnFetchAbort && w !== undefined);
-        if (i.status && (a && !y ? (i.status.fetchAborted = true, i.status.fetchError = o.signal.reason, m && (i.status.fetchAbortIgnored = true)) : i.status.fetchResolved = true), a && !m && !y)
-          return f(o.signal.reason, _);
-        let b = p, d = this.#t[t2];
-        return (d === p || d === undefined && m && y) && (w === undefined ? b.__staleWhileFetching !== undefined ? this.#t[t2] = b.__staleWhileFetching : this.#v(e, "fetch") : (i.status && (i.status.fetchUpdated = true), this.#O(e, w, h.options))), w;
-      }, c = (w) => (i.status && (i.status.fetchRejected = true, i.status.fetchError = w), f(w, false)), f = (w, y) => {
-        let { aborted: a } = o.signal, m = a && i.allowStaleOnFetchAbort, _ = m || i.allowStaleOnFetchRejection, b = _ || i.noDeleteOnFetchRejection, d = p;
-        if (this.#t[t2] === p && (!b || !y && d.__staleWhileFetching === undefined ? this.#v(e, "fetch") : m || (this.#t[t2] = d.__staleWhileFetching)), _)
-          return i.status && d.__staleWhileFetching !== undefined && (i.status.returnedStale = true), d.__staleWhileFetching;
-        if (d.__returned === d)
-          throw w;
-      }, g = (w, y) => {
-        let a = this.#M?.(e, n, h);
-        a && a instanceof Promise && a.then((m) => w(m === undefined ? undefined : m), y), o.signal.addEventListener("abort", () => {
-          (!i.ignoreFetchAbort || i.allowStaleOnFetchAbort) && (w(undefined), i.allowStaleOnFetchAbort && (w = (m) => l(m, true)));
-        });
+      let r = new AbortController, { signal: h } = i;
+      h?.addEventListener("abort", () => r.abort(h.reason), { signal: r.signal });
+      let a = { signal: r.signal, options: i, context: s }, o = (f, y = false) => {
+        let { aborted: l } = r.signal, S = i.ignoreFetchAbort && f !== undefined, F = i.ignoreFetchAbort || !!(i.allowStaleOnFetchAbort && f !== undefined);
+        if (i.status && (l && !y ? (i.status.fetchAborted = true, i.status.fetchError = r.signal.reason, S && (i.status.fetchAbortIgnored = true)) : i.status.fetchResolved = true), l && !S && !y)
+          return m(r.signal.reason, F);
+        let b = c, g = this.#t[t2];
+        return (g === c || g === undefined && S && y) && (f === undefined ? b.__staleWhileFetching !== undefined ? this.#t[t2] = b.__staleWhileFetching : this.#E(e, "fetch") : (i.status && (i.status.fetchUpdated = true), this.#W(e, f, a.options, b))), f;
+      }, p = (f) => (i.status && (i.status.fetchRejected = true, i.status.fetchError = f), m(f, false)), m = (f, y) => {
+        let { aborted: l } = r.signal, S = l && i.allowStaleOnFetchAbort, F = S || i.allowStaleOnFetchRejection, b = F || i.noDeleteOnFetchRejection, g = c;
+        if (this.#t[t2] === c && (!b || !y && g.__staleWhileFetching === undefined ? this.#E(e, "fetch") : S || (this.#t[t2] = g.__staleWhileFetching)), F)
+          return i.status && g.__staleWhileFetching !== undefined && (i.status.returnedStale = true), g.__staleWhileFetching;
+        if (g.__returned === g)
+          throw f;
+      }, _ = (f, y) => {
+        let l = this.#M?.(e, n, a);
+        r.signal.addEventListener("abort", () => {
+          (!i.ignoreFetchAbort || i.allowStaleOnFetchAbort) && (f(undefined), i.allowStaleOnFetchAbort && (f = (S) => o(S, true)));
+        }), l && l instanceof Promise ? l.then((S) => f(S === undefined ? undefined : S), y) : l !== undefined && f(l);
       };
       i.status && (i.status.fetchDispatched = true);
-      let p = new Promise(g).then(l, c), T = Object.assign(p, { __abortController: o, __staleWhileFetching: n, __returned: undefined });
-      return t2 === undefined ? (this.#O(e, T, { ...h.options, status: undefined }), t2 = this.#s.get(e)) : this.#t[t2] = T, T;
+      let c = new Promise(_).then(o, p), d = Object.assign(c, { __abortController: r, __staleWhileFetching: n, __returned: undefined });
+      return t2 === undefined ? (this.#W(e, d, { ...a.options, status: undefined }), t2 = this.#s.get(e)) : this.#t[t2] = d, d;
     }
     #e(e) {
-      if (!this.#W)
+      if (!this.#U)
         return false;
       let t2 = e;
       return !!t2 && t2 instanceof Promise && t2.hasOwnProperty("__staleWhileFetching") && t2.__abortController instanceof AbortController;
@@ -7648,29 +7648,29 @@ var init_index_min = __esm(() => {
     fetch(e, t2 = {}) {
       let i = W.hasSubscribers, { status: s = D() ? {} : undefined } = t2;
       t2.status = s, s && t2.context && (s.context = t2.context);
-      let n = this.#B(e, t2);
+      let n = this.#k(e, t2);
       return s && i && (s.trace = true, W.tracePromise(() => n, s).catch(() => {})), n;
     }
-    async#B(e, t2 = {}) {
-      let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, ttl: o = this.ttl, noDisposeOnSet: r = this.noDisposeOnSet, size: h = 0, sizeCalculation: l = this.sizeCalculation, noUpdateTTL: c = this.noUpdateTTL, noDeleteOnFetchRejection: f = this.noDeleteOnFetchRejection, allowStaleOnFetchRejection: g = this.allowStaleOnFetchRejection, ignoreFetchAbort: p = this.ignoreFetchAbort, allowStaleOnFetchAbort: T = this.allowStaleOnFetchAbort, context: w, forceRefresh: y = false, status: a, signal: m } = t2;
-      if (a && (a.op = "fetch", a.key = e, y && (a.forceRefresh = true)), !this.#W)
-        return a && (a.fetch = "get"), this.#C(e, { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: n, status: a });
-      let _ = { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: n, ttl: o, noDisposeOnSet: r, size: h, sizeCalculation: l, noUpdateTTL: c, noDeleteOnFetchRejection: f, allowStaleOnFetchRejection: g, allowStaleOnFetchAbort: T, ignoreFetchAbort: p, status: a, signal: m }, b = this.#s.get(e);
+    async#k(e, t2 = {}) {
+      let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, ttl: r = this.ttl, noDisposeOnSet: h = this.noDisposeOnSet, size: a = 0, sizeCalculation: o = this.sizeCalculation, noUpdateTTL: p = this.noUpdateTTL, noDeleteOnFetchRejection: m = this.noDeleteOnFetchRejection, allowStaleOnFetchRejection: _ = this.allowStaleOnFetchRejection, ignoreFetchAbort: c = this.ignoreFetchAbort, allowStaleOnFetchAbort: d = this.allowStaleOnFetchAbort, context: f, forceRefresh: y = false, status: l, signal: S } = t2;
+      if (l && (l.op = "fetch", l.key = e, y && (l.forceRefresh = true), l.cache = this), !this.#U)
+        return l && (l.fetch = "get"), this.#C(e, { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: n, status: l });
+      let F = { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: n, ttl: r, noDisposeOnSet: h, size: a, sizeCalculation: o, noUpdateTTL: p, noDeleteOnFetchRejection: m, allowStaleOnFetchRejection: _, allowStaleOnFetchAbort: d, ignoreFetchAbort: c, status: l, signal: S }, b = this.#s.get(e);
       if (b === undefined) {
-        a && (a.fetch = "miss");
-        let d = this.#P(e, b, _, w);
-        return d.__returned = d;
+        l && (l.fetch = "miss");
+        let g = this.#P(e, b, F, f);
+        return g.__returned = g;
       } else {
-        let d = this.#t[b];
-        if (this.#e(d)) {
-          let E = i && d.__staleWhileFetching !== undefined;
-          return a && (a.fetch = "inflight", E && (a.returnedStale = true)), E ? d.__staleWhileFetching : d.__returned = d;
+        let g = this.#t[b];
+        if (this.#e(g)) {
+          let v = i && g.__staleWhileFetching !== undefined;
+          return l && (l.fetch = "inflight", v && (l.returnedStale = true)), v ? g.__staleWhileFetching : g.__returned = g;
         }
         let A = this.#p(b);
         if (!y && !A)
-          return a && (a.fetch = "hit"), this.#L(b), s && this.#D(b), a && this.#E(a, b), d;
-        let z = this.#P(e, b, _, w), v = z.__staleWhileFetching !== undefined && i;
-        return a && (a.fetch = A ? "stale" : "refresh", v && A && (a.returnedStale = true)), v ? z.__staleWhileFetching : z.__returned = z;
+          return l && (l.fetch = "hit"), this.#L(b), s && this.#D(b), l && this.#v(l, b), g;
+        let z = this.#P(e, b, F, f), E = z.__staleWhileFetching !== undefined && i;
+        return l && (l.fetch = A ? "stale" : "refresh", E && A && (l.returnedStale = true)), E ? z.__staleWhileFetching : z.__returned = z;
       }
     }
     forceFetch(e, t2 = {}) {
@@ -7680,55 +7680,55 @@ var init_index_min = __esm(() => {
       return s && i && (s.trace = true, W.tracePromise(() => n, s).catch(() => {})), n;
     }
     async#K(e, t2 = {}) {
-      let i = await this.#B(e, t2);
+      let i = await this.#k(e, t2);
       if (i === undefined)
         throw new Error("fetch() returned undefined");
       return i;
     }
     memo(e, t2 = {}) {
-      let { status: i = S.hasSubscribers ? {} : undefined } = t2;
-      t2.status = i, i && (i.op = "memo", i.key = e, t2.context && (i.context = t2.context));
+      let { status: i = w.hasSubscribers ? {} : undefined } = t2;
+      t2.status = i, i && (i.op = "memo", i.key = e, t2.context && (i.context = t2.context), i.cache = this);
       let s = this.#Q(e, t2);
-      return i && (i.value = s), S.hasSubscribers && S.publish(i), s;
+      return i && (i.value = s), w.hasSubscribers && w.publish(i), s;
     }
     #Q(e, t2 = {}) {
-      let i = this.#U;
+      let i = this.#I;
       if (!i)
         throw new Error("no memoMethod provided to constructor");
-      let { context: s, status: n, forceRefresh: o, ...r } = t2;
-      n && o && (n.forceRefresh = true);
-      let h = this.#C(e, r), l = o || h === undefined;
-      if (n && (n.memo = l ? "miss" : "hit", l || (n.value = h)), !l)
-        return h;
-      let c = i(e, h, { options: r, context: s });
-      return n && (n.value = c), this.#O(e, c, r), c;
+      let { context: s, status: n, forceRefresh: r, ...h } = t2;
+      n && r && (n.forceRefresh = true);
+      let a = this.#C(e, h), o = r || a === undefined;
+      if (n && (n.memo = o ? "miss" : "hit", o || (n.value = a)), !o)
+        return a;
+      let p = i(e, a, { options: h, context: s });
+      return n && (n.value = p), this.#W(e, p, h), p;
     }
     get(e, t2 = {}) {
-      let { status: i = S.hasSubscribers ? {} : undefined } = t2;
-      t2.status = i, i && (i.op = "get", i.key = e);
+      let { status: i = w.hasSubscribers ? {} : undefined } = t2;
+      t2.status = i, i && (i.op = "get", i.key = e, i.cache = this);
       let s = this.#C(e, t2);
-      return i && (s !== undefined && (i.value = s), S.hasSubscribers && S.publish(i)), s;
+      return i && (s !== undefined && (i.value = s), w.hasSubscribers && w.publish(i)), s;
     }
     #C(e, t2 = {}) {
-      let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, status: o } = t2, r = this.#s.get(e);
-      if (r === undefined) {
-        o && (o.get = "miss");
+      let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, status: r } = t2, h = this.#s.get(e);
+      if (h === undefined) {
+        r && (r.get = "miss");
         return;
       }
-      let h = this.#t[r], l = this.#e(h);
-      return o && this.#E(o, r), this.#p(r) ? l ? (o && (o.get = "stale-fetching"), i && h.__staleWhileFetching !== undefined ? (o && (o.returnedStale = true), h.__staleWhileFetching) : undefined) : (n || this.#v(e, "expire"), o && (o.get = "stale"), i ? (o && (o.returnedStale = true), h) : undefined) : (o && (o.get = l ? "fetching" : "hit"), this.#L(r), s && this.#D(r), l ? h.__staleWhileFetching : h);
+      let a = this.#t[h], o = this.#e(a);
+      return r && this.#v(r, h), this.#p(h) ? o ? (r && (r.get = "stale-fetching"), i && a.__staleWhileFetching !== undefined ? (r && (r.returnedStale = true), a.__staleWhileFetching) : undefined) : (n || this.#E(e, "expire"), r && (r.get = "stale"), i ? (r && (r.returnedStale = true), a) : undefined) : (r && (r.get = o ? "fetching" : "hit"), this.#L(h), s && this.#D(h), o ? a.__staleWhileFetching : a);
     }
     #$(e, t2) {
-      this.#c[t2] = e, this.#a[e] = t2;
+      this.#u[t2] = e, this.#l[e] = t2;
     }
     #L(e) {
-      e !== this.#h && (e === this.#l ? this.#l = this.#a[e] : this.#$(this.#c[e], this.#a[e]), this.#$(this.#h, e), this.#h = e);
+      e !== this.#h && (e === this.#a ? this.#a = this.#l[e] : this.#$(this.#u[e], this.#l[e]), this.#$(this.#h, e), this.#h = e);
     }
     delete(e) {
-      return this.#v(e, "delete");
+      return this.#E(e, "delete");
     }
-    #v(e, t2) {
-      S.hasSubscribers && S.publish({ op: "delete", delete: t2, key: e });
+    #E(e, t2) {
+      w.hasSubscribers && w.publish({ op: "delete", delete: t2, key: e, cache: this });
       let i = false;
       if (this.#n !== 0) {
         let s = this.#s.get(e);
@@ -7739,14 +7739,14 @@ var init_index_min = __esm(() => {
             this.#R(s);
             let n = this.#t[s];
             if (this.#e(n) ? n.__abortController.abort(new Error("deleted")) : (this.#T || this.#f) && (this.#T && this.#w?.(n, e, t2), this.#f && this.#r?.push([n, e, t2])), this.#s.delete(e), this.#i[s] = undefined, this.#t[s] = undefined, s === this.#h)
-              this.#h = this.#c[s];
-            else if (s === this.#l)
-              this.#l = this.#a[s];
+              this.#h = this.#u[s];
+            else if (s === this.#a)
+              this.#a = this.#l[s];
             else {
-              let o = this.#c[s];
-              this.#a[o] = this.#a[s];
-              let r = this.#a[s];
-              this.#c[r] = this.#c[s];
+              let r = this.#u[s];
+              this.#l[r] = this.#l[s];
+              let h = this.#l[s];
+              this.#u[h] = this.#u[s];
             }
             this.#n--, this.#y.push(s);
           }
@@ -7777,7 +7777,7 @@ var init_index_min = __esm(() => {
           t2 !== undefined && clearTimeout(t2);
         this.#g?.fill(undefined);
       }
-      if (this.#_ && this.#_.fill(0), this.#l = 0, this.#h = 0, this.#y.length = 0, this.#b = 0, this.#n = 0, this.#f && this.#r) {
+      if (this.#_ && this.#_.fill(0), this.#a = 0, this.#h = 0, this.#y.length = 0, this.#b = 0, this.#n = 0, this.#f && this.#r) {
         let t2 = this.#r, i;
         for (;i = t2?.shift(); )
           this.#S?.(...i);
@@ -9887,6 +9887,7 @@ class ScreenManager {
     let output = cursorDown(this.extraLinesUnderPrompt);
     output += clearContent ? eraseLines(this.height) : `
 `;
+    output += cursorLeft;
     output += cursorShow;
     this.write(output);
     this.rl.close();
@@ -9921,7 +9922,7 @@ import * as readline2 from "readline";
 import { AsyncResource as AsyncResource3 } from "async_hooks";
 import path from "path";
 function getCallSites() {
-  const _prepareStackTrace = Error.prepareStackTrace;
+  const savedPrepareStackTrace = Error.prepareStackTrace;
   let result = [];
   try {
     Error.prepareStackTrace = (_, callSites) => {
@@ -9933,7 +9934,7 @@ function getCallSites() {
   } catch {
     return result;
   }
-  Error.prepareStackTrace = _prepareStackTrace;
+  Error.prepareStackTrace = savedPrepareStackTrace;
   return result;
 }
 function createPrompt(view) {
@@ -20845,8 +20846,8 @@ var init_capabilities = __esm(() => {
       schemaFullScan: cap("limited", "readonly", "Full scan is sampled and document-oriented."),
       query: cap("limited", "readonly", "Uses JSON filter or aggregation syntax, not SQL."),
       queryLimitGuard: cap("limited", "readonly", "Applies result limits and collection size guard."),
-      queries: cap("limited", "local-write", "Snippet management works, but saved-query execution is not supported for MongoDB."),
-      q: cap("unsupported", "none", "MongoDB saved-query execution is not supported."),
+      queries: cap("limited", "local-write", "Snippet management works with MongoDB-specific saved-query limitations."),
+      q: cap("limited", "readonly", "Saved MongoDB snippets require collection frontmatter, accept JSON find/aggregate bodies, and JSON-encode parameter substitutions."),
       insert: cap("limited", "db-write", "Document insert is supported with Mongo-specific behavior."),
       update: cap("limited", "db-write", "Document update is supported with Mongo-specific behavior."),
       delete: cap("limited", "db-write", "Document delete is supported with Mongo-specific behavior."),
@@ -21776,22 +21777,29 @@ class MongoDBAdapter {
     const collection = db.collection(collectionName);
     const estimatedRowCount = await collection.estimatedDocumentCount();
     const requested = options?.sampleSize;
-    const desired = typeof requested === "number" && requested >= 1 ? requested : 50;
+    const desired = typeof requested === "number" && requested >= 1 ? requested : 100;
     const sampleSize = Math.min(desired, 1000);
-    const samples = await collection.find().limit(sampleSize).toArray();
-    const columnMap = new Map;
-    for (const doc of samples) {
-      for (const [key, value] of Object.entries(doc)) {
-        if (!columnMap.has(key)) {
-          columnMap.set(key, new Set);
-        }
-        columnMap.get(key).add(typeof value);
+    const method = options?.sampleMethod ?? "random";
+    let samples = [];
+    if (method === "random") {
+      try {
+        samples = await collection.aggregate([{ $sample: { size: sampleSize } }]).toArray();
+      } catch (err) {
+        console.error(`[mongo] $sample failed (${err.message}); falling back to natural order.`);
+        samples = await collection.find().limit(sampleSize).toArray();
       }
+    } else {
+      samples = await collection.find().limit(sampleSize).toArray();
     }
-    const columns = Array.from(columnMap.entries()).map(([name, types2]) => ({
+    const accumulator = new Map;
+    for (const doc of samples)
+      accumulateDocPaths(doc, "", accumulator);
+    const denom = Math.max(samples.length, 1);
+    const columns = Array.from(accumulator.entries()).map(([name, info]) => ({
       name,
-      type: Array.from(types2).join(" | "),
-      nullable: true
+      type: Array.from(info.types).sort().join(" | "),
+      nullable: info.types.has("null") || info.count < denom,
+      presence: info.count / denom
     }));
     return {
       name: collectionName,
@@ -21836,6 +21844,44 @@ class MongoDBAdapter {
     };
   }
 }
+function detectMongoType(v) {
+  if (v === null || v === undefined)
+    return "null";
+  if (Array.isArray(v))
+    return "array";
+  if (v instanceof Date)
+    return "Date";
+  if (typeof v === "object") {
+    const ctor = v.constructor?.name;
+    if (ctor === "ObjectId")
+      return "ObjectId";
+    if (ctor === "Binary")
+      return "Binary";
+    if (ctor === "Decimal128")
+      return "Decimal128";
+    return "object";
+  }
+  if (typeof v === "string")
+    return "string";
+  if (typeof v === "number")
+    return "number";
+  if (typeof v === "boolean")
+    return "boolean";
+  return "string";
+}
+function accumulateDocPaths(doc, prefix, acc) {
+  for (const [k, v] of Object.entries(doc)) {
+    const path3 = prefix === "" ? k : `${prefix}.${k}`;
+    const t2 = detectMongoType(v);
+    const slot = acc.get(path3) ?? { types: new Set, count: 0 };
+    slot.types.add(t2);
+    slot.count += 1;
+    acc.set(path3, slot);
+    if (t2 === "object" && v && typeof v === "object") {
+      accumulateDocPaths(v, path3, acc);
+    }
+  }
+}
 var init_mongodb_adapter = __esm(() => {
   init_types2();
 });
@@ -24289,6 +24335,51 @@ var require_table = __commonJS((exports, module) => {
   module.exports = Table;
 });
 
+// src/formatters/table-formatter.ts
+class TableFormatter {
+  format(columns) {
+    const table = new Table({
+      head: ["Column", "Type", "Nullable", "Default", "Key"].map((h) => colors.bold(h)),
+      style: { compact: false, "padding-left": 1, "padding-right": 1 },
+      colWidths: [25, 25, 10, 25, 20]
+    });
+    columns.forEach((col) => {
+      let keyType = "";
+      if (col.primaryKey) {
+        keyType = "PK";
+      } else if (col.foreignKey) {
+        keyType = `FK \u2192 ${col.foreignKey.table}.${col.foreignKey.column}`;
+      }
+      table.push([col.name, col.type, col.nullable ? "YES" : "NO", col.default || "NULL", keyType]);
+    });
+    return table.toString();
+  }
+}
+
+class TableListFormatter {
+  format(tables) {
+    const table = new Table({
+      head: ["Table", "Columns", "Rows", "Engine"].map((h) => colors.bold(h)),
+      style: { compact: false, "padding-left": 1, "padding-right": 1 },
+      colWidths: [30, 12, 15, 15]
+    });
+    tables.forEach((t2) => {
+      table.push([
+        t2.name,
+        (t2.columnCount ?? t2.columns.length).toString(),
+        (t2.rowCount ?? "?").toString(),
+        t2.engine || "N/A"
+      ]);
+    });
+    return table.toString();
+  }
+}
+var Table;
+var init_table_formatter = __esm(() => {
+  init_colors();
+  Table = require_table();
+});
+
 // src/core/size-category.ts
 var exports_size_category = {};
 __export(exports_size_category, {
@@ -24311,6 +24402,240 @@ var init_size_category = __esm(() => {
   ];
 });
 
+// src/formatters/json-formatter.ts
+class TableSchemaJSONFormatter {
+  format(table, options) {
+    const spacing = options?.compact ? undefined : 2;
+    const rowCount = table.estimatedRowCount ?? table.rowCount;
+    const output = {
+      name: table.name,
+      estimatedRowCount: rowCount ?? null,
+      sizeCategory: rowCount !== undefined && rowCount !== null ? getSizeCategory(rowCount) : null,
+      tableType: table.tableType ?? "table",
+      columns: table.columns,
+      primaryKey: table.primaryKey || [],
+      foreignKeys: table.foreignKeys || [],
+      indexes: table.indexes || [],
+      metadata: {
+        rowCount: table.rowCount,
+        engine: table.engine
+      }
+    };
+    return JSON.stringify(output, null, spacing);
+  }
+}
+var init_json_formatter = __esm(() => {
+  init_size_category();
+});
+
+// src/formatters/query-result-formatter.ts
+class QueryResultFormatter {
+  format(result, options) {
+    const format = options?.format || "table";
+    switch (format) {
+      case "json":
+        return this.formatJSON(result, options?.compact);
+      case "csv":
+        return this.formatCSV(result);
+      case "table":
+      default:
+        return this.formatTable(result);
+    }
+  }
+  formatTable(result) {
+    if (result.rows.length === 0) {
+      return this.formatEmptyTable(result);
+    }
+    const table = new Table2({
+      head: result.columnNames,
+      style: { compact: false, "padding-left": 1, "padding-right": 1 }
+    });
+    result.rows.forEach((row) => {
+      table.push(result.columnNames.map((col) => this.cellToString(row[col])));
+    });
+    let output = table.toString();
+    const footerLines = [];
+    footerLines.push(`Rows: ${result.rowCount}`);
+    if (result.executionTimeMs !== undefined) {
+      footerLines.push(`Execution time: ${result.executionTimeMs}ms`);
+    }
+    if (footerLines.length > 0) {
+      output += `
+` + footerLines.join(" | ");
+    }
+    if (result.metadata?.securityNotification) {
+      output += `
+` + result.metadata.securityNotification;
+    }
+    return output;
+  }
+  formatEmptyTable(result) {
+    const table = new Table2({
+      head: result.columnNames,
+      style: { compact: false, "padding-left": 1, "padding-right": 1 }
+    });
+    let output = table.toString();
+    const footerLines = [];
+    footerLines.push(`Rows: ${result.rowCount}`);
+    if (result.executionTimeMs !== undefined) {
+      footerLines.push(`Execution time: ${result.executionTimeMs}ms`);
+    }
+    if (footerLines.length > 0) {
+      output += `
+` + footerLines.join(" | ");
+    }
+    if (result.metadata?.securityNotification) {
+      output += `
+` + result.metadata.securityNotification;
+    }
+    return output;
+  }
+  formatJSON(result, compact) {
+    const spacing = compact ? undefined : 2;
+    const output = {
+      rows: result.rows,
+      rowCount: result.rowCount,
+      columnNames: result.columnNames,
+      columnTypes: result.columnTypes,
+      executionTimeMs: result.executionTimeMs,
+      metadata: result.metadata
+    };
+    return JSON.stringify(output, null, spacing);
+  }
+  formatCSV(result) {
+    if (result.rows.length === 0) {
+      let csvOutput = result.columnNames.map((name) => this.escapeCSVField(name)).join(",");
+      if (result.metadata?.securityNotification) {
+        csvOutput += `
+# ` + result.metadata.securityNotification;
+      }
+      return csvOutput;
+    }
+    const lines = [];
+    lines.push(result.columnNames.map((name) => this.escapeCSVField(name)).join(","));
+    result.rows.forEach((row) => {
+      const csvRow = result.columnNames.map((col) => this.escapeCSVField(row[col])).join(",");
+      lines.push(csvRow);
+    });
+    if (result.metadata?.securityNotification) {
+      lines.push(`# ${result.metadata.securityNotification}`);
+    }
+    return lines.join(`
+`);
+  }
+  escapeCSVField(value) {
+    if (value === null || value === undefined) {
+      return "";
+    }
+    const str = String(value);
+    if (str.includes(",") || str.includes('"') || str.includes(`
+`)) {
+      return `"${str.replace(/"/g, '""')}"`;
+    }
+    return str;
+  }
+  cellToString(value) {
+    if (value === null || value === undefined) {
+      return "";
+    }
+    if (typeof value === "object") {
+      return JSON.stringify(value);
+    }
+    return String(value);
+  }
+}
+var Table2;
+var init_query_result_formatter = __esm(() => {
+  Table2 = require_table();
+});
+
+// src/formatters/index.ts
+var init_formatters = __esm(() => {
+  init_table_formatter();
+  init_json_formatter();
+  init_query_result_formatter();
+});
+
+// src/core/blacklist-manager.ts
+class BlacklistManager {
+  config;
+  state;
+  overrideEnabled;
+  constructor(config, overrideEnvValue) {
+    this.config = config;
+    this.overrideEnabled = (overrideEnvValue ?? Bun.env.DBCLI_OVERRIDE_BLACKLIST ?? "") === "true";
+    this.state = this.loadBlacklist();
+  }
+  loadBlacklist() {
+    const tables = new Set;
+    const columns = new Map;
+    const blacklistConfig = this.config.blacklist;
+    if (!blacklistConfig) {
+      return { tables, columns };
+    }
+    if (Array.isArray(blacklistConfig.tables)) {
+      for (const tableName of blacklistConfig.tables) {
+        if (typeof tableName === "string") {
+          tables.add(tableName.toLowerCase());
+        } else {
+          console.warn(`[BlacklistManager] Invalid table name in blacklist config: ${JSON.stringify(tableName)}`);
+        }
+      }
+    } else if (blacklistConfig.tables !== undefined) {
+      console.warn("[BlacklistManager] blacklist.tables must be an array, ignoring");
+    }
+    if (blacklistConfig.columns && typeof blacklistConfig.columns === "object" && !Array.isArray(blacklistConfig.columns)) {
+      for (const [tableName, cols] of Object.entries(blacklistConfig.columns)) {
+        if (typeof tableName !== "string") {
+          console.warn(`[BlacklistManager] Invalid table name key in columns config: ${JSON.stringify(tableName)}`);
+          continue;
+        }
+        if (!Array.isArray(cols)) {
+          console.warn(`[BlacklistManager] blacklist.columns["${tableName}"] must be an array, ignoring`);
+          continue;
+        }
+        const columnSet = new Set;
+        for (const col of cols) {
+          if (typeof col === "string") {
+            columnSet.add(col);
+          } else {
+            console.warn(`[BlacklistManager] Invalid column name in blacklist.columns["${tableName}"]: ${JSON.stringify(col)}`);
+          }
+        }
+        if (columnSet.size > 0) {
+          columns.set(tableName.toLowerCase(), columnSet);
+        }
+      }
+    } else if (blacklistConfig.columns !== undefined) {
+      console.warn("[BlacklistManager] blacklist.columns must be an object, ignoring");
+    }
+    return { tables, columns };
+  }
+  isTableBlacklisted(tableName) {
+    return this.state.tables.has(tableName.toLowerCase());
+  }
+  isColumnBlacklisted(tableName, columnName) {
+    const columnSet = this.state.columns.get(tableName.toLowerCase());
+    if (!columnSet) {
+      return false;
+    }
+    return columnSet.has(columnName);
+  }
+  getBlacklistedColumns(tableName) {
+    const columnSet = this.state.columns.get(tableName.toLowerCase());
+    if (!columnSet) {
+      return [];
+    }
+    return Array.from(columnSet);
+  }
+  canOverrideBlacklist() {
+    return this.overrideEnabled;
+  }
+  getState() {
+    return this.state;
+  }
+}
+
 // src/types/blacklist.ts
 var BlacklistError;
 var init_blacklist = __esm(() => {
@@ -24326,6 +24651,87 @@ var init_blacklist = __esm(() => {
   };
 });
 
+// src/core/blacklist-validator.ts
+class BlacklistValidator {
+  manager;
+  constructor(manager) {
+    this.manager = manager;
+  }
+  checkTableBlacklist(operation, tableName, _tableList = []) {
+    if (this.manager.canOverrideBlacklist()) {
+      const message = t_vars("warnings.blacklist_override_used", {
+        operation,
+        table: tableName
+      });
+      console.error(message);
+      return;
+    }
+    if (this.manager.isTableBlacklisted(tableName)) {
+      const message = t_vars("errors.table_blacklisted", {
+        table: tableName,
+        operation
+      });
+      throw new BlacklistError(message, tableName, operation);
+    }
+  }
+  checkColumnBlacklistOnWrite(tableName, fields, operation = "WRITE") {
+    const blacklisted = this.manager.getBlacklistedColumns(tableName);
+    if (blacklisted.length === 0 || fields.length === 0) {
+      return;
+    }
+    const conflicts = fields.filter((f) => blacklisted.includes(f));
+    if (conflicts.length === 0) {
+      return;
+    }
+    if (this.manager.canOverrideBlacklist()) {
+      const warning = t_vars("warnings.blacklist_override_used", {
+        operation,
+        table: tableName
+      });
+      console.error(`${warning} (columns: ${conflicts.join(", ")})`);
+      return;
+    }
+    const message = t_vars("errors.column_blacklisted_write", {
+      table: tableName,
+      operation,
+      columns: conflicts.join(", ")
+    });
+    throw new BlacklistError(message, tableName, operation);
+  }
+  filterColumns(tableName, rows, columnList) {
+    const blacklistedColumns = this.manager.getBlacklistedColumns(tableName);
+    if (blacklistedColumns.length === 0) {
+      return { filteredRows: rows, omittedColumns: [] };
+    }
+    const omittedColumns = columnList.filter((col) => blacklistedColumns.includes(col));
+    if (omittedColumns.length === 0) {
+      return { filteredRows: rows, omittedColumns: [] };
+    }
+    const filteredRows = rows.map((row) => {
+      const newRow = {};
+      for (const [key, value] of Object.entries(row)) {
+        if (!omittedColumns.includes(key)) {
+          newRow[key] = value;
+        }
+      }
+      return newRow;
+    });
+    return { filteredRows, omittedColumns };
+  }
+  buildSecurityNotification(_tableName, omittedColumns) {
+    if (omittedColumns.length === 0) {
+      return "";
+    }
+    return t_vars("security.columns_omitted", {
+      count: omittedColumns.length
+    });
+  }
+}
+var init_blacklist_validator = __esm(() => {
+  init_blacklist();
+  init_message_loader();
+});
+
 // src/core/audit/lock.ts
 import { hostname } from "os";
 import { dirname } from "path";
@@ -24827,8 +25233,75 @@ var init_integration_helper = __esm(() => {
   _loggers = new Map;
 });
 
+// src/core/mongo/path-matcher.ts
+function compilePatterns(raw) {
+  const patterns = [];
+  const rejected = [];
+  for (const entry of raw) {
+    if (typeof entry !== "string" || entry.length === 0) {
+      rejected.push({ raw: String(entry ?? ""), reason: "must be a non-empty string" });
+      continue;
+    }
+    const segments = entry.split(".");
+    if (segments.length === 0 || segments.some((s) => s.length === 0)) {
+      rejected.push({ raw: entry, reason: "empty path segment" });
+      continue;
+    }
+    const wildcardIndices = segments.map((s, i) => s.includes("*") ? i : -1).filter((i) => i >= 0);
+    if (wildcardIndices.length === 0) {
+      patterns.push({ raw: entry, segments, wildcardTail: false });
+      continue;
+    }
+    const lastIndex = segments.length - 1;
+    const onlyTail = wildcardIndices.length === 1 && wildcardIndices[0] === lastIndex && segments[lastIndex] === "*";
+    if (!onlyTail) {
+      rejected.push({ raw: entry, reason: "wildcard must be the final segment" });
+      continue;
+    }
+    if (segments.length === 1) {
+      rejected.push({ raw: entry, reason: "wildcard must have a parent path" });
+      continue;
+    }
+    patterns.push({ raw: entry, segments: segments.slice(0, -1), wildcardTail: true });
+  }
+  return { patterns, rejected };
+}
+function matchAny(path3, patterns) {
+  if (patterns.length === 0)
+    return false;
+  const pathSegments = path3.split(".");
+  for (const pat of patterns) {
+    if (pat.wildcardTail) {
+      if (pathSegments.length < pat.segments.length)
+        continue;
+      let ok = true;
+      for (let i = 0;i < pat.segments.length; i++) {
+        if (pat.segments[i] !== pathSegments[i]) {
+          ok = false;
+          break;
+        }
+      }
+      if (ok)
+        return true;
+    } else {
+      if (pat.segments.length !== pathSegments.length)
+        continue;
+      let ok = true;
+      for (let i = 0;i < pat.segments.length; i++) {
+        if (pat.segments[i] !== pathSegments[i]) {
+          ok = false;
+          break;
+        }
+      }
+      if (ok)
+        return true;
+    }
+  }
+  return false;
+}
+
 // src/core/recovery/types.ts
-var RECOVERY_SCHEMA_VERSION = 1, RECOVERY_CODES, SchemaCacheMissingError, RECOVERY_CODE_METADATA;
+var RECOVERY_SCHEMA_VERSION = 1, RECOVERY_CODES, MAX_BRANCH_STEPS = 6, MAX_BRANCH_COUNT = 8, SchemaCacheMissingError, RECOVERY_CODE_METADATA;
 var init_types3 = __esm(() => {
   RECOVERY_CODES = [
     "CONFIG_MISSING",
@@ -24929,7 +25402,7 @@ var init_types3 = __esm(() => {
   };
 });
 
-// src/core/recovery/recovery-steps.ts
+// src/core/recovery/shell-quote.ts
 function shellQuote(value) {
   if (value.length === 0)
     return "''";
@@ -24937,6 +25410,8 @@ function shellQuote(value) {
     return value;
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
+
+// src/core/recovery/recovery-steps.ts
 function dryRunStepForWrite(ctx, quotedTable, placeholders) {
   if (!ctx.writeOperation)
     return null;
@@ -25199,6 +25674,7 @@ function draftsForCode(code, ctx) {
   }
 }
 var MAX_RECOVERY_STEPS = 6;
+var init_recovery_steps = () => {};
 
 // src/core/permission-guard.ts
 var exports_permission_guard = {};
@@ -25821,19 +26297,222 @@ var init_verify_steps = __esm(() => {
   };
 });
 
+// src/core/recovery/connection-branches.ts
+function parseDoctorJson(stdoutSummary) {
+  if (!stdoutSummary || stdoutSummary.length === 0)
+    return null;
+  let raw;
+  try {
+    raw = JSON.parse(stdoutSummary);
+  } catch {
+    return null;
+  }
+  if (typeof raw !== "object" || raw === null)
+    return null;
+  const obj = raw;
+  if (!Array.isArray(obj.results))
+    return null;
+  const entries = [];
+  for (const r of obj.results) {
+    if (typeof r !== "object" || r === null)
+      return null;
+    const e = r;
+    if (typeof e.group !== "string" || typeof e.label !== "string" || typeof e.status !== "string" || typeof e.message !== "string") {
+      return null;
+    }
+    entries.push({ group: e.group, label: e.label, status: e.status, message: e.message });
+  }
+  return { results: entries, hasError: Boolean(obj.hasError) };
+}
+function anyKeyword(message, keywords) {
+  const m = message.toLowerCase();
+  return keywords.some((kw) => m.includes(kw));
+}
+function matchConnectionBranch(prev, opts = {}) {
+  const doctor = parseDoctorJson(prev.stdoutSummary);
+  if (doctor === null) {
+    opts.trace?.({ outcome: "parse-fail", detail: "doctor JSON parse failed" });
+    return null;
+  }
+  if (doctor.results.every((r) => r.status !== "error")) {
+    opts.trace?.({ outcome: "matched", branchId: "doctor-clean" });
+    return "doctor-clean";
+  }
+  if (doctor.results.some((r) => r.status === "error" && CONFIG_LABELS.has(r.label))) {
+    opts.trace?.({ outcome: "matched", branchId: "doctor-config-missing" });
+    return "doctor-config-missing";
+  }
+  const connectionErrors = doctor.results.filter((r) => r.status === "error" && r.label === "Connection");
+  if (connectionErrors.some((r) => anyKeyword(r.message, AUTH_KEYWORDS))) {
+    opts.trace?.({ outcome: "matched", branchId: "doctor-auth-error" });
+    return "doctor-auth-error";
+  }
+  if (connectionErrors.some((r) => anyKeyword(r.message, NETWORK_KEYWORDS))) {
+    opts.trace?.({ outcome: "matched", branchId: "doctor-network-error" });
+    return "doctor-network-error";
+  }
+  opts.trace?.({ outcome: "no-match" });
+  return null;
+}
+function renumber(branchId, drafts) {
+  return drafts.map((d, i) => ({ ...d, order: i + 1, branchId }));
+}
+function planDoctorClean() {
+  const drafts = [
+    {
+      command: "dbcli inspect --for-agent",
+      rationale: "Re-anchor in the current context and confirm schemaCache.available; if stale, schema --refresh before retry.",
+      risk: "readonly",
+      expects: "JSON snapshot; check connection.online=true, schemaCache.available."
+    }
+  ];
+  return {
+    description: "Doctor reports no errors. Likely a transient failure \u2014 verify baseline state, then retry the original command.",
+    steps: renumber("doctor-clean", drafts)
+  };
+}
+function planDoctorConfigMissing() {
+  const drafts = [
+    {
+      command: "dbcli init",
+      rationale: "No usable config; run init to create it.",
+      risk: "write",
+      interactive: true,
+      expects: "Init wizard prompts; new .dbcli written."
+    },
+    {
+      command: "dbcli inspect --no-connect --format json",
+      rationale: "Verify config shape after init.",
+      risk: "readonly",
+      expects: "JSON snapshot with system/permission/blacklist sections populated."
+    }
+  ];
+  return {
+    description: "Doctor flagged a config-level failure. Rebuild config before reattempting connection.",
+    steps: renumber("doctor-config-missing", drafts)
+  };
+}
+function planDoctorAuthError() {
+  const drafts = [
+    {
+      command: "dbcli init --force",
+      rationale: "Re-run init focused on credentials; --force overwrites the existing config in place.",
+      risk: "write",
+      interactive: true,
+      expects: "Init wizard accepts new user/password; config rewritten."
+    },
+    {
+      command: "dbcli inspect --no-connect --format json",
+      rationale: "Confirm config now resolves credentials.",
+      risk: "readonly",
+      expects: "JSON snapshot reflecting updated credentials."
+    }
+  ];
+  return {
+    description: "Doctor confirms credentials were rejected. Re-init with --force to overwrite the credential fields.",
+    steps: renumber("doctor-auth-error", drafts)
+  };
+}
+function planDoctorNetworkError(ctx) {
+  const drafts = [
+    {
+      command: "dbcli inspect --no-connect --format json",
+      rationale: "Compare expected vs actual host/port without a live probe.",
+      risk: "readonly",
+      expects: "JSON snapshot with connection.name/host/port."
+    }
+  ];
+  if (ctx.connectionName) {
+    drafts.push({
+      command: `dbcli use ${shellQuote(ctx.connectionName)}`,
+      rationale: "Re-select the failing named connection so subsequent commands target it explicitly.",
+      risk: "write",
+      dbWrite: false,
+      expects: "Active connection switched."
+    });
+  }
+  drafts.push({
+    command: "dbcli init --force",
+    rationale: "If addressing is wrong, rewrite host/port via init.",
+    risk: "write",
+    interactive: true,
+    expects: "Init wizard accepts new host/port; config rewritten."
+  });
+  return {
+    description: "Doctor confirms a network-level failure (host / port / DNS / timeout). Inspect expected vs actual addressing, optionally re-select named connection, then re-init host/port.",
+    steps: renumber("doctor-network-error", drafts)
+  };
+}
+function buildConnectionBranches(ctx) {
+  const branches = {
+    "doctor-clean": planDoctorClean(),
+    "doctor-config-missing": planDoctorConfigMissing(),
+    "doctor-auth-error": planDoctorAuthError(),
+    "doctor-network-error": planDoctorNetworkError(ctx)
+  };
+  return {
+    branches,
+    branchFork: { after: 1, branchIds: [...CONNECTION_BRANCH_IDS] }
+  };
+}
+var CONNECTION_BRANCH_IDS, CONFIG_LABELS, AUTH_KEYWORDS, NETWORK_KEYWORDS, CONNECTION_RESOLVER_KEYWORDS;
+var init_connection_branches = __esm(() => {
+  CONNECTION_BRANCH_IDS = [
+    "doctor-clean",
+    "doctor-config-missing",
+    "doctor-auth-error",
+    "doctor-network-error"
+  ];
+  CONFIG_LABELS = new Set([
+    "Config exists",
+    "Default connection",
+    "V2 config validation",
+    "Config valid"
+  ]);
+  AUTH_KEYWORDS = [
+    "auth",
+    "password",
+    "credentials",
+    "credential",
+    "permission denied",
+    "access denied",
+    "login"
+  ];
+  NETWORK_KEYWORDS = [
+    "host",
+    "port",
+    "refused",
+    "timeout",
+    "timed out",
+    "unreachable",
+    "enotfound",
+    "econnrefused",
+    "etimedout",
+    "eai_again",
+    "dns"
+  ];
+  CONNECTION_RESOLVER_KEYWORDS = {
+    auth: AUTH_KEYWORDS,
+    network: NETWORK_KEYWORDS,
+    configLabels: [...CONFIG_LABELS]
+  };
+});
+
 // src/core/recovery/classify.ts
 function classifyError(error, ctx) {
   const recoveryError = errorToRecoveryError(error, ctx);
   const ctxWithDetails = applyDetailsToContext(ctx, recoveryError);
   const recovery = stepsForCode(recoveryError.code, ctxWithDetails);
   const verify = verifyForCode(recoveryError.code, ctxWithDetails);
+  const branchExtras = recoveryError.category === "connection" ? buildConnectionBranches(ctxWithDetails) : null;
   return {
     schemaVersion: RECOVERY_SCHEMA_VERSION,
     generatedAt: new Date().toISOString(),
     ok: false,
     error: recoveryError,
     recovery,
-    ...verify !== null ? { verify } : {}
+    ...verify !== null ? { verify } : {},
+    ...branchExtras !== null ? { branches: branchExtras.branches, branchFork: branchExtras.branchFork } : {}
   };
 }
 function errorToRecoveryError(error, ctx) {
@@ -25924,7 +26603,9 @@ var init_classify = __esm(() => {
   init_permission_guard();
   init_blacklist();
   init_types4();
+  init_recovery_steps();
   init_verify_steps();
+  init_connection_branches();
   init_types3();
 });
 
@@ -26950,20 +27631,91 @@ var init_next_step_schema = __esm(() => {
 });
 
 // src/core/recovery/next-step.ts
-function nextStepFromEnvelope(envelope, afterStep, _prevResult) {
+function resolverFor(code) {
+  switch (code) {
+    case "CONN_REFUSED":
+    case "CONN_AUTH_FAILED":
+    case "CONN_TIMEOUT":
+    case "CONN_HOST_NOT_FOUND":
+    case "CONN_UNKNOWN":
+      return (prev, opts) => matchConnectionBranch(prev, opts);
+    default:
+      return null;
+  }
+}
+function assertAfterStep(afterStep) {
   if (!Number.isInteger(afterStep)) {
     throw new RangeError(`afterStep must be an integer (got ${afterStep})`);
   }
   if (afterStep < 1) {
     throw new RangeError(`afterStep must be >= 1 (got ${afterStep})`);
   }
+}
+function nextStepFromEnvelope(envelope, afterStep, prevResult, options = {}) {
+  assertAfterStep(afterStep);
+  if (options.branchId !== undefined) {
+    if (!envelope.branches || !envelope.branches[options.branchId]) {
+      const valid = envelope.branches ? Object.keys(envelope.branches).join(", ") : "<none>";
+      throw new RangeError(`Branch '${options.branchId}' not found in envelope (valid: ${valid}).`);
+    }
+    const plan = envelope.branches[options.branchId];
+    if (afterStep > plan.steps.length) {
+      throw new RangeError(`afterStep ${afterStep} exceeds branch '${options.branchId}' length ${plan.steps.length}`);
+    }
+    if (afterStep === plan.steps.length) {
+      return {
+        kind: "done",
+        branchId: options.branchId,
+        cursor: afterStep,
+        totalSteps: plan.steps.length
+      };
+    }
+    return {
+      kind: "step",
+      branchId: options.branchId,
+      step: plan.steps[afterStep],
+      cursor: afterStep + 1,
+      totalSteps: plan.steps.length
+    };
+  }
   if (afterStep > envelope.recovery.length) {
     throw new RangeError(`afterStep ${afterStep} exceeds plan length ${envelope.recovery.length}`);
   }
-  if (afterStep === envelope.recovery.length)
-    return { kind: "done" };
-  return { kind: "step", step: envelope.recovery[afterStep] };
+  if (envelope.branchFork?.after === afterStep && envelope.branches) {
+    const resolver = resolverFor(envelope.error.code);
+    if (resolver !== null) {
+      const traceSink = options.trace ? (line) => {
+        const tail = line.detail ?? line.branchId ?? "";
+        options.trace(`connection-branches: ${line.outcome}${tail ? ` ${tail}` : ""}`);
+      } : undefined;
+      const branchId = resolver(prevResult, { trace: traceSink });
+      if (branchId !== null) {
+        const plan = envelope.branches[branchId];
+        if (plan && plan.steps.length >= 1) {
+          return {
+            kind: "step",
+            branchId,
+            step: plan.steps[0],
+            cursor: 1,
+            totalSteps: plan.steps.length
+          };
+        }
+      }
+    }
+  }
+  if (afterStep === envelope.recovery.length) {
+    return { kind: "done", cursor: afterStep, totalSteps: envelope.recovery.length };
+  }
+  return {
+    kind: "step",
+    step: envelope.recovery[afterStep],
+    cursor: afterStep + 1,
+    totalSteps: envelope.recovery.length
+  };
 }
+var init_next_step = __esm(() => {
+  init_connection_branches();
+});
 
 // src/core/recovery/next-render-json.ts
 function renderNextJson(result) {
@@ -26977,6 +27729,12 @@ function renderNextMarkdown(result) {
   lines.push("");
   lines.push(`*Source:* \`${result.source.kind}\` \u2192 \`${result.source.path}\``);
   lines.push(`errorCode: \`${result.errorCode}\``);
+  if (result.branchId !== undefined) {
+    lines.push(`**Branch:** \`${result.branchId}\``);
+    if (result.branchDescription !== undefined) {
+      lines.push(`**Branch description:** ${result.branchDescription}`);
+    }
+  }
   lines.push("");
   if (result.kind === "step" && result.step) {
     lines.push(`## Next step (${result.cursor} of ${result.totalSteps})`);
@@ -27035,12 +27793,15 @@ __export(exports_recovery, {
   RECOVERY_CODES: () => RECOVERY_CODES,
   NEXT_SCHEMA_VERSION: () => NEXT_SCHEMA_VERSION,
   MAX_RECOVERY_STEPS: () => MAX_RECOVERY_STEPS,
+  MAX_BRANCH_STEPS: () => MAX_BRANCH_STEPS,
+  MAX_BRANCH_COUNT: () => MAX_BRANCH_COUNT,
   LAST_ENVELOPE_PATH: () => LAST_ENVELOPE_PATH,
   EXIT_CODE: () => EXIT_CODE,
   APPLY_SCHEMA_VERSION: () => APPLY_SCHEMA_VERSION
 });
 var init_recovery = __esm(() => {
   init_types3();
+  init_recovery_steps();
   init_classify();
   init_render_markdown();
   init_emit();
@@ -27050,6 +27811,7 @@ var init_recovery = __esm(() => {
   init_verify_steps();
   init_apply_verify();
   init_next_step_schema();
+  init_next_step();
 });
 
 // src/utils/package-root.ts
@@ -27084,6 +27846,38 @@ var init_package_root = __esm(() => {
   HERE = import.meta.dir;
 });
 
+// src/formatters/html-formatter.ts
+async function generateHtmlReport(payload) {
+  const templatePath = packageAssetPath("ui-template.html");
+  const templateFile = Bun.file(templatePath);
+  if (!await templateFile.exists()) {
+    throw new Error(`UI template not found at ${templatePath}. Please run 'bun run build' first.`);
+  }
+  let html = await templateFile.text();
+  const jsonPayload = JSON.stringify(payload).replace(/</g, "\\u003c");
+  const injection = `window.__DBCLI_PAYLOAD__ = ${jsonPayload};`;
+  html = html.replace("/*DBCLI_PAYLOAD*/", () => injection);
+  return html;
+}
+var init_html_formatter = __esm(() => {
+  init_package_root();
+});
+
+// src/utils/opener.ts
+import open2 from "open";
+async function openInBrowser(target) {
+  if (process.env.DBCLI_NO_OPEN === "1" || false) {
+    console.log(`[Opener] DBCLI_NO_OPEN is set. Skipping browser launch for: ${target}`);
+    return;
+  }
+  try {
+    await open2(target);
+  } catch (err) {
+    console.error(`[Opener] Failed to open ${target}:`, err);
+  }
+}
+var init_opener = () => {};
+
 // src/utils/levenshtein-distance.ts
 function levenshteinDistance(a, b) {
   const lenA = a.length;
@@ -27127,6 +27921,59 @@ function levenshteinDistance(a, b) {
   return dp[lenB]?.[lenA] ?? 0;
 }
 
+// src/core/mongo/field-masker.ts
+function maskMongoRows(rows, collection, blacklist) {
+  const columns = blacklist.columns ?? {};
+  const raw = columns[collection] ?? findCaseInsensitive(columns, collection);
+  if (!raw || raw.length === 0)
+    return rows;
+  const { patterns } = compilePatterns(raw);
+  if (patterns.length === 0)
+    return rows;
+  const idAffected = patterns.some((p) => p.segments.length === 1 && p.segments[0] === "_id" && !p.wildcardTail);
+  if (idAffected) {
+    console.error(`[blacklist] collection '${collection}' blacklists '_id'; read paths still expose _id to preserve document references.`);
+  }
+  return rows.map((row) => maskRecord(row, "", patterns));
+}
+function maskRecord(obj, prefix, patterns) {
+  const out = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (key === "_id" && prefix === "") {
+      out[key] = value;
+      continue;
+    }
+    const path4 = prefix === "" ? key : `${prefix}.${key}`;
+    if (matchAny(path4, patterns)) {
+      out[key] = REDACTED;
+      continue;
+    }
+    out[key] = maskValue(value, path4, patterns);
+  }
+  return out;
+}
+function maskValue(value, path4, patterns) {
+  if (value === null || value === undefined)
+    return value;
+  if (Array.isArray(value)) {
+    return value.map((item) => item && typeof item === "object" && !Array.isArray(item) ? maskRecord(item, path4, patterns) : item);
+  }
+  if (typeof value === "object") {
+    return maskRecord(value, path4, patterns);
+  }
+  return value;
+}
+function findCaseInsensitive(columns, name) {
+  const target = name.toLowerCase();
+  for (const [k, v] of Object.entries(columns)) {
+    if (k.toLowerCase() === target)
+      return v;
+  }
+  return;
+}
+var REDACTED = "[REDACTED]";
+var init_field_masker = () => {};
+
 // src/commands/query-size-guard.ts
 var exports_query_size_guard = {};
 __export(exports_query_size_guard, {
@@ -27593,6 +28440,86 @@ var init_redis = __esm(() => {
     }
   };
 });
+
+// src/core/saved-queries/strategies/mongodb.ts
+function interpolate(body, meta, params) {
+  const declared = new Map(meta.params.map((p) => [p.name, p]));
+  return body.replace(TEMPLATE_RE, (_match, name) => {
+    const spec = declared.get(name);
+    let value = params[name];
+    if (value === undefined) {
+      if (spec?.default !== undefined) {
+        value = spec.default;
+      } else if (spec?.required) {
+        throw new SavedQueryError(`Missing required param '${name}' for snippet '${meta.key}'`, "PARAM_MISSING");
+      } else {
+        value = null;
+      }
+    }
+    return JSON.stringify(value);
+  });
+}
+function stripTemplatesForValidation(body) {
+  return body.replace(TEMPLATE_RE, "0");
+}
+function describe(v) {
+  if (v === null)
+    return "null";
+  if (Array.isArray(v))
+    return "array";
+  return typeof v;
+}
+var TEMPLATE_RE, mongoStrategy;
+var init_mongodb = __esm(() => {
+  init_types4();
+  TEMPLATE_RE = /\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
+  mongoStrategy = {
+    family: "mongo",
+    validateBody(body, meta, file) {
+      if (!meta.operation) {
+        throw new SavedQueryError(`MongoDB snippet '${meta.key}' must declare 'operation: find' or 'operation: aggregate'`, "MONGO_INVALID_BODY", file);
+      }
+      const probe = stripTemplatesForValidation(body.trim());
+      let parsed;
+      try {
+        parsed = JSON.parse(probe);
+      } catch (e) {
+        throw new SavedQueryError(`MongoDB snippet '${meta.key}' body is not valid JSON: ${e.message}`, "MONGO_INVALID_BODY", file);
+      }
+      if (meta.operation === "find" && (Array.isArray(parsed) || typeof parsed !== "object" || parsed === null)) {
+        throw new SavedQueryError(`MongoDB find snippet '${meta.key}' body must be a JSON object (got ${describe(parsed)})`, "MONGO_INVALID_BODY", file);
+      }
+      if (meta.operation === "aggregate" && !Array.isArray(parsed)) {
+        throw new SavedQueryError(`MongoDB aggregate snippet '${meta.key}' body must be a JSON array (got ${describe(parsed)})`, "MONGO_INVALID_BODY", file);
+      }
+    },
+    prepare(snippet, params, opts) {
+      if (opts.engine !== "mongodb") {
+        throw new SavedQueryError(`MongoDB snippet '${snippet.meta.key}' cannot run on ${opts.engine} connection`, "ENGINE_MISMATCH", snippet.file);
+      }
+      const collection = params.__collection ?? snippet.meta.target;
+      if (!collection || collection.trim() === "") {
+        throw new SavedQueryError(`MongoDB snippet '${snippet.meta.key}' needs a target collection (frontmatter 'target' or CLI --collection).`, "MONGO_MISSING_COLLECTION", snippet.file);
+      }
+      const interpolated = interpolate(snippet.sqlBody, snippet.meta, params);
+      let parsed;
+      try {
+        parsed = JSON.parse(interpolated);
+      } catch (e) {
+        throw new SavedQueryError(`MongoDB snippet '${snippet.meta.key}' body became invalid JSON after parameter substitution: ${e.message}`, "MONGO_INVALID_BODY", snippet.file);
+      }
+      return {
+        driver: { sql: JSON.stringify(parsed), values: [] },
+        rewrittenBody: JSON.stringify(parsed, null, 2),
+        warnings: [],
+        execHints: {
+          collection,
+          mongoOperation: snippet.meta.operation
+        }
+      };
+    }
+  };
+});
 // src/core/saved-queries/strategies/index.ts
 function engineFamily(engine) {
   if (engine === "postgres" || engine === "mysql")
@@ -27601,6 +28528,8 @@ function engineFamily(engine) {
     return "es";
   if (engine === "redis")
     return "redis";
+  if (engine === "mongodb")
+    return "mongo";
   throw new Error(`Unknown engine: ${engine}`);
 }
 function getStrategy(family) {
@@ -27611,6 +28540,8 @@ function getStrategy(family) {
       return esStrategy;
     case "redis":
       return redisStrategy;
+    case "mongo":
+      return mongoStrategy;
     default:
       throw new Error(`No strategy registered for family: ${family}`);
   }
@@ -27619,6 +28550,7 @@ var init_strategies = __esm(() => {
   init_sql();
   init_elasticsearch();
   init_redis();
+  init_mongodb();
 });
 
 // src/core/saved-queries/yaml-mini.ts
@@ -27753,6 +28685,8 @@ function familyOf(engine) {
     return "sql";
   if (engine === "elasticsearch")
     return "es";
+  if (engine === "mongodb")
+    return "mongo";
   return "redis";
 }
 function parseSavedQuery(input) {
@@ -27826,6 +28760,8 @@ function parseFrontmatter(yaml, input) {
   const index = typeof raw.index === "string" ? raw.index : undefined;
   const intent = normaliseIntent(raw.intent, input);
   const visual = normaliseVisual(raw.visual);
+  const target = typeof raw.target === "string" ? raw.target : undefined;
+  const operation = raw.operation === "find" || raw.operation === "aggregate" ? raw.operation : undefined;
   return {
     meta: {
       name: typeof raw.name === "string" ? raw.name : "",
@@ -27836,7 +28772,9 @@ function parseFrontmatter(yaml, input) {
       params,
       tags,
       intent,
-      visual
+      visual,
+      target,
+      operation
     },
     warnings
   };
@@ -28033,7 +28971,7 @@ var init_parser = __esm(() => {
   init_types4();
   MAX_BYTES = 64 * 1024;
   VALID_TYPES = ["int", "string", "float", "bool", "date", "datetime"];
-  VALID_ENGINES = ["postgres", "mysql", "elasticsearch", "redis"];
+  VALID_ENGINES = ["postgres", "mysql", "elasticsearch", "redis", "mongodb"];
   INTENT_RE = /^[a-z][a-z0-9.-]*$/;
 });
 
@@ -28119,7 +29057,13 @@ async function collectFiles(root) {
 var ENGINE_SUFFIXES;
 var init_loader = __esm(() => {
   init_parser();
-  ENGINE_SUFFIXES = ["postgres", "mysql", "elasticsearch", "redis"];
+  ENGINE_SUFFIXES = [
+    "postgres",
+    "mysql",
+    "elasticsearch",
+    "redis",
+    "mongodb"
+  ];
 });
 
 // src/core/saved-queries/resolver.ts
@@ -28159,9 +29103,6 @@ var init_resolver = __esm(() => {
 
 // src/core/saved-queries/runner.ts
 function prepareExecution(snippet, opts, cliParams, fileParams) {
-  if (opts.engine === "mongodb") {
-    throw new SavedQueryError(`Saved queries do not support MongoDB connections`, "ENGINE_MISMATCH", snippet.query.file);
-  }
   const declared = snippet.query.meta.engine;
   if (declared && declared.length > 0) {
     const declaredFamily = engineFamily(declared[0]);
@@ -28239,6 +29180,77 @@ var init_saved_queries = __esm(() => {
   init_snippet_paths();
 });
 
+// src/commands/q-mongo.ts
+var exports_q_mongo = {};
+__export(exports_q_mongo, {
+  qMongoBranch: () => qMongoBranch
+});
+import { tmpdir as tmpdir2 } from "os";
+import { join as join18 } from "path";
+async function qMongoBranch(snippet, prepared, options, config) {
+  const collection = options.collection ?? prepared.execHints?.collection;
+  if (!collection) {
+    throw new Error(`MongoDB snippet '${snippet.query.meta.key}' resolved without a target collection`);
+  }
+  const blacklistManager = new BlacklistManager(config);
+  const blacklistValidator = new BlacklistValidator(blacklistManager);
+  blacklistValidator.checkTableBlacklist("SELECT", collection);
+  if (options.dryRun) {
+    console.log(`Dry-run preview (no execution):`);
+    console.log(`Collection: ${collection}`);
+    console.log(`Operation: ${prepared.execHints?.mongoOperation ?? "find"}`);
+    console.log(prepared.driver.sql);
+    return;
+  }
+  const adapter = AdapterFactory.createMongoDBAdapter(config.connection);
+  await adapter.connect();
+  try {
+    const start = performance.now();
+    const result = await adapter.execute(prepared.driver.sql, [collection]);
+    const executionTimeMs = Math.round(performance.now() - start);
+    const blacklistCfg = config.blacklist ?? { tables: [], columns: {} };
+    const masked = maskMongoRows(result.rows, collection, blacklistCfg);
+    if (options.ui || options.format === "html") {
+      const html = await generateHtmlReport({ meta: snippet.query.meta, rows: masked });
+      if (options.ui) {
+        const tempPath = join18(tmpdir2(), `dbcli-report-${Date.now()}.html`);
+        await Bun.write(tempPath, html);
+        await openInBrowser(tempPath);
+      } else {
+        console.log(html);
+      }
+    } else {
+      const columnNames = masked[0] ? Object.keys(masked[0]) : [];
+      const formatter = new QueryResultFormatter;
+      console.log(formatter.format({
+        rows: masked,
+        rowCount: masked.length,
+        columnNames,
+        columnTypes: [],
+        executionTimeMs,
+        metadata: { statement: "SELECT", affectedRows: 0 }
+      }, { format: options.format ?? "table" }));
+    }
+    await writeAuditEntry(config, "q", options, {
+      success: true,
+      target: collection,
+      sql: prepared.driver.sql,
+      metadata: { rows_affected: masked.length, execution_ms: executionTimeMs }
+    });
+  } finally {
+    await adapter.disconnect();
+  }
+}
+var init_q_mongo = __esm(() => {
+  init_adapters();
+  init_blacklist_validator();
+  init_field_masker();
+  init_formatters();
+  init_html_formatter();
+  init_opener();
+  init_integration_helper();
+});
+
 // src/core/saved-queries/fold.ts
 function foldVariants(key, variants) {
   const sources = unique(variants.map((v) => v.query.source)).sort();
@@ -28394,7 +29406,7 @@ __export(exports_queries_import, {
   queriesImport: () => queriesImport
 });
 import { stat as stat5, mkdir as mkdir8, copyFile as copyFile2 } from "fs/promises";
-import { basename as basename3, join as join19, extname } from "path";
+import { basename as basename3, join as join20, extname } from "path";
 async function queriesImport(filePath, options = {}) {
   const cwd = options.cwd ?? process.cwd();
   if (extname(filePath) !== ".sql") {
@@ -28405,9 +29417,9 @@ async function queriesImport(filePath, options = {}) {
   const baseName = options.as ? options.as.replace(/^@/, "") : basename3(filePath, ".sql").replace(/\.(postgres|mysql)$/, "");
   const key = "@" + baseName;
   parseSavedQuery({ key, file: filePath, source: "local", text: text2 });
-  const targetDir = join19(cwd, ".dbcli/queries");
+  const targetDir = join20(cwd, ".dbcli/queries");
   await mkdir8(targetDir, { recursive: true });
-  const target = join19(targetDir, basename3(filePath));
+  const target = join20(targetDir, basename3(filePath));
   if (await Bun.file(target).exists()) {
     if (!options.force) {
       const ok = await dist_default6({ message: `Overwrite ${target}?`, default: false });
@@ -28532,7 +29544,7 @@ var init_collect_snippets = __esm(() => {
 });
 
 // src/core/inspect/collect-schema-cache.ts
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 async function collectSchemaCache(opts) {
   const warnings = [];
   if (opts.system && !SQL_SYSTEMS2.includes(opts.system)) {
@@ -28542,7 +29554,7 @@ async function collectSchemaCache(opts) {
     };
   }
   const root = resolveSchemaPath(opts.dbcliPath, opts.connectionName);
-  const indexPath = join23(root, "index.json");
+  const indexPath = join24(root, "index.json");
   const file = Bun.file(indexPath);
   if (!await file.exists()) {
     return { section: { available: false }, warnings };
@@ -28654,7 +29666,7 @@ var init_suggest_commands = __esm(() => {
 });
 
 // src/core/inspect/collector.ts
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 async function collectInspect(opts) {
   const warnings = [];
   let config = null;
@@ -28730,7 +29742,7 @@ async function collectInspect(opts) {
   return { ...snapWithoutSuggestions, suggestedCommands, warnings };
 }
 async function hasConfig(configPath) {
-  if (await Bun.file(join24(configPath, "config.json")).exists())
+  if (await Bun.file(join25(configPath, "config.json")).exists())
     return true;
   if (await Bun.file(configPath).exists()) {
     const stat6 = await Bun.file(configPath).stat().catch(() => null);
@@ -28844,8 +29856,8 @@ function renderMarkdown2(snap, options = {}) {
   lines.push("");
   if (snap.warnings.length > 0) {
     lines.push("## Warnings");
-    for (const w of snap.warnings)
-      lines.push(`- ${w}`);
+    for (const w2 of snap.warnings)
+      lines.push(`- ${w2}`);
     lines.push("");
   }
   return lines.join(`
@@ -29019,7 +30031,7 @@ var {
 // package.json
 var package_default = {
   name: "@carllee1983/dbcli",
-  version: "1.20.1",
+  version: "1.20.2",
   description: "Database CLI for AI agents",
   type: "module",
   publishConfig: {
@@ -29079,12 +30091,12 @@ var package_default = {
   dependencies: {
     "cli-table3": "^0.6.5",
     commander: "13.0.0",
-    "lru-cache": "^11.3.6",
-    "lucide-react": "^1.14.0",
+    "lru-cache": "^11.4.0",
+    "lucide-react": "^1.16.0",
     mongodb: "^7.2.0",
     mysql2: "^3.22.3",
     open: "^11.0.0",
-    pg: "^8.20.0",
+    pg: "^8.21.0",
     picocolors: "^1.1.1",
     react: "^19.2.6",
     "react-dom": "^19.2.6",
@@ -29094,19 +30106,22 @@ var package_default = {
   devDependencies: {
     "@eslint/js": "^9.39.4",
     "@happy-dom/global-registrator": "^20.9.0",
-    "@inquirer/prompts": "^8.4.2",
+    "@inquirer/prompts": "^8.4.3",
     "@testing-library/react": "^16.3.2",
     "@types/bun": "latest",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     autoprefixer: "^10.5.0",
-    eslint: "^10.3.0",
+    eslint: "^10.4.0",
     "happy-dom": "^20.9.0",
     postcss: "^8.5.14",
     prettier: "^3.8.3",
     tailwindcss: "3.4.1",
     typescript: "^5.9.3",
-    "typescript-eslint": "^8.59.2"
+    "typescript-eslint": "^8.59.4"
+  },
+  overrides: {
+    "brace-expansion": "^5.0.6"
   }
 };
 
@@ -29884,191 +30899,7 @@ async function handleMongoDBInit(ctx) {
 // src/commands/list.ts
 init_message_loader();
 init_adapters();
-
-// src/formatters/table-formatter.ts
-init_colors();
-var Table = require_table();
-
-class TableFormatter {
-  format(columns) {
-    const table = new Table({
-      head: ["Column", "Type", "Nullable", "Default", "Key"].map((h) => colors.bold(h)),
-      style: { compact: false, "padding-left": 1, "padding-right": 1 },
-      colWidths: [25, 25, 10, 25, 20]
-    });
-    columns.forEach((col) => {
-      let keyType = "";
-      if (col.primaryKey) {
-        keyType = "PK";
-      } else if (col.foreignKey) {
-        keyType = `FK \u2192 ${col.foreignKey.table}.${col.foreignKey.column}`;
-      }
-      table.push([col.name, col.type, col.nullable ? "YES" : "NO", col.default || "NULL", keyType]);
-    });
-    return table.toString();
-  }
-}
-
-class TableListFormatter {
-  format(tables) {
-    const table = new Table({
-      head: ["Table", "Columns", "Rows", "Engine"].map((h) => colors.bold(h)),
-      style: { compact: false, "padding-left": 1, "padding-right": 1 },
-      colWidths: [30, 12, 15, 15]
-    });
-    tables.forEach((t2) => {
-      table.push([
-        t2.name,
-        (t2.columnCount ?? t2.columns.length).toString(),
-        (t2.rowCount ?? "?").toString(),
-        t2.engine || "N/A"
-      ]);
-    });
-    return table.toString();
-  }
-}
-// src/formatters/json-formatter.ts
-init_size_category();
-class TableSchemaJSONFormatter {
-  format(table, options) {
-    const spacing = options?.compact ? undefined : 2;
-    const rowCount = table.estimatedRowCount ?? table.rowCount;
-    const output = {
-      name: table.name,
-      estimatedRowCount: rowCount ?? null,
-      sizeCategory: rowCount !== undefined && rowCount !== null ? getSizeCategory(rowCount) : null,
-      tableType: table.tableType ?? "table",
-      columns: table.columns,
-      primaryKey: table.primaryKey || [],
-      foreignKeys: table.foreignKeys || [],
-      indexes: table.indexes || [],
-      metadata: {
-        rowCount: table.rowCount,
-        engine: table.engine
-      }
-    };
-    return JSON.stringify(output, null, spacing);
-  }
-}
-// src/formatters/query-result-formatter.ts
-var Table2 = require_table();
-
-class QueryResultFormatter {
-  format(result, options) {
-    const format = options?.format || "table";
-    switch (format) {
-      case "json":
-        return this.formatJSON(result, options?.compact);
-      case "csv":
-        return this.formatCSV(result);
-      case "table":
-      default:
-        return this.formatTable(result);
-    }
-  }
-  formatTable(result) {
-    if (result.rows.length === 0) {
-      return this.formatEmptyTable(result);
-    }
-    const table = new Table2({
-      head: result.columnNames,
-      style: { compact: false, "padding-left": 1, "padding-right": 1 }
-    });
-    result.rows.forEach((row) => {
-      table.push(result.columnNames.map((col) => this.cellToString(row[col])));
-    });
-    let output = table.toString();
-    const footerLines = [];
-    footerLines.push(`Rows: ${result.rowCount}`);
-    if (result.executionTimeMs !== undefined) {
-      footerLines.push(`Execution time: ${result.executionTimeMs}ms`);
-    }
-    if (footerLines.length > 0) {
-      output += `
-` + footerLines.join(" | ");
-    }
-    if (result.metadata?.securityNotification) {
-      output += `
-` + result.metadata.securityNotification;
-    }
-    return output;
-  }
-  formatEmptyTable(result) {
-    const table = new Table2({
-      head: result.columnNames,
-      style: { compact: false, "padding-left": 1, "padding-right": 1 }
-    });
-    let output = table.toString();
-    const footerLines = [];
-    footerLines.push(`Rows: ${result.rowCount}`);
-    if (result.executionTimeMs !== undefined) {
-      footerLines.push(`Execution time: ${result.executionTimeMs}ms`);
-    }
-    if (footerLines.length > 0) {
-      output += `
-` + footerLines.join(" | ");
-    }
-    if (result.metadata?.securityNotification) {
-      output += `
-` + result.metadata.securityNotification;
-    }
-    return output;
-  }
-  formatJSON(result, compact) {
-    const spacing = compact ? undefined : 2;
-    const output = {
-      rows: result.rows,
-      rowCount: result.rowCount,
-      columnNames: result.columnNames,
-      columnTypes: result.columnTypes,
-      executionTimeMs: result.executionTimeMs,
-      metadata: result.metadata
-    };
-    return JSON.stringify(output, null, spacing);
-  }
-  formatCSV(result) {
-    if (result.rows.length === 0) {
-      let csvOutput = result.columnNames.map((name) => this.escapeCSVField(name)).join(",");
-      if (result.metadata?.securityNotification) {
-        csvOutput += `
-# ` + result.metadata.securityNotification;
-      }
-      return csvOutput;
-    }
-    const lines = [];
-    lines.push(result.columnNames.map((name) => this.escapeCSVField(name)).join(","));
-    result.rows.forEach((row) => {
-      const csvRow = result.columnNames.map((col) => this.escapeCSVField(row[col])).join(",");
-      lines.push(csvRow);
-    });
-    if (result.metadata?.securityNotification) {
-      lines.push(`# ${result.metadata.securityNotification}`);
-    }
-    return lines.join(`
-`);
-  }
-  escapeCSVField(value) {
-    if (value === null || value === undefined) {
-      return "";
-    }
-    const str = String(value);
-    if (str.includes(",") || str.includes('"') || str.includes(`
-`)) {
-      return `"${str.replace(/"/g, '""')}"`;
-    }
-    return str;
-  }
-  cellToString(value) {
-    if (value === null || value === undefined) {
-      return "";
-    }
-    if (typeof value === "object") {
-      return JSON.stringify(value);
-    }
-    return String(value);
-  }
-}
-// src/commands/list.ts
+init_formatters();
 init_config();
 init_validation();
 function requireSqlConnection(connection) {
@@ -30222,6 +31053,7 @@ async function elasticsearchListBranch(config, format, includeSystem) {
 import crypto from "crypto";
 init_message_loader();
 init_adapters();
+init_formatters();
 init_config();
 init_config_v2();
 init_config_binding();
@@ -30598,166 +31430,9 @@ class ColumnIndexBuilder {
     };
   }
 }
-// src/core/blacklist-manager.ts
-class BlacklistManager {
-  config;
-  state;
-  overrideEnabled;
-  constructor(config, overrideEnvValue) {
-    this.config = config;
-    this.overrideEnabled = (overrideEnvValue ?? Bun.env.DBCLI_OVERRIDE_BLACKLIST ?? "") === "true";
-    this.state = this.loadBlacklist();
-  }
-  loadBlacklist() {
-    const tables = new Set;
-    const columns = new Map;
-    const blacklistConfig = this.config.blacklist;
-    if (!blacklistConfig) {
-      return { tables, columns };
-    }
-    if (Array.isArray(blacklistConfig.tables)) {
-      for (const tableName of blacklistConfig.tables) {
-        if (typeof tableName === "string") {
-          tables.add(tableName.toLowerCase());
-        } else {
-          console.warn(`[BlacklistManager] Invalid table name in blacklist config: ${JSON.stringify(tableName)}`);
-        }
-      }
-    } else if (blacklistConfig.tables !== undefined) {
-      console.warn("[BlacklistManager] blacklist.tables must be an array, ignoring");
-    }
-    if (blacklistConfig.columns && typeof blacklistConfig.columns === "object" && !Array.isArray(blacklistConfig.columns)) {
-      for (const [tableName, cols] of Object.entries(blacklistConfig.columns)) {
-        if (typeof tableName !== "string") {
-          console.warn(`[BlacklistManager] Invalid table name key in columns config: ${JSON.stringify(tableName)}`);
-          continue;
-        }
-        if (!Array.isArray(cols)) {
-          console.warn(`[BlacklistManager] blacklist.columns["${tableName}"] must be an array, ignoring`);
-          continue;
-        }
-        const columnSet = new Set;
-        for (const col of cols) {
-          if (typeof col === "string") {
-            columnSet.add(col);
-          } else {
-            console.warn(`[BlacklistManager] Invalid column name in blacklist.columns["${tableName}"]: ${JSON.stringify(col)}`);
-          }
-        }
-        if (columnSet.size > 0) {
-          columns.set(tableName.toLowerCase(), columnSet);
-        }
-      }
-    } else if (blacklistConfig.columns !== undefined) {
-      console.warn("[BlacklistManager] blacklist.columns must be an object, ignoring");
-    }
-    return { tables, columns };
-  }
-  isTableBlacklisted(tableName) {
-    return this.state.tables.has(tableName.toLowerCase());
-  }
-  isColumnBlacklisted(tableName, columnName) {
-    const columnSet = this.state.columns.get(tableName.toLowerCase());
-    if (!columnSet) {
-      return false;
-    }
-    return columnSet.has(columnName);
-  }
-  getBlacklistedColumns(tableName) {
-    const columnSet = this.state.columns.get(tableName.toLowerCase());
-    if (!columnSet) {
-      return [];
-    }
-    return Array.from(columnSet);
-  }
-  canOverrideBlacklist() {
-    return this.overrideEnabled;
-  }
-  getState() {
-    return this.state;
-  }
-}
-// src/core/blacklist-validator.ts
-init_blacklist();
-init_message_loader();
-
-class BlacklistValidator {
-  manager;
-  constructor(manager) {
-    this.manager = manager;
-  }
-  checkTableBlacklist(operation, tableName, _tableList = []) {
-    if (this.manager.canOverrideBlacklist()) {
-      const message = t_vars("warnings.blacklist_override_used", {
-        operation,
-        table: tableName
-      });
-      console.error(message);
-      return;
-    }
-    if (this.manager.isTableBlacklisted(tableName)) {
-      const message = t_vars("errors.table_blacklisted", {
-        table: tableName,
-        operation
-      });
-      throw new BlacklistError(message, tableName, operation);
-    }
-  }
-  checkColumnBlacklistOnWrite(tableName, fields, operation = "WRITE") {
-    const blacklisted = this.manager.getBlacklistedColumns(tableName);
-    if (blacklisted.length === 0 || fields.length === 0) {
-      return;
-    }
-    const conflicts = fields.filter((f) => blacklisted.includes(f));
-    if (conflicts.length === 0) {
-      return;
-    }
-    if (this.manager.canOverrideBlacklist()) {
-      const warning = t_vars("warnings.blacklist_override_used", {
-        operation,
-        table: tableName
-      });
-      console.error(`${warning} (columns: ${conflicts.join(", ")})`);
-      return;
-    }
-    const message = t_vars("errors.column_blacklisted_write", {
-      table: tableName,
-      operation,
-      columns: conflicts.join(", ")
-    });
-    throw new BlacklistError(message, tableName, operation);
-  }
-  filterColumns(tableName, rows, columnList) {
-    const blacklistedColumns = this.manager.getBlacklistedColumns(tableName);
-    if (blacklistedColumns.length === 0) {
-      return { filteredRows: rows, omittedColumns: [] };
-    }
-    const omittedColumns = columnList.filter((col) => blacklistedColumns.includes(col));
-    if (omittedColumns.length === 0) {
-      return { filteredRows: rows, omittedColumns: [] };
-    }
-    const filteredRows = rows.map((row) => {
-      const newRow = {};
-      for (const [key, value] of Object.entries(row)) {
-        if (!omittedColumns.includes(key)) {
-          newRow[key] = value;
-        }
-      }
-      return newRow;
-    });
-    return { filteredRows, omittedColumns };
-  }
-  buildSecurityNotification(_tableName, omittedColumns) {
-    if (omittedColumns.length === 0) {
-      return "";
-    }
-    return t_vars("security.columns_omitted", {
-      count: omittedColumns.length
-    });
-  }
-}
 
 // src/core/index.ts
+init_blacklist_validator();
 init_size_category();
 
 // src/core/health-checker.ts
@@ -30895,8 +31570,25 @@ init_schema_loader();
 // src/commands/schema.ts
 init_integration_helper();
 init_validation();
+function markRedactedColumns(cols, collection, blacklist) {
+  const raw = (blacklist.columns ?? {})[collection];
+  if (!raw || raw.length === 0)
+    return cols;
+  const { patterns } = compilePatterns(raw);
+  if (patterns.length === 0)
+    return cols;
+  return cols.map((c) => matchAny(c.name, patterns) ? { ...c, redacted: true } : c);
+}
+function decorateMongoSchema(schema, meta) {
+  const columns = markRedactedColumns(schema.columns, schema.name, meta.blacklist);
+  return {
+    ...schema,
+    columns,
+    ...{ sampleMethod: meta.sampleMethod, sampleSize: meta.sampleSize }
+  };
+}
 var ALLOWED_FORMATS2 = ["table", "json"];
-var schemaCommand = new Command().name("schema").description("Display table schema, scan database schema, or refresh existing schema with detected changes").argument("[table]", "Optional: table name to inspect (if omitted, scans all tables)").option("--format <format>", "Output format: table (default) or json", "table").option("--config <path>", "Path to .dbcli config file", ".dbcli").option("--refresh", "Refresh schema by detecting changes from database", false).option("--reset", "Clear all existing schema data and re-fetch from database", false).option("--force", "Skip confirmation when updating schema data", false).option("--sample-size <n>", "MongoDB only: number of documents to sample for schema inference (default 50, max 1000). Ignored on SQL connections.").option("--recovery", "On failure, emit a structured recovery envelope to stdout (suppresses human stderr message)", false).action(schemaAction);
+var schemaCommand = new Command().name("schema").description("Display table schema, scan database schema, or refresh existing schema with detected changes").argument("[table]", "Optional: table name to inspect (if omitted, scans all tables)").option("--format <format>", "Output format: table (default) or json", "table").option("--config <path>", "Path to .dbcli config file", ".dbcli").option("--refresh", "Refresh schema by detecting changes from database", false).option("--reset", "Clear all existing schema data and re-fetch from database", false).option("--force", "Skip confirmation when updating schema data", false).option("--sample-size <n>", "MongoDB only: number of documents to sample for schema inference (default 50, max 1000). Ignored on SQL connections.").option("--sample-method <method>", 'MongoDB only: "random" (default, uses $sample) or "natural" (uses find().limit()). Ignored on SQL connections.', "random").option("--recovery", "On failure, emit a structured recovery envelope to stdout (suppresses human stderr message)", false).action(schemaAction);
 async function schemaAction(table, options, command) {
   let config;
   try {
@@ -30921,6 +31613,17 @@ async function schemaAction(table, options, command) {
         console.error("--sample-size is MongoDB-only and is being ignored for this connection.");
       }
     }
+    if (options.sampleMethod && options.sampleMethod !== "random") {
+      if (options.sampleMethod !== "natural") {
+        console.error(`--sample-method must be 'random' or 'natural' (received '${options.sampleMethod}')`);
+        process.exit(1);
+      }
+      if (config.connection.system === "mongodb") {
+        inferenceOptions = { ...inferenceOptions ?? {}, sampleMethod: "natural" };
+      } else {
+        console.error("--sample-method is MongoDB-only and is being ignored for this connection.");
+      }
+    }
     const connectionName = await getSchemaIsolationConnectionName(configPath);
     let existingSchemaCount;
     if (connectionName !== undefined) {
@@ -30994,15 +31697,20 @@ Key: ${schema.name}`);
     }
     const adapter = AdapterFactory.createAdapter(config.connection);
     await adapter.connect();
+    const mongoMeta = config.connection.system === "mongodb" ? {
+      blacklist: config.blacklist ?? { tables: [], columns: {} },
+      sampleMethod: inferenceOptions?.sampleMethod ?? "random",
+      sampleSize: inferenceOptions?.sampleSize ?? 100
+    } : undefined;
     try {
       if (options.reset) {
-        await handleSchemaReset(adapter, config, options, connectionName, existingSchemaCount, storagePath, inferenceOptions);
+        await handleSchemaReset(adapter, config, options, connectionName, existingSchemaCount, storagePath, inferenceOptions, mongoMeta);
       } else if (options.refresh) {
-        await handleSchemaRefresh(adapter, config, options, connectionName, storagePath, inferenceOptions);
+        await handleSchemaRefresh(adapter, config, options, connectionName, storagePath, inferenceOptions, mongoMeta);
       } else if (table) {
-        await handleSingleTableSchema(adapter, table, options.format, inferenceOptions);
+        await handleSingleTableSchema(adapter, table, options.format, inferenceOptions, mongoMeta);
       } else {
-        await handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount, storagePath, inferenceOptions);
+        await handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount, storagePath, inferenceOptions, mongoMeta);
       }
       await writeAuditEntry(config, "schema", options, {
         success: true,
@@ -31038,8 +31746,10 @@ Key: ${schema.name}`);
     process.exit(1);
   }
 }
-async function handleSingleTableSchema(adapter, tableName, format, inferenceOptions) {
-  const schema = await adapter.getTableSchema(tableName, inferenceOptions);
+async function handleSingleTableSchema(adapter, tableName, format, inferenceOptions, mongoMeta) {
+  let schema = await adapter.getTableSchema(tableName, inferenceOptions);
+  if (mongoMeta)
+    schema = decorateMongoSchema(schema, mongoMeta);
   if (format === "json") {
     const formatter = new TableSchemaJSONFormatter;
     console.log(formatter.format(schema));
@@ -31083,7 +31793,7 @@ Indexes:`);
     }
   }
 }
-async function handleSchemaRefresh(adapter, config, options, connectionName, storagePath, inferenceOptions) {
+async function handleSchemaRefresh(adapter, config, options, connectionName, storagePath, inferenceOptions, mongoMeta) {
   const diffEngine = new SchemaDiffEngine(adapter, config);
   const report = await diffEngine.diff();
   if (report.tablesAdded.length === 0 && report.tablesRemoved.length === 0 && Object.keys(report.tablesModified).length === 0) {
@@ -31106,7 +31816,9 @@ async function handleSchemaRefresh(adapter, config, options, connectionName, sto
   }
   const newSchema = { ...config.schema };
   for (const tableName of report.tablesAdded.concat(Object.keys(report.tablesModified))) {
-    const fullSchema = await adapter.getTableSchema(tableName, inferenceOptions);
+    let fullSchema = await adapter.getTableSchema(tableName, inferenceOptions);
+    if (mongoMeta)
+      fullSchema = decorateMongoSchema(fullSchema, mongoMeta);
     newSchema[tableName] = fullSchema;
   }
   report.tablesRemoved.forEach((t2) => delete newSchema[t2]);
@@ -31124,7 +31836,7 @@ async function handleSchemaRefresh(adapter, config, options, connectionName, sto
   await writeSchema(storagePath, updatedConfig, connectionName);
   console.log(`\u2705 Schema updated in .dbcli`);
 }
-async function handleSchemaReset(adapter, config, options, connectionName, existingCount, storagePath, inferenceOptions) {
+async function handleSchemaReset(adapter, config, options, connectionName, existingCount, storagePath, inferenceOptions, mongoMeta) {
   if (existingCount > 0 && !options.force) {
     const { SchemaLayeredLoader: SchemaLayeredLoader2 } = await Promise.resolve().then(() => (init_schema_loader(), exports_schema_loader));
     const loader = new SchemaLayeredLoader2(storagePath, { connectionName });
@@ -31155,7 +31867,9 @@ async function handleSchemaReset(adapter, config, options, connectionName, exist
   const schemaData = {};
   let processed = 0;
   for (const table of tables) {
-    const fullSchema = await adapter.getTableSchema(table.name, inferenceOptions);
+    let fullSchema = await adapter.getTableSchema(table.name, inferenceOptions);
+    if (mongoMeta)
+      fullSchema = decorateMongoSchema(fullSchema, mongoMeta);
     schemaData[table.name] = {
       name: fullSchema.name,
       columns: fullSchema.columns,
@@ -31165,7 +31879,8 @@ async function handleSchemaReset(adapter, config, options, connectionName, exist
       foreignKeys: fullSchema.foreignKeys || [],
       indexes: fullSchema.indexes || [],
       estimatedRowCount: fullSchema.estimatedRowCount || 0,
-      tableType: fullSchema.tableType || "table"
+      tableType: fullSchema.tableType || "table",
+      ...mongoMeta ? { sampleMethod: mongoMeta.sampleMethod, sampleSize: mongoMeta.sampleSize } : {}
     };
     processed++;
     if (processed % 10 === 0 || processed === tables.length) {
@@ -31192,14 +31907,16 @@ async function handleSchemaReset(adapter, config, options, connectionName, exist
 \u2705 Schema fetched \u2014 ${tables.length} tables from database`);
   }
 }
-async function handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount, storagePath, inferenceOptions) {
+async function handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount, storagePath, inferenceOptions, mongoMeta) {
   console.log(t("schema.scanning_database"));
   const tables = await adapter.listTables();
   console.log(t_vars("schema.tables_found", { count: tables.length }));
   const schemaData = {};
   let processed = 0;
   for (const table of tables) {
-    const fullSchema = await adapter.getTableSchema(table.name, inferenceOptions);
+    let fullSchema = await adapter.getTableSchema(table.name, inferenceOptions);
+    if (mongoMeta)
+      fullSchema = decorateMongoSchema(fullSchema, mongoMeta);
     schemaData[table.name] = {
       name: fullSchema.name,
       columns: fullSchema.columns,
@@ -31209,7 +31926,8 @@ async function handleFullDatabaseScan(adapter, config, options, connectionName,
       foreignKeys: fullSchema.foreignKeys || [],
       indexes: fullSchema.indexes || [],
       estimatedRowCount: fullSchema.estimatedRowCount || 0,
-      tableType: fullSchema.tableType || "table"
+      tableType: fullSchema.tableType || "table",
+      ...mongoMeta ? { sampleMethod: mongoMeta.sampleMethod, sampleSize: mongoMeta.sampleSize } : {}
     };
     processed++;
     if (processed % 10 === 0 || processed === tables.length) {
@@ -31265,38 +31983,10 @@ async function writeSchema(configPath, config, connectionName) {
 // src/commands/query.ts
 init_message_loader();
 init_adapters();
+init_formatters();
+init_html_formatter();
+init_opener();
 import crypto2 from "crypto";
-
-// src/formatters/html-formatter.ts
-init_package_root();
-async function generateHtmlReport(payload) {
-  const templatePath = packageAssetPath("ui-template.html");
-  const templateFile = Bun.file(templatePath);
-  if (!await templateFile.exists()) {
-    throw new Error(`UI template not found at ${templatePath}. Please run 'bun run build' first.`);
-  }
-  let html = await templateFile.text();
-  const jsonPayload = JSON.stringify(payload).replace(/</g, "\\u003c");
-  const injection = `window.__DBCLI_PAYLOAD__ = ${jsonPayload};`;
-  html = html.replace("/*DBCLI_PAYLOAD*/", () => injection);
-  return html;
-}
-
-// src/utils/opener.ts
-import open2 from "open";
-async function openInBrowser(target) {
-  if (process.env.DBCLI_NO_OPEN === "1" || false) {
-    console.log(`[Opener] DBCLI_NO_OPEN is set. Skipping browser launch for: ${target}`);
-    return;
-  }
-  try {
-    await open2(target);
-  } catch (err) {
-    console.error(`[Opener] Failed to open ${target}:`, err);
-  }
-}
-
-// src/commands/query.ts
 import { tmpdir } from "os";
 import { join as join15 } from "path";
 
@@ -31506,9 +32196,11 @@ function inferColumnType(value) {
 // src/commands/query.ts
 init_config();
 init_permission_guard();
+init_blacklist_validator();
 init_blacklist();
 init_validation();
 init_integration_helper();
+init_field_masker();
 function requireSqlConnection2(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
     throw new Error(`This command requires a SQL connection, got: ${connection.system}`);
@@ -31688,22 +32380,22 @@ async function mongoQueryBranch(queryStr, options, config) {
         execution_ms: executionTimeMs
       }
     });
-    const columnNames = result.rows[0] ? Object.keys(result.rows[0]) : [];
-    const filterResult = blacklistValidator.filterColumns(collection, result.rows, columnNames);
+    const blacklistCfg = config.blacklist ?? { tables: [], columns: {} };
+    const maskedRows = maskMongoRows(result.rows, collection, blacklistCfg);
+    const columnNames = maskedRows[0] ? Object.keys(maskedRows[0]) : [];
     const queryResult = {
-      rows: filterResult.filteredRows,
-      rowCount: filterResult.filteredRows.length,
-      columnNames: columnNames.filter((col) => !filterResult.omittedColumns.includes(col))
+      rows: maskedRows,
+      rowCount: maskedRows.length,
+      columnNames
     };
     const formatter = new QueryResultFormatter;
     const output = formatter.format(queryResult, {
       format
     });
     console.log(output);
-    const securityNote = blacklistValidator.buildSecurityNotification(collection, filterResult.omittedColumns);
-    if (securityNote) {
+    if ((blacklistCfg.columns[collection] ?? []).length > 0) {
       console.log(`
-\u2139 ${securityNote}`);
+\u2139 Some fields may have been redacted as [REDACTED] per .dbcli blacklist.`);
     }
   } finally {
     await mongoAdapter.disconnect();
@@ -32241,14 +32933,18 @@ init_message_loader();
 init_adapters();
 init_config();
 import crypto3 from "crypto";
+init_blacklist_validator();
 init_blacklist();
 init_permission_guard();
 init_engine_hints();
+init_formatters();
+init_html_formatter();
+init_opener();
 init_integration_helper();
 init_saved_queries();
 init_strategies();
-import { tmpdir as tmpdir2 } from "os";
-import { join as join18 } from "path";
+import { tmpdir as tmpdir3 } from "os";
+import { join as join19 } from "path";
 function formatDryRun(input) {
   const lines = ["Dry-run preview (no execution):"];
   if (input.family === "es") {
@@ -32284,17 +32980,14 @@ async function qCommand(name, options, command) {
     if (!config.connection)
       throw new Error('Run "dbcli init" first');
     const engine = mapSystemToEngine(config.connection.system);
-    if (engine === "mongodb") {
-      throw new SavedQueryError(`Saved queries do not support MongoDB connections`, "ENGINE_MISMATCH");
-    }
     const dirs = resolveSnippetDirs(process.cwd());
     const map = await loadSnippets(dirs);
     const snippet = resolveByName(map, name, engine);
     const cliParams = parseCliParams(options.param ?? []);
     const fileParams = await readParamFile(options.paramFile);
     const prepared = prepareExecution(snippet, { engine, noLimit: options.noLimit === true }, cliParams, fileParams);
-    for (const w of prepared.warnings)
-      console.error(`\u26A0 ${w}`);
+    for (const w2 of prepared.warnings)
+      console.error(`\u26A0 ${w2}`);
     if (prepared.warnings.length > 0)
       console.error("");
     if (options.dryRun) {
@@ -32312,6 +33005,11 @@ async function qCommand(name, options, command) {
       });
       return;
     }
+    if (engine === "mongodb") {
+      const { qMongoBranch: qMongoBranch2 } = await Promise.resolve().then(() => (init_q_mongo(), exports_q_mongo));
+      await qMongoBranch2(snippet, prepared, options, config);
+      return;
+    }
     const blacklistManager = new BlacklistManager(config);
     const blacklistValidator = new BlacklistValidator(blacklistManager);
     const family = engineFamily(engine);
@@ -32338,7 +33036,7 @@ async function qCommand(name, options, command) {
           rows: filtered.filteredRows
         });
         if (options.ui) {
-          const tempPath = join18(tmpdir2(), `dbcli-report-${Date.now()}.html`);
+          const tempPath = join19(tmpdir3(), `dbcli-report-${Date.now()}.html`);
           await Bun.write(tempPath, html);
           await openInBrowser(tempPath);
         } else {
@@ -32593,9 +33291,7 @@ async function deriveEngine() {
   try {
     const cfg = await configModule.read(resolveConfigPath(undefined, {}));
     if (cfg.connection) {
-      const engine = mapSystemToEngine(cfg.connection.system);
-      if (engine !== "mongodb")
-        return engine;
+      return mapSystemToEngine(cfg.connection.system);
     }
   } catch {}
   return "postgres";
@@ -32766,7 +33462,7 @@ async function queriesSearch(keywords, options) {
     process.exit(2);
     return;
   }
-  const allowed = ["postgres", "mysql", "redis", "elasticsearch", "all"];
+  const allowed = ["postgres", "mysql", "redis", "elasticsearch", "mongodb", "all"];
   if (options.engine && !allowed.includes(options.engine)) {
     console.error(`Unknown engine '${options.engine}'. Allowed: ${allowed.join(", ")}.`);
     process.exit(2);
@@ -32811,9 +33507,7 @@ async function deriveEngineOrNull() {
   try {
     const cfg = await configModule.read(resolveConfigPath(undefined, {}));
     if (cfg.connection) {
-      const e = mapSystemToEngine(cfg.connection.system);
-      if (e !== "mongodb")
-        return e;
+      return mapSystemToEngine(cfg.connection.system);
     }
   } catch {}
   return null;
@@ -32861,7 +33555,7 @@ async function queriesSuggest(intent, options) {
     process.exit(2);
     return;
   }
-  const allowed = ["postgres", "mysql", "redis", "elasticsearch", "all"];
+  const allowed = ["postgres", "mysql", "redis", "elasticsearch", "mongodb", "all"];
   if (options.engine && !allowed.includes(options.engine)) {
     console.error(`Unknown engine '${options.engine}'. Allowed: ${allowed.join(", ")}.`);
     process.exit(2);
@@ -33305,6 +33999,7 @@ Parameters:`);
 // src/commands/insert.ts
 init_config();
 init_permission_guard();
+init_blacklist_validator();
 init_blacklist();
 
 // src/core/mongo/dry-run-formatter.ts
@@ -33422,7 +34117,23 @@ function parseWhereClause(whereClause) {
 
 // src/core/mongo/dml-plan.ts
 init_permission_guard();
-var MONGO_UPDATE_OPERATOR_ALLOWLIST = new Set(["$set", "$unset"]);
+var MONGO_OPERATOR_TIER = {
+  $set: "SAFE",
+  $unset: "SAFE",
+  $rename: "RENAME",
+  $inc: "ARITHMETIC",
+  $mul: "ARITHMETIC",
+  $min: "ARITHMETIC",
+  $max: "ARITHMETIC",
+  $currentDate: "ARITHMETIC",
+  $push: "ARRAY",
+  $pull: "ARRAY",
+  $pullAll: "ARRAY",
+  $pop: "ARRAY",
+  $addToSet: "ARRAY",
+  $bit: "BITWISE",
+  $where: "BLOCK"
+};
 var MONGO_BROAD_FILTER_OPERATORS = new Set([
   "$regex",
   "$in",
@@ -33466,28 +34177,79 @@ function decide2(factors) {
     return "WARN";
   return "ALLOW";
 }
-function extractMongoWrittenFields(setDoc) {
+function classifyMongoUpdate(setDoc) {
   const fields = new Set;
-  const operators = [];
-  let hasUnsupportedOperator = false;
+  const tierFactors = [];
+  let hasBlock = false;
   const hasAnyOperator = Object.keys(setDoc).some((k) => k.startsWith("$"));
   if (!hasAnyOperator) {
     for (const k of Object.keys(setDoc))
       fields.add(k);
-    return { fields: Array.from(fields), operators: [], hasUnsupportedOperator: false };
+    return { fields: Array.from(fields), tierFactors, hasBlock };
   }
+  const seenTiers = new Map;
   for (const [op, payload] of Object.entries(setDoc)) {
-    operators.push(op);
-    if (!MONGO_UPDATE_OPERATOR_ALLOWLIST.has(op)) {
-      hasUnsupportedOperator = true;
+    if (!op.startsWith("$")) {
+      fields.add(op);
       continue;
     }
     if (payload && typeof payload === "object" && !Array.isArray(payload)) {
       for (const k of Object.keys(payload))
         fields.add(k);
     }
+    const tier = MONGO_OPERATOR_TIER[op];
+    if (tier === undefined) {
+      hasBlock = true;
+      tierFactors.push({
+        code: "mongo_unknown_operator",
+        severity: "block",
+        message: `Update uses unknown operator '${op}'. Reject by default; add to tier table if intentional.`
+      });
+      continue;
+    }
+    if (tier === "BLOCK") {
+      hasBlock = true;
+      tierFactors.push({
+        code: "mongo_unknown_operator",
+        severity: "block",
+        message: `Update uses '${op}' which executes server-side code. Operation rejected.`
+      });
+      continue;
+    }
+    if (tier === "SAFE")
+      continue;
+    const bucket = seenTiers.get(tier) ?? [];
+    bucket.push(op);
+    seenTiers.set(tier, bucket);
+  }
+  for (const [tier, ops] of seenTiers) {
+    if (tier === "RENAME") {
+      tierFactors.push({
+        code: "mongo_rename_operator",
+        severity: "warn",
+        message: `Update uses ${ops.join(", ")}; field rename does not exfiltrate data but can break readers.`
+      });
+    } else if (tier === "ARITHMETIC") {
+      tierFactors.push({
+        code: "mongo_arithmetic_operator",
+        severity: "warn",
+        message: `Update uses ${ops.join(", ")}; numeric mutation may compound silently.`
+      });
+    } else if (tier === "ARRAY") {
+      tierFactors.push({
+        code: "mongo_array_operator",
+        severity: "warn",
+        message: `Update uses ${ops.join(", ")}; array mutation can grow unboundedly without a size guard.`
+      });
+    } else if (tier === "BITWISE") {
+      tierFactors.push({
+        code: "mongo_bitwise_operator",
+        severity: "warn",
+        message: `Update uses ${ops.join(", ")}; bitwise updates skip type promotion checks.`
+      });
+    }
   }
-  return { fields: Array.from(fields), operators, hasUnsupportedOperator };
+  return { fields: Array.from(fields), tierFactors, hasBlock };
 }
 function hasIdEquality(where) {
   if (!("_id" in where))
@@ -33541,18 +34303,21 @@ function applyTableBlacklist(target, context, factors) {
 function applyColumnBlacklist(target, fields, context, factors) {
   const columns = context.blacklist.columns ?? {};
   const lower = target.toLowerCase();
-  let blacklistedFields = [];
+  let raw = [];
   for (const [t2, cols] of Object.entries(columns)) {
     if (t2.toLowerCase() === lower) {
-      blacklistedFields = cols;
+      raw = cols;
       break;
     }
   }
-  if (blacklistedFields.length === 0)
+  if (raw.length === 0)
+    return;
+  const { patterns } = compilePatterns(raw);
+  if (patterns.length === 0)
     return;
   for (const field of fields) {
-    if (blacklistedFields.includes(field)) {
-      pushFactor2(factors, "blacklisted_column", "block", `MongoDB write would touch blacklisted field ${target}.${field}.`);
+    if (matchAny(field, patterns)) {
+      pushFactor2(factors, "blacklisted_column", "block", `MongoDB write would touch blacklisted path ${target}.${field}.`);
     }
   }
 }
@@ -33601,18 +34366,31 @@ function buildSuggestedCommands2(target, factors) {
   }
   return [];
 }
+function flattenInsertPaths(data, prefix = "") {
+  const out = [];
+  for (const [k, v] of Object.entries(data)) {
+    const path4 = prefix === "" ? k : `${prefix}.${k}`;
+    out.push(path4);
+    if (v && typeof v === "object" && !Array.isArray(v) && !(v instanceof Date)) {
+      const ctor = v.constructor?.name;
+      if (ctor === "Object") {
+        out.push(...flattenInsertPaths(v, path4));
+      }
+    }
+  }
+  return out;
+}
 var analyzeMongoDmlRisk = (intent, context) => {
   const factors = [];
   applyPermission(intent.operation, context, factors);
   applyTableBlacklist(intent.target, context, factors);
   if (intent.operation === "insert") {
-    applyColumnBlacklist(intent.target, Object.keys(intent.data), context, factors);
+    applyColumnBlacklist(intent.target, flattenInsertPaths(intent.data), context, factors);
   } else if (intent.operation === "update") {
-    const { fields, hasUnsupportedOperator } = extractMongoWrittenFields(intent.set);
-    if (hasUnsupportedOperator) {
-      pushFactor2(factors, "nonsql_unsupported_operator", "block", "MongoDB update uses an operator outside the MVP allowlist ($set, $unset).");
-    }
-    applyColumnBlacklist(intent.target, fields, context, factors);
+    const cls = classifyMongoUpdate(intent.set);
+    for (const f of cls.tierFactors)
+      pushFactor2(factors, f.code, f.severity, f.message);
+    applyColumnBlacklist(intent.target, cls.fields, context, factors);
     const where = intent.where ?? {};
     if (Object.keys(where).length === 0) {
       pushFactor2(factors, "nonsql_filter_empty", "block", "MongoDB update filter is empty and would match every document.");
@@ -34278,6 +35056,7 @@ init_adapters();
 import crypto5 from "crypto";
 init_config();
 init_permission_guard();
+init_blacklist_validator();
 init_blacklist();
 init_integration_helper();
 function requireSqlConnection4(connection) {
@@ -34574,6 +35353,7 @@ init_adapters();
 import crypto6 from "crypto";
 init_config();
 init_permission_guard();
+init_blacklist_validator();
 init_blacklist();
 init_integration_helper();
 function requireSqlConnection5(connection) {
@@ -34851,12 +35631,16 @@ async function deleteCommand(table, options, command) {
 // src/commands/export.ts
 init_message_loader();
 init_adapters();
+init_formatters();
+init_html_formatter();
 import crypto7 from "crypto";
 init_config();
 init_permission_guard();
+init_blacklist_validator();
 init_blacklist();
 init_integration_helper();
 init_engine_hints();
+init_field_masker();
 function requireSqlConnection6(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
     throw new Error(`This command requires a SQL connection, got: ${connection.system}`);
@@ -35062,10 +35846,10 @@ async function mongoExportBranch(query, options, config) {
   await adapter.connect();
   try {
     const result = await adapter.execute(query, [collection], effectiveLimit !== undefined ? { limit: effectiveLimit } : undefined);
-    const columnNames = collectColumnUnion(result.rows);
-    const filterResult = blacklistValidator.filterColumns(collection, result.rows, columnNames);
-    const visibleColumns = columnNames.filter((col) => !filterResult.omittedColumns.includes(col));
-    const formatted = formatMongoRows(filterResult.filteredRows, visibleColumns, options.format);
+    const blacklistCfg = config.blacklist ?? { tables: [], columns: {} };
+    const maskedRows = maskMongoRows(result.rows, collection, blacklistCfg);
+    const visibleColumns = collectColumnUnion(maskedRows);
+    const formatted = formatMongoRows(maskedRows, visibleColumns, options.format);
     if (options.output) {
       const file = Bun.file(options.output);
       const exists = await file.exists();
@@ -35078,21 +35862,20 @@ async function mongoExportBranch(query, options, config) {
       }
       await file.write(formatted);
       console.error(t_vars("export.exported", {
-        count: filterResult.filteredRows.length,
+        count: maskedRows.length,
         file: options.output
       }));
     } else {
       console.log(formatted);
     }
-    const securityNote = blacklistValidator.buildSecurityNotification(collection, filterResult.omittedColumns);
-    if (securityNote) {
-      console.error(`\u2139 ${securityNote}`);
+    if ((blacklistCfg.columns[collection] ?? []).length > 0) {
+      console.error(`\u2139 Some fields may have been redacted as [REDACTED] per .dbcli blacklist.`);
     }
     await writeAuditEntry(config, "export", options, {
       success: true,
       target: collection,
       metadata: {
-        rows_affected: filterResult.filteredRows.length,
+        rows_affected: maskedRows.length,
         output_format: options.format,
         ...options.output && { output_file: options.output }
       }
@@ -35298,15 +36081,15 @@ class AgentTaskError extends Error {
 }
 // src/core/agent-tasks/task-paths.ts
 init_package_root();
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 function resolveBuiltinDir2() {
   return packageAssetPath("tasks");
 }
 function resolveAgentTaskDirs(workspaceRoot) {
   return {
     builtinDir: resolveBuiltinDir2(),
-    sharedDir: join21(workspaceRoot, ".dbcli-shared", "tasks"),
-    localDir: join21(workspaceRoot, ".dbcli", "tasks")
+    sharedDir: join22(workspaceRoot, ".dbcli-shared", "tasks"),
+    localDir: join22(workspaceRoot, ".dbcli", "tasks")
   };
 }
 // src/core/agent-tasks/parser.ts
@@ -35444,7 +36227,7 @@ function parseSteps(value, input) {
 }
 // src/core/agent-tasks/loader.ts
 import { readdir as readdir2 } from "fs/promises";
-import { join as join22, relative as relative2, sep as sep2 } from "path";
+import { join as join23, relative as relative2, sep as sep2 } from "path";
 async function loadAgentTasks(opts, flags) {
   const errors3 = [];
   const builtin = await walkAndParse2(opts.builtinDir, "builtin", errors3);
@@ -35501,7 +36284,7 @@ async function safeCollectMd(root) {
       return;
     }
     for (const e of entries) {
-      const full = join22(dir, e.name);
+      const full = join23(dir, e.name);
       if (e.isDirectory())
         await walk(full);
       else
@@ -35609,7 +36392,7 @@ function splitArgv(input) {
 }
 
 // src/core/agent-tasks/planner.ts
-var TEMPLATE_RE = /\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
+var TEMPLATE_RE2 = /\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
 function planAgentTask(input) {
   const warnings = [];
   const resolved = resolveParams(input.task.params, input.params, warnings);
@@ -35689,7 +36472,7 @@ function coerce2(p, raw) {
   return value;
 }
 function applyTemplate(command, values, task) {
-  return command.replace(TEMPLATE_RE, (_match, key) => {
+  return command.replace(TEMPLATE_RE2, (_match, key) => {
     if (!(key in values)) {
       throw new AgentTaskError(`Template references unknown parameter '${key}' in task '${task.name}'`, "TEMPLATE_SYNTAX", task.file);
     }
@@ -35729,8 +36512,8 @@ function renderMarkdownPlan(plan) {
   });
   if (plan.warnings.length > 0) {
     lines.push("## Warnings");
-    for (const w of plan.warnings)
-      lines.push(`- ${w}`);
+    for (const w2 of plan.warnings)
+      lines.push(`- ${w2}`);
   }
   return lines.join(`
 `);
@@ -35903,6 +36686,15 @@ function parseParamPairs(pairs) {
 // src/commands/blacklist.ts
 init_message_loader();
 init_config();
+function auditBlacklistPatterns(cfg) {
+  const warnings = [];
+  for (const [collection, raw] of Object.entries(cfg.columns ?? {})) {
+    const { rejected } = compilePatterns(raw);
+    for (const r of rejected)
+      warnings.push({ collection, raw: r.raw, reason: r.reason });
+  }
+  return { warnings };
+}
 var DEFAULT_CONFIG_PATH = ".dbcli";
 var VALID_TABLE_NAME = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 var VALID_COLUMN_NAME = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
@@ -35953,6 +36745,10 @@ async function blacklistList(configPath) {
   } else {
     console.log(`${t("blacklist.columns_label")}: {}`);
   }
+  const audit = auditBlacklistPatterns(blacklist);
+  for (const w2 of audit.warnings) {
+    console.error(`\u26A0  blacklist.columns["${w2.collection}"]: '${w2.raw}' is ignored on mongo connections (${w2.reason}).`);
+  }
 }
 async function blacklistTableAdd(tableName, configPath) {
   if (!isValidTableName(tableName)) {
@@ -36702,8 +37498,8 @@ async function collectReport(opts) {
     brief: opts.brief,
     probeTimeoutMs: opts.probeTimeoutMs
   });
-  for (const w of context.warnings) {
-    warnings.push({ severity: "warn", message: w, source: "inspect" });
+  for (const w2 of context.warnings) {
+    warnings.push({ severity: "warn", message: w2, source: "inspect" });
   }
   if (opts.noConnect) {
     warnings.push({ severity: "info", message: "diagnostics skipped (no-connect mode)" });
@@ -36871,9 +37667,9 @@ function renderMarkdown3(snap, options = {}) {
   }
   if (snap.warnings.length > 0) {
     lines.push("## Warnings");
-    for (const w of snap.warnings) {
-      const src = w.source ? ` (${w.source})` : "";
-      lines.push(`- [${w.severity}]${src} ${w.message}`);
+    for (const w2 of snap.warnings) {
+      const src = w2.source ? ` (${w2.source})` : "";
+      lines.push(`- [${w2.severity}]${src} ${w2.message}`);
     }
     lines.push("");
   }
@@ -37187,8 +37983,8 @@ async function collectGuide(opts) {
     brief: opts.brief,
     probeTimeoutMs: opts.probeTimeoutMs
   });
-  for (const w of context.warnings) {
-    warnings.push({ severity: "warn", message: w, source: "inspect" });
+  for (const w2 of context.warnings) {
+    warnings.push({ severity: "warn", message: w2, source: "inspect" });
   }
   let snippets = new Map;
   try {
@@ -37277,9 +38073,9 @@ function renderMarkdown4(snap, options = {}) {
   lines.push("");
   if (snap.warnings.length > 0) {
     lines.push("## Warnings");
-    for (const w of snap.warnings) {
-      const src = w.source ? ` (${w.source})` : "";
-      lines.push(`- [${w.severity}]${src} ${w.message}`);
+    for (const w2 of snap.warnings) {
+      const src = w2.source ? ` (${w2.source})` : "";
+      lines.push(`- [${w2.severity}]${src} ${w2.message}`);
     }
     lines.push("");
   }
@@ -37479,6 +38275,7 @@ var recoveryCategorySchema = exports_external.enum([
   "unknown"
 ]);
 var guideRiskSchema = exports_external.enum(["readonly", "dry-run", "write", "unknown"]);
+var branchIdSchema = exports_external.string().min(1).max(64).regex(/^[a-z0-9-]+$/, "branchId must match /^[a-z0-9-]+$/");
 var guideStepSchema = exports_external.object({
   order: exports_external.number().int(),
   command: exports_external.string().min(1),
@@ -37489,7 +38286,35 @@ var guideStepSchema = exports_external.object({
   intent: exports_external.string().optional(),
   interactive: exports_external.boolean().optional(),
   dbWrite: exports_external.boolean().optional(),
-  placeholders: exports_external.array(exports_external.string()).optional()
+  placeholders: exports_external.array(exports_external.string()).optional(),
+  branchId: branchIdSchema.optional()
+}).strict();
+var branchPlanSchema = exports_external.object({
+  description: exports_external.string().min(1),
+  steps: exports_external.array(guideStepSchema).min(1).max(MAX_BRANCH_STEPS)
+}).strict();
+var branchesSchema = exports_external.record(branchIdSchema, branchPlanSchema).superRefine((map, ctx) => {
+  const keys = Object.keys(map);
+  if (keys.length > MAX_BRANCH_COUNT) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: `branches has ${keys.length} entries; cap is ${MAX_BRANCH_COUNT}`
+    });
+  }
+  for (const [id, plan] of Object.entries(map)) {
+    for (const step of plan.steps) {
+      if (step.branchId !== undefined && step.branchId !== id) {
+        ctx.addIssue({
+          code: exports_external.ZodIssueCode.custom,
+          message: `step.branchId '${step.branchId}' does not match enclosing key '${id}'`
+        });
+      }
+    }
+  }
+});
+var branchForkSchema = exports_external.object({
+  after: exports_external.number().int().min(1),
+  branchIds: exports_external.array(branchIdSchema).min(1)
 }).strict();
 var recoveryEnvelopeSchema = exports_external.object({
   schemaVersion: exports_external.literal(1),
@@ -37510,8 +38335,30 @@ var recoveryEnvelopeSchema = exports_external.object({
     }).strict().optional()
   }).strict(),
   recovery: exports_external.array(guideStepSchema),
-  verify: guideStepSchema.optional()
-}).strict();
+  verify: guideStepSchema.optional(),
+  branches: branchesSchema.optional(),
+  branchFork: branchForkSchema.optional()
+}).strict().superRefine((env, ctx) => {
+  const hasBranches = env.branches !== undefined;
+  const hasFork = env.branchFork !== undefined;
+  if (hasBranches !== hasFork) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: "branches and branchFork must be set together (or both omitted)"
+    });
+    return;
+  }
+  if (hasBranches && hasFork) {
+    const keys = Object.keys(env.branches).sort();
+    const ids = [...env.branchFork.branchIds].sort();
+    if (keys.length !== ids.length || keys.some((k, i) => k !== ids[i])) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "branchFork.branchIds must equal Object.keys(branches)"
+      });
+    }
+  }
+});
 var savedRecoveryEnvelopeSchema = exports_external.object({
   schemaVersion: exports_external.literal(1),
   id: exports_external.string().optional(),
@@ -37544,6 +38391,7 @@ function looksLikeSavedEnvelope(x) {
 }
 
 // src/commands/recover.ts
+init_next_step();
 init_next_step_schema();
 init_validation();
 var ALLOWED_FORMATS13 = ["json", "markdown"];
@@ -37654,21 +38502,27 @@ async function runNext(options, source) {
     throw new RecoverCliError(parsed.reason ?? "--result invalid.", EXIT_CODE.malformed);
   }
   const env = source.envelope;
+  const branchIdRaw = options.branch;
   let outcome;
   try {
-    outcome = nextStepFromEnvelope(env, afterStep, parsed.value);
+    outcome = nextStepFromEnvelope(env, afterStep, parsed.value, {
+      branchId: branchIdRaw
+    });
   } catch (e) {
     throw new RecoverCliError(e.message, EXIT_CODE.malformed);
   }
-  const totalSteps = env.recovery.length;
   if (outcome.kind === "done") {
     return {
       schemaVersion: NEXT_SCHEMA_VERSION,
       kind: "done",
       source: { kind: source.kind, path: source.path },
       errorCode: env.error.code,
-      cursor: totalSteps,
-      totalSteps
+      cursor: outcome.cursor,
+      totalSteps: outcome.totalSteps,
+      ...outcome.branchId !== undefined ? {
+        branchId: outcome.branchId,
+        branchDescription: env.branches?.[outcome.branchId]?.description
+      } : {}
     };
   }
   return {
@@ -37676,12 +38530,16 @@ async function runNext(options, source) {
     kind: "step",
     source: { kind: source.kind, path: source.path },
     errorCode: env.error.code,
-    cursor: outcome.step.order,
-    totalSteps,
-    step: outcome.step
+    cursor: outcome.cursor,
+    totalSteps: outcome.totalSteps,
+    step: outcome.step,
+    ...outcome.branchId !== undefined ? {
+      branchId: outcome.branchId,
+      branchDescription: env.branches?.[outcome.branchId]?.description
+    } : {}
   };
 }
-var recoverCommand = new Command().name("recover").description("Inspect or apply the last recovery plan").option("--apply", "Execute the recovery plan under risk gating", false).option("--from <path>", "Read the envelope from a file instead of .dbcli/last-recovery.json").option("--allow-write <tier>", `Open the risk gate one tier; values: ${ALLOWED_TIERS.join(" | ")}`).option("--no-verify", "Skip the verify step appended after a successful --apply").option("--next", "Look up the single next step in the multi-turn protocol", false).option("--after-step <n>", "For --next: 1-based order of the step the agent just executed").option("--result <value>", "For --next: JSON StepResultSummary (or @<path> to read from a file)").option("--format <format>", "Output format: markdown | json (default: markdown for inspect, json for --apply / --next)").action(async (options) => {
+var recoverCommand = new Command().name("recover").description("Inspect or apply the last recovery plan").option("--apply", "Execute the recovery plan under risk gating", false).option("--from <path>", "Read the envelope from a file instead of .dbcli/last-recovery.json").option("--allow-write <tier>", `Open the risk gate one tier; values: ${ALLOWED_TIERS.join(" | ")}`).option("--no-verify", "Skip the verify step appended after a successful --apply").option("--next", "Look up the single next step in the multi-turn protocol", false).option("--after-step <n>", "For --next: 1-based order of the step the agent just executed").option("--result <value>", "For --next: JSON StepResultSummary (or @<path> to read from a file)").option("--branch <id>", "For --next: walk a specific branch by id").option("--format <format>", "Output format: markdown | json (default: markdown for inspect, json for --apply / --next)").action(async (options) => {
   try {
     if (options.next === true && options.apply === true) {
       throw new RecoverCliError("--next and --apply cannot be combined.", EXIT_CODE.malformed);
@@ -37755,7 +38613,7 @@ var recoverCommand = new Command().name("recover").description("Inspect or apply
 
 // src/commands/audit.ts
 import { rm as rm3, stat as stat7 } from "fs/promises";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 init_message_loader();
 init_validation();
 init_config();
@@ -37771,8 +38629,8 @@ var PREFIX_MIN = 4;
 async function resolveAuditPaths(configPath, config) {
   const storagePath = await resolveConfigStoragePath(configPath);
   const connName = config.effectiveConnectionName || getGlobalConnectionName() || "default";
-  const auditDir = join25(storagePath, ".dbcli", "audit");
-  const auditFile = join25(auditDir, `${connName}.jsonl`);
+  const auditDir = join26(storagePath, ".dbcli", "audit");
+  const auditFile = join26(auditDir, `${connName}.jsonl`);
   return { auditDir, connectionName: connName, auditFile };
 }
 function isAuditDisabled(config) {
@@ -37814,7 +38672,7 @@ function renderTable(rows, headers) {
   const allRows = [headers, ...rows];
   const widths = headers.map((_, col) => Math.max(...allRows.map((r) => (r[col] ?? "").length)));
   const fmt = (r) => r.map((cell, i) => (cell ?? "").padEnd(widths[i] ?? 0)).join("  ").trimEnd();
-  const sep3 = widths.map((w) => "-".repeat(w)).join("  ").trimEnd();
+  const sep3 = widths.map((w2) => "-".repeat(w2)).join("  ").trimEnd();
   return [fmt(headers), sep3, ...rows.map(fmt)].join(`
 `);
 }
@@ -38199,7 +39057,7 @@ init_config_binding();
 init_schema_path();
 init_config();
 init_integration_helper();
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 import { resolveSrv as resolveSrv2 } from "dns/promises";
 function requireSqlConnection9(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
@@ -38279,7 +39137,7 @@ var runDoctorChecks = {
     }
   },
   async checkConfigExists(configPath, existsFn) {
-    const exists = existsFn ? await existsFn(configPath) : await Bun.file(configPath).exists() || await Bun.file(join26(configPath, "config.json")).exists();
+    const exists = existsFn ? await existsFn(configPath) : await Bun.file(configPath).exists() || await Bun.file(join27(configPath, "config.json")).exists();
     return {
       group: "Configuration",
       label: "Config exists",
@@ -38436,7 +39294,7 @@ var runDoctorChecks = {
   async checkV2Config(configPath) {
     const results = [];
     const storagePath = await resolveConfigStoragePath(configPath);
-    const configFile = Bun.file(join26(storagePath, "config.json"));
+    const configFile = Bun.file(join27(storagePath, "config.json"));
     if (!await configFile.exists())
       return results;
     let raw;
@@ -38476,7 +39334,7 @@ var runDoctorChecks = {
     }
     for (const [name, conn] of Object.entries(config.connections)) {
       if (conn.envFile) {
-        const envPath = join26(storagePath, conn.envFile);
+        const envPath = join27(storagePath, conn.envFile);
         const exists = await Bun.file(envPath).exists();
         results.push({
           group: "Configuration",
@@ -38695,7 +39553,7 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
           }
           try {
             const schemaConnName = await getSchemaIsolationConnectionName(configPath);
-            const indexPath = join26(resolveSchemaPath(storagePath, schemaConnName), "index.json");
+            const indexPath = join27(resolveSchemaPath(storagePath, schemaConnName), "index.json");
             const indexFile = Bun.file(indexPath);
             let indexParsed = null;
             if (await indexFile.exists()) {
@@ -38749,7 +39607,7 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
 
 // src/commands/completion.ts
 init_colors();
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 import { homedir as homedir3 } from "os";
 function extractCommands(program2) {
   return program2.commands.map((cmd) => ({
@@ -38851,11 +39709,11 @@ function getInstallPath2(shell) {
   const home = homedir3();
   switch (shell) {
     case "bash":
-      return join27(home, ".bashrc");
+      return join28(home, ".bashrc");
     case "zsh":
-      return join27(home, ".zshrc");
+      return join28(home, ".zshrc");
     case "fish":
-      return join27(home, ".config", "fish", "completions", "dbcli.fish");
+      return join28(home, ".config", "fish", "completions", "dbcli.fish");
     default:
       throw new Error(`Unsupported shell: ${shell}. Supported: bash, zsh, fish`);
   }
@@ -38875,7 +39733,7 @@ var MARKER_END = "# <<< dbcli completion <<<";
 async function installCompletion(shell, script) {
   const targetPath = getInstallPath2(shell);
   if (shell === "fish") {
-    const dir = join27(homedir3(), ".config", "fish", "completions");
+    const dir = join28(homedir3(), ".config", "fish", "completions");
     await Bun.$`mkdir -p ${dir}`.quiet();
     await Bun.file(targetPath).write(script);
     console.log(colors.success(`\u2713 Fish completion installed to ${targetPath}`));
@@ -39108,7 +39966,7 @@ ${t("upgrade.failed")}`));
 init_config();
 init_adapters();
 import { createInterface as createInterface2 } from "readline";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 import { homedir as homedir4 } from "os";
 
 // src/core/repl/types.ts
@@ -39505,6 +40363,7 @@ class HistoryManager {
 
 // src/core/repl/repl-engine.ts
 init_permission_guard();
+init_query_result_formatter();
 init_message_loader();
 var import_picocolors3 = __toESM(require_picocolors(), 1);
 
@@ -39839,7 +40698,7 @@ function requireSqlConnection10(connection) {
   }
   return connection;
 }
-var HISTORY_PATH = join28(homedir4(), ".dbcli_history");
+var HISTORY_PATH = join29(homedir4(), ".dbcli_history");
 var MONGO_COMPLETION_EAGER_THRESHOLD = 20;
 async function populateMongoColumns(mongoAdapter, collectionNames, threshold = MONGO_COMPLETION_EAGER_THRESHOLD) {
   const columnsByTable = {};
@@ -40589,7 +41448,6 @@ class DDLExecutor {
     } catch {}
   }
 }
-
 // src/commands/migrate.ts
 function requireSqlConnection11(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
@@ -40826,7 +41684,7 @@ init_config();
 init_errors();
 init_message_loader();
 init_config_binding();
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 async function switchDefault(configPath, name, config) {
   if (!config.connections[name]) {
     const available = Object.keys(config.connections).join(", ");
@@ -40849,7 +41707,7 @@ function listConnectionsForDisplay(config) {
 }
 async function ensureV2Config(configPath) {
   const storagePath = await resolveConfigStoragePath(configPath);
-  const configFile = Bun.file(join29(storagePath, "config.json"));
+  const configFile = Bun.file(join30(storagePath, "config.json"));
   const legacyFile = Bun.file(configPath);
   if (!await configFile.exists() && !await legacyFile.exists()) {
     throw new ConfigError(t("init.config_not_found"));
@@ -40913,7 +41771,7 @@ var useCommand = new Command("use").description("Switch or display the default d
 
 // src/cli.ts
 init_config();
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var _bgVersionCheckResult;
 function shouldSkipBackgroundChecks() {
   return process.env.DBCLI_NO_UPDATE_CHECK === "1" || process.env.DBCLI_NO_UPDATE_CHECK === "true" || false;
@@ -40942,7 +41800,7 @@ program2.hook("preAction", (thisCommand, actionCommand) => {
       try {
         let cache = null;
         try {
-          const cacheFile = Bun.file(join30(configPath, "version-check.json"));
+          const cacheFile = Bun.file(join31(configPath, "version-check.json"));
           if (await cacheFile.exists()) {
             cache = await cacheFile.json();
           }