@carllee1983/dbcli 1.5.0 → 1.6.0

package/dist/cli.mjs

@@ -6146,7 +6146,10 @@ var init_validation = __esm(() => {
     password: exports_external.union([exports_external.string(), EnvRefSchema]).default(""),
     database: StringOrEnvRef
   });
-  ConnectionConfigSchema = exports_external.union([SqlConnectionConfigSchema, MongoDBConnectionConfigSchema]);
+  ConnectionConfigSchema = exports_external.union([
+    SqlConnectionConfigSchema,
+    MongoDBConnectionConfigSchema
+  ]);
   PermissionSchema = exports_external.enum(["query-only", "read-write", "data-admin", "admin"]).default("query-only");
   MetadataSchema = exports_external.object({
     createdAt: exports_external.string().datetime().optional(),
@@ -6173,7 +6176,10 @@ var init_validation = __esm(() => {
     permission: PermissionSchema,
     envFile: exports_external.string().optional()
   });
-  NamedConnectionSchema = exports_external.union([SqlNamedConnectionSchema, MongoDBNamedConnectionSchema]);
+  NamedConnectionSchema = exports_external.union([
+    SqlNamedConnectionSchema,
+    MongoDBNamedConnectionSchema
+  ]);
   DbcliConfigV2Schema = exports_external.object({
     version: exports_external.literal(2),
     default: exports_external.string().min(1),
@@ -7297,16 +7303,16 @@ var init_esm = __esm(() => {
 });
 
 // src/utils/schema-path.ts
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 function resolveSchemaPath(dbcliPath, connectionName) {
   if (!connectionName)
-    return join2(dbcliPath, "schemas");
-  return join2(dbcliPath, "schemas", connectionName);
+    return join3(dbcliPath, "schemas");
+  return join3(dbcliPath, "schemas", connectionName);
 }
 var init_schema_path = () => {};
 
 // src/core/schema-cache.ts
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 
 class SchemaCacheManager {
   cache;
@@ -7332,13 +7338,13 @@ class SchemaCacheManager {
   }
   async initialize() {
     try {
-      const indexPath = join3(this.schemaRoot, "index.json");
+      const indexPath = join4(this.schemaRoot, "index.json");
       const indexFile = Bun.file(indexPath);
       if (await indexFile.exists()) {
         const indexContent = await indexFile.text();
         this.index = JSON.parse(indexContent);
       }
-      const hotPath = join3(this.schemaRoot, "hot-schemas.json");
+      const hotPath = join4(this.schemaRoot, "hot-schemas.json");
       const hotFile = Bun.file(hotPath);
       if (await hotFile.exists()) {
         const hotContent = await hotFile.text();
@@ -7371,7 +7377,7 @@ class SchemaCacheManager {
       return null;
     }
     try {
-      const filePath = join3(this.schemaRoot, tableInfo.file);
+      const filePath = join4(this.schemaRoot, tableInfo.file);
       const file = Bun.file(filePath);
       if (!await file.exists()) {
         console.error(`Cold table file not found: ${tableInfo.file} for table ${tableName}`);
@@ -7426,12 +7432,12 @@ var init_schema_cache = __esm(() => {
 });
 
 // src/core/schema-index.ts
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 
 class SchemaIndexBuilder {
   static async loadIndex(dbcliPath, connectionName) {
     try {
-      const indexPath = join4(resolveSchemaPath(dbcliPath, connectionName), "index.json");
+      const indexPath = join5(resolveSchemaPath(dbcliPath, connectionName), "index.json");
       const file = Bun.file(indexPath);
       if (!await file.exists()) {
         return null;
@@ -7478,7 +7484,7 @@ class SchemaIndexBuilder {
     try {
       const schemasDir = resolveSchemaPath(dbcliPath, connectionName);
       await this.ensureDir(schemasDir);
-      const indexPath = join4(schemasDir, "index.json");
+      const indexPath = join5(schemasDir, "index.json");
       const indexFile = Bun.file(indexPath);
       await indexFile.write(JSON.stringify(index, null, 2));
     } catch (error) {
@@ -7524,7 +7530,7 @@ var exports_schema_loader = {};
 __export(exports_schema_loader, {
   SchemaLayeredLoader: () => SchemaLayeredLoader2
 });
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 class SchemaLayeredLoader2 {
   dbcliPath;
@@ -7591,7 +7597,7 @@ class SchemaLayeredLoader2 {
   }
   async ensureDirectories() {
     const base = resolveSchemaPath(this.dbcliPath, this.connectionName);
-    const dirs = [base, join5(base, "cold")];
+    const dirs = [base, join6(base, "cold")];
     for (const dir of dirs) {
       try {
         const dirFile = Bun.file(dir);
@@ -10287,13 +10293,13 @@ var PromisePolyfill;
 var init_promise_polyfill = __esm(() => {
   PromisePolyfill = class PromisePolyfill extends Promise {
     static withResolver() {
-      let resolve;
+      let resolve2;
       let reject;
       const promise = new Promise((res, rej) => {
-        resolve = res;
+        resolve2 = res;
         reject = rej;
       });
-      return { promise, resolve, reject };
+      return { promise, resolve: resolve2, reject };
     }
   };
 });
@@ -10313,7 +10319,7 @@ function createPrompt(view) {
       output
     });
     const screen = new ScreenManager(rl);
-    const { promise, resolve, reject } = PromisePolyfill.withResolver();
+    const { promise, resolve: resolve2, reject } = PromisePolyfill.withResolver();
     const cancel = () => reject(new CancelPromptError);
     if (signal) {
       const abort = () => reject(new AbortPromptError({ cause: signal.reason }));
@@ -10337,7 +10343,7 @@ function createPrompt(view) {
       cycle(() => {
         try {
           const nextView = view(config, (value) => {
-            setImmediate(() => resolve(value));
+            setImmediate(() => resolve2(value));
           });
           const [content, bottomContent] = typeof nextView === "string" ? [nextView] : nextView;
           screen.render(content, bottomContent);
@@ -23694,7 +23700,7 @@ var require_dist = __commonJS((exports) => {
   function parse(stream, callback) {
     const parser = new parser_1.Parser;
     stream.on("data", (buffer) => parser.parse(buffer, callback));
-    return new Promise((resolve) => stream.on("end", () => resolve()));
+    return new Promise((resolve2) => stream.on("end", () => resolve2()));
   }
   exports.parse = parse;
 });
@@ -24373,12 +24379,12 @@ var require_client = __commonJS((exports, module) => {
         this._connect(callback);
         return;
       }
-      return new this._Promise((resolve, reject) => {
+      return new this._Promise((resolve2, reject) => {
         this._connect((error) => {
           if (error) {
             reject(error);
           } else {
-            resolve(this);
+            resolve2(this);
           }
         });
       });
@@ -24710,8 +24716,8 @@ var require_client = __commonJS((exports, module) => {
         readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
         query = new Query(config, values, callback);
         if (!query.callback) {
-          result = new this._Promise((resolve, reject) => {
-            query.callback = (err, res) => err ? reject(err) : resolve(res);
+          result = new this._Promise((resolve2, reject) => {
+            query.callback = (err, res) => err ? reject(err) : resolve2(res);
           }).catch((err) => {
             Error.captureStackTrace(err);
             throw err;
@@ -24786,8 +24792,8 @@ var require_client = __commonJS((exports, module) => {
       if (cb) {
         this.connection.once("end", cb);
       } else {
-        return new this._Promise((resolve) => {
-          this.connection.once("end", resolve);
+        return new this._Promise((resolve2) => {
+          this.connection.once("end", resolve2);
         });
       }
     }
@@ -24834,8 +24840,8 @@ var require_pg_pool = __commonJS((exports, module) => {
     const cb = function(err, client) {
       err ? rej(err) : res(client);
     };
-    const result = new Promise2(function(resolve, reject) {
-      res = resolve;
+    const result = new Promise2(function(resolve2, reject) {
+      res = resolve2;
       rej = reject;
     }).catch((err) => {
       Error.captureStackTrace(err);
@@ -24896,7 +24902,7 @@ var require_pg_pool = __commonJS((exports, module) => {
       if (typeof Promise2.try === "function") {
         return Promise2.try(f);
       }
-      return new Promise2((resolve) => resolve(f()));
+      return new Promise2((resolve2) => resolve2(f()));
     }
     _isFull() {
       return this._clients.length >= this.options.max;
@@ -25272,8 +25278,8 @@ var require_query2 = __commonJS((exports, module) => {
   NativeQuery.prototype._getPromise = function() {
     if (this._promise)
       return this._promise;
-    this._promise = new Promise(function(resolve, reject) {
-      this._once("end", resolve);
+    this._promise = new Promise(function(resolve2, reject) {
+      this._once("end", resolve2);
       this._once("error", reject);
     }.bind(this));
     return this._promise;
@@ -25447,12 +25453,12 @@ var require_client2 = __commonJS((exports, module) => {
       this._connect(callback);
       return;
     }
-    return new this._Promise((resolve, reject) => {
+    return new this._Promise((resolve2, reject) => {
       this._connect((error) => {
         if (error) {
           reject(error);
         } else {
-          resolve(this);
+          resolve2(this);
         }
       });
     });
@@ -25476,8 +25482,8 @@ var require_client2 = __commonJS((exports, module) => {
       query = new NativeQuery(config, values, callback);
       if (!query.callback) {
         let resolveOut, rejectOut;
-        result = new this._Promise((resolve, reject) => {
-          resolveOut = resolve;
+        result = new this._Promise((resolve2, reject) => {
+          resolveOut = resolve2;
           rejectOut = reject;
         }).catch((err) => {
           Error.captureStackTrace(err);
@@ -25535,8 +25541,8 @@ var require_client2 = __commonJS((exports, module) => {
     }
     let result;
     if (!cb) {
-      result = new this._Promise(function(resolve, reject) {
-        cb = (err) => err ? reject(err) : resolve();
+      result = new this._Promise(function(resolve2, reject) {
+        cb = (err) => err ? reject(err) : resolve2();
       });
     }
     this.native.end(function() {
@@ -44473,7 +44479,7 @@ var require_named_placeholders = __commonJS((exports, module) => {
       }
       return s;
     }
-    function join7(tree) {
+    function join8(tree) {
       if (tree.length === 1) {
         return tree;
       }
@@ -44499,7 +44505,7 @@ var require_named_placeholders = __commonJS((exports, module) => {
       if (cache && (tree = cache.get(query))) {
         return toArrayParams(tree, paramsObj);
       }
-      tree = join7(parse(query));
+      tree = join8(parse(query));
       if (cache) {
         cache.set(query, tree);
       }
@@ -44650,11 +44656,11 @@ var require_connection2 = __commonJS((exports, module) => {
         this.addCommand(handshakeCommand);
         if (shouldTrace(connectChannel)) {
           const config = this.config;
-          tracePromise(connectChannel, () => new Promise((resolve, reject) => {
+          tracePromise(connectChannel, () => new Promise((resolve2, reject) => {
             let onConnect, onError;
             onConnect = (param) => {
               this.removeListener("error", onError);
-              resolve(param);
+              resolve2(param);
             };
             onError = (err) => {
               this.removeListener("connect", onConnect);
@@ -45017,9 +45023,9 @@ var require_connection2 = __commonJS((exports, module) => {
           };
         }, null, cmdQuery.onResult);
       } else if (shouldTrace(queryChannel)) {
-        tracePromise(queryChannel, () => new Promise((resolve, reject) => {
+        tracePromise(queryChannel, () => new Promise((resolve2, reject) => {
           cmdQuery.once("error", reject);
-          cmdQuery.once("end", () => resolve());
+          cmdQuery.once("end", () => resolve2());
           this.addCommand(cmdQuery);
         }), () => {
           const server = getServerContext(this.config);
@@ -45145,12 +45151,12 @@ var require_connection2 = __commonJS((exports, module) => {
           };
         }, null, origExecCb);
       } else if (shouldTrace(executeChannel)) {
-        tracePromise(executeChannel, () => new Promise((resolve, reject) => {
+        tracePromise(executeChannel, () => new Promise((resolve2, reject) => {
           prepareAndExecute((err) => {
             executeCommand.emit("error", err);
           });
           executeCommand.once("error", reject);
-          executeCommand.once("end", () => resolve());
+          executeCommand.once("end", () => resolve2());
         }), () => {
           const server = getServerContext(this.config);
           return {
@@ -45367,7 +45373,7 @@ var require_connection2 = __commonJS((exports, module) => {
 
 // node_modules/mysql2/lib/promise/make_done_cb.js
 var require_make_done_cb = __commonJS((exports, module) => {
-  function makeDoneCb(resolve, reject, localErr) {
+  function makeDoneCb(resolve2, reject, localErr) {
     return function(err, rows, fields) {
       if (err) {
         localErr.message = err.message;
@@ -45378,7 +45384,7 @@ var require_make_done_cb = __commonJS((exports, module) => {
         localErr.sqlMessage = err.sqlMessage;
         reject(localErr);
       } else {
-        resolve([rows, fields]);
+        resolve2([rows, fields]);
       }
     };
   }
@@ -45397,8 +45403,8 @@ var require_prepared_statement_info = __commonJS((exports, module) => {
     execute(parameters) {
       const s = this.statement;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         if (parameters) {
           s.execute(parameters, done);
         } else {
@@ -45407,9 +45413,9 @@ var require_prepared_statement_info = __commonJS((exports, module) => {
       });
     }
     close() {
-      return new this.Promise((resolve) => {
+      return new this.Promise((resolve2) => {
         this.statement.close();
-        resolve();
+        resolve2();
       });
     }
   }
@@ -45468,8 +45474,8 @@ var require_connection3 = __commonJS((exports, module) => {
       if (typeof params === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         if (params !== undefined) {
           c.query(query, params, done);
         } else {
@@ -45483,8 +45489,8 @@ var require_connection3 = __commonJS((exports, module) => {
       if (typeof params === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         if (params !== undefined) {
           c.execute(query, params, done);
         } else {
@@ -45493,8 +45499,8 @@ var require_connection3 = __commonJS((exports, module) => {
       });
     }
     end() {
-      return new this.Promise((resolve) => {
-        this.connection.end(resolve);
+      return new this.Promise((resolve2) => {
+        this.connection.end(resolve2);
       });
     }
     async[Symbol.asyncDispose]() {
@@ -45505,31 +45511,31 @@ var require_connection3 = __commonJS((exports, module) => {
     beginTransaction() {
       const c = this.connection;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         c.beginTransaction(done);
       });
     }
     commit() {
       const c = this.connection;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         c.commit(done);
       });
     }
     rollback() {
       const c = this.connection;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         c.rollback(done);
       });
     }
     ping() {
       const c = this.connection;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         c.ping((err) => {
           if (err) {
             localErr.message = err.message;
@@ -45539,7 +45545,7 @@ var require_connection3 = __commonJS((exports, module) => {
             localErr.sqlMessage = err.sqlMessage;
             reject(localErr);
           } else {
-            resolve(true);
+            resolve2(true);
           }
         });
       });
@@ -45547,7 +45553,7 @@ var require_connection3 = __commonJS((exports, module) => {
     connect() {
       const c = this.connection;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         c.connect((err, param) => {
           if (err) {
             localErr.message = err.message;
@@ -45557,7 +45563,7 @@ var require_connection3 = __commonJS((exports, module) => {
             localErr.sqlMessage = err.sqlMessage;
             reject(localErr);
           } else {
-            resolve(param);
+            resolve2(param);
           }
         });
       });
@@ -45566,7 +45572,7 @@ var require_connection3 = __commonJS((exports, module) => {
       const c = this.connection;
       const promiseImpl = this.Promise;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         c.prepare(options, (err, statement) => {
           if (err) {
             localErr.message = err.message;
@@ -45577,7 +45583,7 @@ var require_connection3 = __commonJS((exports, module) => {
             reject(localErr);
           } else {
             const wrappedStatement = new PromisePreparedStatementInfo(statement, promiseImpl);
-            resolve(wrappedStatement);
+            resolve2(wrappedStatement);
           }
         });
       });
@@ -45585,7 +45591,7 @@ var require_connection3 = __commonJS((exports, module) => {
     changeUser(options) {
       const c = this.connection;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         c.changeUser(options, (err) => {
           if (err) {
             localErr.message = err.message;
@@ -45595,7 +45601,7 @@ var require_connection3 = __commonJS((exports, module) => {
             localErr.sqlMessage = err.sqlMessage;
             reject(localErr);
           } else {
-            resolve();
+            resolve2();
           }
         });
       });
@@ -45997,12 +46003,12 @@ var require_pool2 = __commonJS((exports, module) => {
     }
     getConnection() {
       const corePool = this.pool;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         corePool.getConnection((err, coreConnection) => {
           if (err) {
             reject(err);
           } else {
-            resolve(new PromisePoolConnection(coreConnection, this.Promise));
+            resolve2(new PromisePoolConnection(coreConnection, this.Promise));
           }
         });
       });
@@ -46017,8 +46023,8 @@ var require_pool2 = __commonJS((exports, module) => {
       if (typeof args === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         if (args !== undefined) {
           corePool.query(sql, args, done);
         } else {
@@ -46032,8 +46038,8 @@ var require_pool2 = __commonJS((exports, module) => {
       if (typeof args === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         if (args) {
           corePool.execute(sql, args, done);
         } else {
@@ -46044,7 +46050,7 @@ var require_pool2 = __commonJS((exports, module) => {
     end() {
       const corePool = this.pool;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         corePool.end((err) => {
           if (err) {
             localErr.message = err.message;
@@ -46054,7 +46060,7 @@ var require_pool2 = __commonJS((exports, module) => {
             localErr.sqlMessage = err.sqlMessage;
             reject(localErr);
           } else {
-            resolve();
+            resolve2();
           }
         });
       });
@@ -46452,12 +46458,12 @@ var require_pool_cluster2 = __commonJS((exports, module) => {
     }
     getConnection() {
       const corePoolNamespace = this.poolNamespace;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         corePoolNamespace.getConnection((err, coreConnection) => {
           if (err) {
             reject(err);
           } else {
-            resolve(new PromisePoolConnection(coreConnection, this.Promise));
+            resolve2(new PromisePoolConnection(coreConnection, this.Promise));
           }
         });
       });
@@ -46468,8 +46474,8 @@ var require_pool_cluster2 = __commonJS((exports, module) => {
       if (typeof values === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         corePoolNamespace.query(sql, values, done);
       });
     }
@@ -46479,8 +46485,8 @@ var require_pool_cluster2 = __commonJS((exports, module) => {
       if (typeof values === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         corePoolNamespace.execute(sql, values, done);
       });
     }
@@ -46510,9 +46516,9 @@ var require_promise = __commonJS((exports) => {
     if (!thePromise) {
       throw new Error("no Promise implementation available." + "Use promise-enabled node version or pass userland Promise" + " implementation as parameter, for example: { Promise: require('bluebird') }");
     }
-    return new thePromise((resolve, reject) => {
+    return new thePromise((resolve2, reject) => {
       coreConnection.once("connect", () => {
-        resolve(new PromiseConnection(coreConnection, thePromise));
+        resolve2(new PromiseConnection(coreConnection, thePromise));
       });
       coreConnection.once("error", (err) => {
         createConnectionErr.message = err.message;
@@ -46541,12 +46547,12 @@ var require_promise = __commonJS((exports) => {
     }
     getConnection(pattern, selector) {
       const corePoolCluster = this.poolCluster;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         corePoolCluster.getConnection(pattern, selector, (err, coreConnection) => {
           if (err) {
             reject(err);
           } else {
-            resolve(new PromisePoolConnection(coreConnection, this.Promise));
+            resolve2(new PromisePoolConnection(coreConnection, this.Promise));
           }
         });
       });
@@ -46557,8 +46563,8 @@ var require_promise = __commonJS((exports) => {
       if (typeof args === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         corePoolCluster.query(sql, args, done);
       });
     }
@@ -46568,8 +46574,8 @@ var require_promise = __commonJS((exports) => {
       if (typeof args === "function") {
         throw new Error("Callback function is not available with promise clients.");
       }
-      return new this.Promise((resolve, reject) => {
-        const done = makeDoneCb(resolve, reject, localErr);
+      return new this.Promise((resolve2, reject) => {
+        const done = makeDoneCb(resolve2, reject, localErr);
         corePoolCluster.execute(sql, args, done);
       });
     }
@@ -46579,7 +46585,7 @@ var require_promise = __commonJS((exports) => {
     end() {
       const corePoolCluster = this.poolCluster;
       const localErr = new Error;
-      return new this.Promise((resolve, reject) => {
+      return new this.Promise((resolve2, reject) => {
         corePoolCluster.end((err) => {
           if (err) {
             localErr.message = err.message;
@@ -46589,7 +46595,7 @@ var require_promise = __commonJS((exports) => {
             localErr.sqlMessage = err.sqlMessage;
             reject(localErr);
           } else {
-            resolve();
+            resolve2();
           }
         });
       });
@@ -53612,7 +53618,7 @@ var require_utils3 = __commonJS((exports) => {
     }
   }
   function get(url, options = {}) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       let timeoutId;
       const request = http.get(url, options, (response) => {
         response.setEncoding("utf8");
@@ -53620,7 +53626,7 @@ var require_utils3 = __commonJS((exports) => {
         response.on("data", (chunk) => body += chunk);
         response.on("end", () => {
           (0, timers_1.clearTimeout)(timeoutId);
-          resolve({ status: response.statusCode, body });
+          resolve2({ status: response.statusCode, body });
         });
       }).on("error", (error) => {
         (0, timers_1.clearTimeout)(timeoutId);
@@ -53639,13 +53645,13 @@ var require_utils3 = __commonJS((exports) => {
     return host && match.test(host.toLowerCase()) ? true : false;
   }
   function promiseWithResolvers() {
-    let resolve;
+    let resolve2;
     let reject;
     const promise = new Promise(function withResolversExecutor(promiseResolve, promiseReject) {
-      resolve = promiseResolve;
+      resolve2 = promiseResolve;
       reject = promiseReject;
     });
-    return { promise, resolve, reject };
+    return { promise, resolve: resolve2, reject };
   }
   function squashError(_error) {
     return;
@@ -53656,8 +53662,8 @@ var require_utils3 = __commonJS((exports) => {
   exports.randomBytes = randomBytes;
   async function once(ee, name, options) {
     options?.signal?.throwIfAborted();
-    const { promise, resolve, reject } = promiseWithResolvers();
-    const onEvent = (data) => resolve(data);
+    const { promise, resolve: resolve2, reject } = promiseWithResolvers();
+    const onEvent = (data) => resolve2(data);
     const onError = (error) => reject(error);
     const abortListener = addAbortListener(options?.signal, function() {
       reject(this.reason);
@@ -55980,13 +55986,13 @@ var require_mongo_logger = __commonJS((exports) => {
   function createStdioLogger(stream) {
     return {
       write: (log) => {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve2, reject) => {
           const logLine = (0, util_1.inspect)(log, { compact: true, breakLength: Infinity });
           stream.write(`${logLine}
 `, "utf-8", (error) => {
             if (error)
               return reject(error);
-            resolve(true);
+            resolve2(true);
           });
         });
       }
@@ -63644,7 +63650,7 @@ var require_URLSearchParams = __commonJS((exports) => {
     }
     const ctorRegistry = utils.initCtorRegistry(globalObject);
 
-    class URLSearchParams {
+    class URLSearchParams2 {
       constructor() {
         const args = [];
         {
@@ -63923,7 +63929,7 @@ var require_URLSearchParams = __commonJS((exports) => {
         return esValue[implSymbol]["size"];
       }
     }
-    Object.defineProperties(URLSearchParams.prototype, {
+    Object.defineProperties(URLSearchParams2.prototype, {
       append: { enumerable: true },
       delete: { enumerable: true },
       get: { enumerable: true },
@@ -63938,9 +63944,9 @@ var require_URLSearchParams = __commonJS((exports) => {
       forEach: { enumerable: true },
       size: { enumerable: true },
       [Symbol.toStringTag]: { value: "URLSearchParams", configurable: true },
-      [Symbol.iterator]: { value: URLSearchParams.prototype.entries, configurable: true, writable: true }
+      [Symbol.iterator]: { value: URLSearchParams2.prototype.entries, configurable: true, writable: true }
     });
-    ctorRegistry[interfaceName] = URLSearchParams;
+    ctorRegistry[interfaceName] = URLSearchParams2;
     ctorRegistry["URLSearchParams Iterator"] = Object.create(ctorRegistry["%IteratorPrototype%"], {
       [Symbol.toStringTag]: {
         configurable: true,
@@ -63967,7 +63973,7 @@ var require_URLSearchParams = __commonJS((exports) => {
     Object.defineProperty(globalObject, interfaceName, {
       configurable: true,
       writable: true,
-      value: URLSearchParams
+      value: URLSearchParams2
     });
   };
   var Impl = require_URLSearchParams_impl();
@@ -63977,7 +63983,7 @@ var require_URLSearchParams = __commonJS((exports) => {
 var require_URL_impl = __commonJS((exports) => {
   var usm = require_url_state_machine();
   var urlencoded = require_urlencoded();
-  var URLSearchParams = require_URLSearchParams();
+  var URLSearchParams2 = require_URLSearchParams();
   exports.implementation = class URLImpl {
     constructor(globalObject, [url, base]) {
       let parsedBase = null;
@@ -63993,7 +63999,7 @@ var require_URL_impl = __commonJS((exports) => {
       }
       const query = parsedURL.query !== null ? parsedURL.query : "";
       this._url = parsedURL;
-      this._query = URLSearchParams.createImpl(globalObject, [query], { doNotStripQMark: true });
+      this._query = URLSearchParams2.createImpl(globalObject, [query], { doNotStripQMark: true });
       this._query._url = this;
     }
     static parse(globalObject, input, base) {
@@ -64551,19 +64557,19 @@ var require_URL = __commonJS((exports) => {
 // node_modules/whatwg-url/webidl2js-wrapper.js
 var require_webidl2js_wrapper = __commonJS((exports) => {
   var URL2 = require_URL();
-  var URLSearchParams = require_URLSearchParams();
+  var URLSearchParams2 = require_URLSearchParams();
   exports.URL = URL2;
-  exports.URLSearchParams = URLSearchParams;
+  exports.URLSearchParams = URLSearchParams2;
 });
 
 // node_modules/whatwg-url/index.js
 var require_whatwg_url = __commonJS((exports) => {
-  var { URL: URL2, URLSearchParams } = require_webidl2js_wrapper();
+  var { URL: URL2, URLSearchParams: URLSearchParams2 } = require_webidl2js_wrapper();
   var urlStateMachine = require_url_state_machine();
   var percentEncoding = require_percent_encoding();
   var sharedGlobalObject = { Array, Object, Promise, String, TypeError };
   URL2.install(sharedGlobalObject, ["Window"]);
-  URLSearchParams.install(sharedGlobalObject, ["Window"]);
+  URLSearchParams2.install(sharedGlobalObject, ["Window"]);
   exports.URL = sharedGlobalObject.URL;
   exports.URLSearchParams = sharedGlobalObject.URLSearchParams;
   exports.parseURL = urlStateMachine.parseURL;
@@ -65372,20 +65378,20 @@ var require_compression = __commonJS((exports) => {
   ]);
   var ZSTD_COMPRESSION_LEVEL = 3;
   var zlibInflate = (buf) => {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       zlib.inflate(buf, (error, result) => {
         if (error)
           return reject(error);
-        resolve(result);
+        resolve2(result);
       });
     });
   };
   var zlibDeflate = (buf, options) => {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       zlib.deflate(buf, options, (error, result) => {
         if (error)
           return reject(error);
-        resolve(result);
+        resolve2(result);
       });
     });
   };
@@ -66016,7 +66022,7 @@ var require_state_machine = __commonJS((exports) => {
         socket = tls.connect(socketOptions, () => {
           socket.write(message);
         });
-        const { promise: willResolveKmsRequest, reject: rejectOnTlsSocketError, resolve } = (0, utils_1.promiseWithResolvers)();
+        const { promise: willResolveKmsRequest, reject: rejectOnTlsSocketError, resolve: resolve2 } = (0, utils_1.promiseWithResolvers)();
         abortListener = (0, utils_1.addAbortListener)(options?.signal, function() {
           destroySockets();
           rejectOnTlsSocketError(this.reason);
@@ -66028,7 +66034,7 @@ var require_state_machine = __commonJS((exports) => {
             request.addResponse(buffer.read(bytesNeeded));
           }
           if (request.bytesNeeded <= 0) {
-            resolve();
+            resolve2();
           }
         });
         await (options?.timeoutContext?.csotEnabled() ? Promise.all([
@@ -67142,8 +67148,8 @@ var require_on_data = __commonJS((exports) => {
         }
         if (finished)
           return closeHandler();
-        const { promise, resolve, reject } = (0, utils_1.promiseWithResolvers)();
-        unconsumedPromises.push({ resolve, reject });
+        const { promise, resolve: resolve2, reject } = (0, utils_1.promiseWithResolvers)();
+        unconsumedPromises.push({ resolve: resolve2, reject });
         return promise;
       },
       return() {
@@ -68253,13 +68259,13 @@ var require_connect = __commonJS((exports) => {
     socket.setNoDelay(noDelay);
     socket.setTimeout(connectTimeoutMS);
     let cancellationHandler = null;
-    const { promise: connectedSocket, resolve, reject } = (0, utils_1.promiseWithResolvers)();
+    const { promise: connectedSocket, resolve: resolve2, reject } = (0, utils_1.promiseWithResolvers)();
     if (existingSocket) {
-      resolve(socket);
+      resolve2(socket);
     } else {
       const start = performance.now();
       const connectEvent = useTLS ? "secureConnect" : "connect";
-      socket.once(connectEvent, () => resolve(socket)).once("error", (cause) => reject(new error_1.MongoNetworkError(error_1.MongoError.buildErrorMessage(cause), { cause }))).once("timeout", () => {
+      socket.once(connectEvent, () => resolve2(socket)).once("error", (cause) => reject(new error_1.MongoNetworkError(error_1.MongoError.buildErrorMessage(cause), { cause }))).once("timeout", () => {
         reject(new error_1.MongoNetworkTimeoutError(`Socket '${connectEvent}' timed out after ${performance.now() - start | 0}ms (connectTimeoutMS: ${connectTimeoutMS})`));
       }).once("close", () => reject(new error_1.MongoNetworkError(`Socket closed after ${performance.now() - start | 0} during connection establishment`)));
       if (options.cancellationToken != null) {
@@ -68734,10 +68740,10 @@ var require_connection_pool = __commonJS((exports) => {
     async checkOut(options) {
       const checkoutTime = (0, utils_1.processTimeMS)();
       this.emitAndLog(ConnectionPool.CONNECTION_CHECK_OUT_STARTED, new connection_pool_events_1.ConnectionCheckOutStartedEvent(this));
-      const { promise, resolve, reject } = (0, utils_1.promiseWithResolvers)();
+      const { promise, resolve: resolve2, reject } = (0, utils_1.promiseWithResolvers)();
       const timeout = options.timeoutContext.connectionCheckoutTimeout;
       const waitQueueMember = {
-        resolve,
+        resolve: resolve2,
         reject,
         cancelled: false,
         checkoutTime
@@ -69882,13 +69888,13 @@ var require_connection_string = __commonJS((exports) => {
   var LB_REPLICA_SET_ERROR = "loadBalanced option not supported with a replicaSet option";
   var LB_DIRECT_CONNECTION_ERROR = "loadBalanced option not supported when directConnection is provided";
   function retryDNSTimeoutFor(rrtype) {
-    const resolve = rrtype === "SRV" ? (address) => dns.promises.resolve(address, "SRV") : (address) => dns.promises.resolve(address, "TXT");
+    const resolve2 = rrtype === "SRV" ? (address) => dns.promises.resolve(address, "SRV") : (address) => dns.promises.resolve(address, "TXT");
     return async function dnsReqRetryTimeout(lookupAddress) {
       try {
-        return await resolve(lookupAddress);
+        return await resolve2(lookupAddress);
       } catch (firstDNSError) {
         if (firstDNSError.code === dns.TIMEOUT) {
-          return await resolve(lookupAddress);
+          return await resolve2(lookupAddress);
         } else {
           throw firstDNSError;
         }
@@ -73356,13 +73362,13 @@ var require_topology = __commonJS((exports) => {
         }
         return transaction.server;
       }
-      const { promise: serverPromise, resolve, reject } = (0, utils_1.promiseWithResolvers)();
+      const { promise: serverPromise, resolve: resolve2, reject } = (0, utils_1.promiseWithResolvers)();
       const waitQueueMember = {
         serverSelector,
         topologyDescription: this.description,
         mongoLogger: this.client.mongoLogger,
         transaction,
-        resolve,
+        resolve: resolve2,
         reject,
         cancelled: false,
         startTime: (0, utils_1.processTimeMS)(),
@@ -77140,7 +77146,7 @@ var {
 // package.json
 var package_default = {
   name: "@carllee1983/dbcli",
-  version: "1.5.0",
+  version: "1.6.0",
   description: "Database CLI for AI agents",
   type: "module",
   publishConfig: {
@@ -77244,24 +77250,24 @@ var messages_default = {
     skip_test: "Skipping connection test (--skip-test)",
     connection_hints: "Hints:",
     config_exists_use_force: ".dbcli exists. Use --force option to overwrite.",
-    connection_added: "Connection '{{name}}' added",
-    connection_removed: "Connection '{{name}}' removed",
-    connection_removed_switched: "Connection '{{name}}' removed. Default connection switched to '{{newDefault}}'",
-    connection_renamed: "Connection '{{oldName}}' renamed to '{{newName}}'",
+    connection_added: "Connection '{name}' added",
+    connection_removed: "Connection '{name}' removed",
+    connection_removed_switched: "Connection '{name}' removed. Default connection switched to '{newDefault}'",
+    connection_renamed: "Connection '{oldName}' renamed to '{newName}'",
     v1_migration_prompt: "Detected old config format. Create new format and import existing connection as 'default'?",
     config_saved_v2: "V2 configuration saved to .dbcli",
     config_not_found: "Configuration file not found",
     requires_v2_remove: "Removing a connection requires V2 config format",
     requires_v2_rename: "Renaming a connection requires V2 config format",
-    connection_not_found: "Connection '{{name}}' does not exist",
+    connection_not_found: "Connection '{name}' does not exist",
     cannot_remove_last: "Cannot remove the last connection",
-    connection_already_exists: "Connection '{{name}}' already exists",
+    connection_already_exists: "Connection '{name}' already exists",
     rename_invalid_format: "Usage: --rename <old-name>:<new-name>"
   },
   use: {
     description: "Switch or display the default database connection",
-    switched: "Switched default connection to {{name}}",
-    current: "Current default connection: {{name}}",
+    switched: "Switched default connection to {name}",
+    current: "Current default connection: {name}",
     requires_v2: "This feature requires v2 config format. Use 'dbcli init --conn-name <name>' to create one",
     available: "Available connections"
   },
@@ -77361,7 +77367,8 @@ Hint: run 'export {envKey}=<value>' and retry`
   },
   skill: {
     description: "Generate AI skill documentation",
-    installed: "Skill installed to {path}",
+    installed: `Skill: {path}
+Reference: {referencePath}`,
     update_available: "Skill updates available for the following platforms:",
     update_hint: 'Run "dbcli skill --install <platform>" to update.'
   },
@@ -77434,24 +77441,24 @@ var messages_default2 = {
     skip_test: "\u8DF3\u904E\u9023\u7DDA\u6E2C\u8A66\uFF08--skip-test\uFF09",
     connection_hints: "\u63D0\u793A\uFF1A",
     config_exists_use_force: ".dbcli \u5DF2\u5B58\u5728\u3002\u4F7F\u7528 --force \u9078\u9805\u8986\u84CB\u3002",
-    connection_added: "\u5DF2\u65B0\u589E\u9023\u7DDA '{{name}}'",
-    connection_removed: "\u5DF2\u79FB\u9664\u9023\u7DDA '{{name}}'",
-    connection_removed_switched: "\u5DF2\u79FB\u9664\u9023\u7DDA '{{name}}'\uFF0C\u9810\u8A2D\u9023\u7DDA\u5DF2\u5207\u63DB\u70BA '{{newDefault}}'",
-    connection_renamed: "\u5DF2\u5C07\u9023\u7DDA '{{oldName}}' \u91CD\u65B0\u547D\u540D\u70BA '{{newName}}'",
+    connection_added: "\u5DF2\u65B0\u589E\u9023\u7DDA '{name}'",
+    connection_removed: "\u5DF2\u79FB\u9664\u9023\u7DDA '{name}'",
+    connection_removed_switched: "\u5DF2\u79FB\u9664\u9023\u7DDA '{name}'\uFF0C\u9810\u8A2D\u9023\u7DDA\u5DF2\u5207\u63DB\u70BA '{newDefault}'",
+    connection_renamed: "\u5DF2\u5C07\u9023\u7DDA '{oldName}' \u91CD\u65B0\u547D\u540D\u70BA '{newName}'",
     v1_migration_prompt: "\u5075\u6E2C\u5230\u820A\u683C\u5F0F\u8A2D\u5B9A\uFF0C\u5C07\u5EFA\u7ACB\u65B0\u683C\u5F0F\u4E26\u5C07\u73FE\u6709\u9023\u7DDA\u532F\u5165\u70BA 'default'\uFF0C\u662F\u5426\u7E7C\u7E8C\uFF1F",
     config_saved_v2: "V2 \u8A2D\u5B9A\u5DF2\u5132\u5B58\u81F3 .dbcli",
     config_not_found: "\u627E\u4E0D\u5230\u8A2D\u5B9A\u6A94",
     requires_v2_remove: "\u79FB\u9664\u9023\u7DDA\u9700\u8981 V2 \u683C\u5F0F\u8A2D\u5B9A",
     requires_v2_rename: "\u91CD\u65B0\u547D\u540D\u9023\u7DDA\u9700\u8981 V2 \u683C\u5F0F\u8A2D\u5B9A",
-    connection_not_found: "\u9023\u7DDA '{{name}}' \u4E0D\u5B58\u5728",
+    connection_not_found: "\u9023\u7DDA '{name}' \u4E0D\u5B58\u5728",
     cannot_remove_last: "\u7121\u6CD5\u79FB\u9664\u6700\u5F8C\u4E00\u500B\u9023\u7DDA",
-    connection_already_exists: "\u9023\u7DDA '{{name}}' \u5DF2\u5B58\u5728",
+    connection_already_exists: "\u9023\u7DDA '{name}' \u5DF2\u5B58\u5728",
     rename_invalid_format: "\u7528\u6CD5\uFF1A--rename <\u820A\u540D\u7A31>:<\u65B0\u540D\u7A31>"
   },
   use: {
     description: "\u5207\u63DB\u6216\u986F\u793A\u9810\u8A2D\u8CC7\u6599\u5EAB\u9023\u7DDA",
-    switched: "\u5DF2\u5207\u63DB\u9810\u8A2D\u9023\u7DDA\u70BA {{name}}",
-    current: "\u76EE\u524D\u9810\u8A2D\u9023\u7DDA\uFF1A{{name}}",
+    switched: "\u5DF2\u5207\u63DB\u9810\u8A2D\u9023\u7DDA\u70BA {name}",
+    current: "\u76EE\u524D\u7684\u9810\u8A2D\u9023\u7DDA\uFF1A{name}",
     requires_v2: "\u6B64\u529F\u80FD\u9700\u8981\u65B0\u683C\u5F0F\u8A2D\u5B9A\u3002\u8ACB\u4F7F\u7528 dbcli init --conn-name <\u540D\u7A31> \u5EFA\u7ACB\u591A\u9023\u7DDA\u8A2D\u5B9A",
     available: "\u53EF\u7528\u9023\u7DDA"
   },
@@ -77551,7 +77558,8 @@ var messages_default2 = {
   },
   skill: {
     description: "\u751F\u6210 AI \u6280\u80FD\u6587\u6A94",
-    installed: "\u6280\u80FD\u5DF2\u5B89\u88DD\u81F3 {path}",
+    installed: `\u6280\u80FD: {path}
+\u53C3\u8003: {referencePath}`,
     update_available: "\u4EE5\u4E0B\u5E73\u53F0\u7684\u6280\u80FD\u9700\u8981\u66F4\u65B0\uFF1A",
     update_hint: '\u57F7\u884C "dbcli skill --install <platform>" \u9032\u884C\u66F4\u65B0\u3002'
   },
@@ -77757,7 +77765,7 @@ function getLogger() {
 }
 
 // src/commands/init.ts
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/utils/errors.ts
 class EnvParseError extends Error {
@@ -77823,7 +77831,11 @@ function parseConnectionUrl(url) {
       throw new Error(`Unsupported protocol: ${protocol}`);
     }
     const host = parsed.hostname || "localhost";
-    const port = parsed.port !== "" ? parseInt(parsed.port, 10) : getDefaultsForSystem(system).port || 5432;
+    const defaultPort = (() => {
+      const p = getDefaultsForSystem(system).port;
+      return typeof p === "number" ? p : 5432;
+    })();
+    const port = parsed.port !== "" ? parseInt(parsed.port, 10) : defaultPort;
     const user = decodeURIComponent(parsed.username || "");
     const password = decodeURIComponent(parsed.password || "");
     const database = parsed.pathname.slice(1);
@@ -77847,13 +77859,14 @@ function parseEnvDatabase(env) {
       throw new EnvParseError("DB_NAME or DB_DATABASE is required when using component format");
     }
     const defaults = getDefaultsForSystem(system);
-    const port = env.DB_PORT ? parseInt(env.DB_PORT, 10) : defaults.port || 5432;
+    const defaultPort = typeof defaults.port === "number" ? defaults.port : 5432;
+    const port = env.DB_PORT ? parseInt(env.DB_PORT, 10) : defaultPort;
     if (isNaN(port) || port < 1 || port > 65535) {
       throw new EnvParseError(`DB_PORT must be between 1 and 65535, got: ${env.DB_PORT}`);
     }
     return {
       system,
-      host: env.DB_HOST || defaults.host || "localhost",
+      host: env.DB_HOST || (typeof defaults.host === "string" ? defaults.host : "localhost"),
       port,
       user,
       password: env.DB_PASSWORD || "",
@@ -77904,8 +77917,72 @@ async function loadEnvFile(filePath) {
   }
 }
 
+// src/core/config-binding.ts
+import { createHash } from "crypto";
+import { homedir } from "os";
+import { basename, join, resolve } from "path";
+var BINDING_FILE_NAME = "config.json";
+var DBCLI_HOME_ROOT = join(homedir(), ".config", "dbcli");
+function isProjectConfigBinding(raw) {
+  if (typeof raw !== "object" || raw === null)
+    return false;
+  const candidate = raw;
+  return candidate.version === 3 && typeof candidate.binding === "object" && candidate.binding !== null && candidate.binding.type === "home-storage" && typeof candidate.binding.storagePath === "string" && candidate.binding.storagePath.length > 0 && typeof candidate.binding.projectPath === "string" && candidate.binding.projectPath.length > 0 && typeof candidate.binding.createdAt === "string" && candidate.binding.createdAt.length > 0;
+}
+function getDbcliHomeRoot() {
+  return DBCLI_HOME_ROOT;
+}
+function getProjectStoragePath(projectPath) {
+  const normalizedProjectPath = resolve(projectPath);
+  const projectName = basename(normalizedProjectPath) || "project";
+  const hash = createHash("sha1").update(normalizedProjectPath).digest("hex").slice(0, 12);
+  return join(getDbcliHomeRoot(), "projects", `${projectName}-${hash}`);
+}
+async function readProjectBinding(projectPath) {
+  const configFile = Bun.file(join(projectPath, BINDING_FILE_NAME));
+  if (!await configFile.exists())
+    return null;
+  try {
+    const raw = JSON.parse(await configFile.text());
+    return isProjectConfigBinding(raw) ? raw : null;
+  } catch {
+    return null;
+  }
+}
+async function resolveConfigStoragePath(path) {
+  const binding = await readProjectBinding(path);
+  return binding?.binding.storagePath ?? path;
+}
+async function writeProjectBinding(projectPath, storagePath = getProjectStoragePath(projectPath)) {
+  const binding = {
+    version: 3,
+    binding: {
+      type: "home-storage",
+      storagePath,
+      projectPath: resolve(projectPath),
+      createdAt: new Date().toISOString()
+    }
+  };
+  await Bun.$`mkdir -p ${projectPath}`;
+  await Bun.$`mkdir -p ${storagePath}`;
+  await Bun.file(join(projectPath, BINDING_FILE_NAME)).write(JSON.stringify(binding, null, 2));
+  return binding;
+}
+async function migrateLegacyProjectEnvLocal(projectPath, storagePath = getProjectStoragePath(projectPath)) {
+  const projectEnvPath = join(projectPath, ".env.local");
+  const projectEnvFile = Bun.file(projectEnvPath);
+  if (!await projectEnvFile.exists())
+    return;
+  const storageEnvPath = join(storagePath, ".env.local");
+  await Bun.$`mkdir -p ${storagePath}`;
+  if (!await Bun.file(storageEnvPath).exists()) {
+    await Bun.file(storageEnvPath).write(await projectEnvFile.text());
+  }
+  await Bun.$`rm -f ${projectEnvPath}`;
+}
+
 // src/core/config-v2.ts
-import { join } from "path";
+import { join as join2 } from "path";
 function detectConfigVersion(raw) {
   if (typeof raw === "object" && raw !== null && "version" in raw && raw.version === 2 && "connections" in raw) {
     return 2;
@@ -77929,12 +78006,13 @@ function resolveConnection(config, name) {
 }
 async function loadConnectionEnv(resolved, basePath) {
   if (resolved.envFile) {
-    const envPath = join(basePath, "..", resolved.envFile);
+    const envPath = join2(basePath, resolved.envFile);
     await loadEnvFile(envPath);
   }
 }
 async function readV2Config(path) {
-  const configPath = join(path, "config.json");
+  const storagePath = await resolveConfigStoragePath(path);
+  const configPath = join2(storagePath, "config.json");
   const file = Bun.file(configPath);
   if (!await file.exists()) {
     throw new ConfigError(`\u627E\u4E0D\u5230 V2 \u8A2D\u5B9A\u6A94\uFF1A${configPath}`);
@@ -77945,12 +78023,15 @@ async function readV2Config(path) {
 }
 async function writeV2Config(path, config) {
   DbcliConfigV2Schema.parse(config);
-  const configPath = join(path, "config.json");
+  const storagePath = await resolveConfigStoragePath(path);
+  const configPath = join2(storagePath, "config.json");
+  await Bun.$`mkdir -p ${storagePath}`;
   const json = JSON.stringify(config, null, 2);
   await Bun.write(configPath, json);
 }
 async function patchConnectionSchema(dbcliPath, connectionName, schema, metadataUpdate) {
-  const v2Config = await readV2Config(dbcliPath);
+  const storagePath = await resolveConfigStoragePath(dbcliPath);
+  const v2Config = await readV2Config(storagePath);
   const updated = {
     ...v2Config,
     schemas: {
@@ -77962,11 +78043,11 @@ async function patchConnectionSchema(dbcliPath, connectionName, schema, metadata
       ...metadataUpdate ?? {}
     }
   };
-  await writeV2Config(dbcliPath, updated);
+  await writeV2Config(storagePath, updated);
 }
 
 // src/core/config.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 var _globalConnectionName;
 function setGlobalConnectionName(name) {
   _globalConnectionName = name;
@@ -77977,11 +78058,12 @@ function getGlobalConnectionName() {
 async function getSchemaIsolationConnectionName(dbcliPath) {
   const effectiveName = getGlobalConnectionName();
   try {
-    const stat = await Bun.file(dbcliPath).stat();
+    const storagePath = await resolveConfigStoragePath(dbcliPath);
+    const stat = await Bun.file(storagePath).stat();
     const isDirectory = stat?.isDirectory() ?? false;
     if (!isDirectory)
       return;
-    const configJsonPath = join6(dbcliPath, "config.json");
+    const configJsonPath = join7(storagePath, "config.json");
     const configFile = Bun.file(configJsonPath);
     if (!await configFile.exists())
       return;
@@ -78007,7 +78089,8 @@ var DEFAULT_CONFIG = {
   schema: {},
   metadata: {
     version: "1.0"
-  }
+  },
+  blacklist: { tables: [], columns: {} }
 };
 function isEnvReference(value) {
   return typeof value === "object" && value !== null && "$env" in value && typeof value.$env === "string";
@@ -78047,21 +78130,29 @@ function resolveEnvReferences(config, env, parentKey, strict = false) {
 }
 function parseEnvPassword(content) {
   const match = content.match(/^DBCLI_PASSWORD=(.+)$/m);
-  return match ? match[1].trim() : null;
+  return match?.[1] != null ? match[1].trim() : null;
 }
 var configModule = {
   async read(path, connectionName) {
     const effectiveConnectionName = connectionName ?? _globalConnectionName;
     try {
+      const binding = await readProjectBinding(path);
+      const storagePath = await resolveConfigStoragePath(path);
+      if (binding) {
+        const storageConfigExists = await Bun.file(join7(storagePath, "config.json")).exists();
+        if (!storageConfigExists) {
+          throw new ConfigError(`Bound dbcli config not found: ${join7(storagePath, "config.json")}`);
+        }
+      }
       let isDirectory = false;
       try {
-        const stat = await Bun.file(path).stat();
+        const stat = await Bun.file(storagePath).stat();
         isDirectory = stat?.isDirectory() ?? false;
       } catch {
         isDirectory = false;
       }
       if (isDirectory) {
-        const configPath = join6(path, "config.json");
+        const configPath = join7(storagePath, "config.json");
         const configFile = Bun.file(configPath);
         const configExists = await configFile.exists();
         if (configExists) {
@@ -78070,8 +78161,8 @@ var configModule = {
           if (detectConfigVersion(config) === 2) {
             const v2Config = DbcliConfigV2Schema.parse(config);
             const resolved = resolveConnection(v2Config, effectiveConnectionName);
-            await loadConnectionEnv(resolved, path);
-            const envLocalPath = join6(path, ".env.local");
+            await loadConnectionEnv(resolved, storagePath);
+            const envLocalPath = join7(storagePath, ".env.local");
             const envLocalFile = Bun.file(envLocalPath);
             let legacyPassword = null;
             if (await envLocalFile.exists()) {
@@ -78088,7 +78179,7 @@ var configModule = {
             let schema = (v2Config.schemas ?? {})[resolved.name] ?? v2Config.schema;
             try {
               const { SchemaLayeredLoader: SchemaLayeredLoader3 } = await Promise.resolve().then(() => (init_schema_loader(), exports_schema_loader));
-              const loader = new SchemaLayeredLoader3(path, { connectionName: resolved.name });
+              const loader = new SchemaLayeredLoader3(storagePath, { connectionName: resolved.name });
               const { cache, index } = await loader.initialize();
               if (index && Object.keys(index.tables).length > 0) {
                 const layeredSchema = {};
@@ -78113,7 +78204,7 @@ var configModule = {
             });
           }
           const resolvedConfig = resolveEnvReferences(config, process.env, undefined, false);
-          const envPath = join6(path, ".env.local");
+          const envPath = join7(storagePath, ".env.local");
           const envFile = Bun.file(envPath);
           if (await envFile.exists()) {
             const envContent = await envFile.text();
@@ -78175,12 +78266,19 @@ var configModule = {
   async write(path, config) {
     try {
       this.validate(config);
-      const pathObj = Bun.file(path);
-      const isDirectory = await pathObj.exists() && pathObj.type === "directory";
-      if (isDirectory || path.endsWith(".dbcli")) {
+      const storagePath = await resolveConfigStoragePath(path);
+      let isDirectory = false;
+      try {
+        const stat = await Bun.file(storagePath).stat();
+        isDirectory = stat?.isDirectory() ?? false;
+      } catch {
+        isDirectory = false;
+      }
+      if (isDirectory || path.endsWith(".dbcli") || path === storagePath && isDirectory) {
+        await Bun.$`mkdir -p ${storagePath}`;
         const hasEnvReferences = isEnvReference(config.connection.password);
         if (hasEnvReferences) {
-          const configPath = join6(path, "config.json");
+          const configPath = join7(storagePath, "config.json");
           const configJson = JSON.stringify(config, null, 2);
           await Bun.file(configPath).write(configJson);
         } else {
@@ -78193,11 +78291,11 @@ var configModule = {
             }
           };
           delete configWithoutPassword.connection.password;
-          const configPath = join6(path, "config.json");
+          const configPath = join7(storagePath, "config.json");
           const configJson = JSON.stringify(configWithoutPassword, null, 2);
           await Bun.file(configPath).write(configJson);
           if (password) {
-            const envPath = join6(path, ".env.local");
+            const envPath = join7(storagePath, ".env.local");
             const envContent = `# Database Credentials - DO NOT commit to git
 
 DBCLI_PASSWORD=${password}
@@ -78220,7 +78318,7 @@ DBCLI_PASSWORD=${password}
 
 // src/utils/prompts.ts
 async function readLineFromStdin(prompt = "") {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     if (prompt) {
       process.stdout.write(prompt);
     }
@@ -78235,12 +78333,12 @@ async function readLineFromStdin(prompt = "") {
         process.stdin.pause();
         process.stdin.removeListener("data", onData);
         process.stdin.removeListener("end", onEnd);
-        resolve(lines2[0].trim());
+        resolve2(lines2[0].trim());
       }
     };
     const onEnd = () => {
       process.stdin.removeListener("data", onData);
-      resolve(data.trim());
+      resolve2(data.trim());
     };
     process.stdin.on("data", onData);
     process.stdin.on("end", onEnd);
@@ -78535,7 +78633,9 @@ class PostgreSQLAdapter {
   }
   async testConnection() {
     if (!this.pool) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const result = await this.execute("SELECT 1 as count");
@@ -78546,7 +78646,9 @@ class PostgreSQLAdapter {
   }
   async execute(sql, params) {
     if (!this.pool) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const result = params ? await this.pool.query(sql, params) : await this.pool.query(sql);
@@ -78564,7 +78666,9 @@ class PostgreSQLAdapter {
   }
   async listTables() {
     if (!this.pool) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const query = `
@@ -78601,7 +78705,9 @@ class PostgreSQLAdapter {
   }
   async getTableSchema(tableName) {
     if (!this.pool) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const columnQuery = `
@@ -78695,7 +78801,9 @@ class PostgreSQLAdapter {
         FROM pg_class
         WHERE relname = $1
       `;
-      const estimateResult = await this.execute(estimateQuery, [tableName]);
+      const estimateResult = await this.execute(estimateQuery, [
+        tableName
+      ]);
       const estimateResults = estimateResult.rows;
       const pkQuery = `
         SELECT array_agg(a.attname) as columns
@@ -78799,7 +78907,9 @@ class MySQLAdapter {
   }
   async testConnection() {
     if (!this.db) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const result = await this.execute("SELECT 1 as count");
@@ -78810,7 +78920,9 @@ class MySQLAdapter {
   }
   async execute(sql, params) {
     if (!this.db) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const [result] = params ? await this.db.execute(sql, params) : await this.db.execute(sql);
@@ -78836,7 +78948,9 @@ class MySQLAdapter {
   }
   async listTables() {
     if (!this.db) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const query = `
@@ -78869,7 +78983,9 @@ class MySQLAdapter {
   }
   async getTableSchema(tableName) {
     if (!this.db) {
-      throw new ConnectionError("UNKNOWN", "Database connection not established", ["Call connect() to establish a connection"]);
+      throw new ConnectionError("UNKNOWN", "Database connection not established", [
+        "Call connect() to establish a connection"
+      ]);
     }
     try {
       const columnQuery = `
@@ -78937,7 +79053,9 @@ class MySQLAdapter {
         FROM information_schema.TABLES
         WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?
       `;
-      const estimateResult = await this.execute(estimateQuery, [tableName]);
+      const estimateResult = await this.execute(estimateQuery, [
+        tableName
+      ]);
       const estimateResults = estimateResult.rows;
       const schema = {
         name: tableName,
@@ -78976,6 +79094,7 @@ class MySQLAdapter {
 }
 
 // src/adapters/mongodb-adapter.ts
+import { resolveSrv, resolveTxt } from "dns/promises";
 class MongoDBAdapter {
   options;
   ClientClass;
@@ -79000,9 +79119,101 @@ class MongoDBAdapter {
     }
     return `mongodb://${host}:${port}/${database}`;
   }
+  parseTxtRecords(records) {
+    const combined = records.flat().map((record) => record.replace(/^"|"$/g, "")).join("&");
+    if (!combined)
+      return {};
+    const params = new URLSearchParams(combined);
+    return Object.fromEntries(params.entries());
+  }
+  async resolveSrvHosts(hostname) {
+    const srvName = `_mongodb._tcp.${hostname}`;
+    try {
+      const records = await resolveSrv(srvName);
+      if (!records.length) {
+        throw new Error(`No SRV records found for ${srvName}`);
+      }
+      return records.map((record) => {
+        const target = String(record.name || record.target || "").replace(/\.$/, "");
+        return `${target}:${record.port}`;
+      });
+    } catch (error) {
+      const code = error?.code;
+      if (code !== "ECONNREFUSED") {
+        throw error;
+      }
+    }
+    const response = await fetch(`https://dns.google/resolve?name=${encodeURIComponent(srvName)}&type=SRV`);
+    if (!response.ok) {
+      throw new Error(`SRV lookup failed with HTTP ${response.status}`);
+    }
+    const payload = await response.json();
+    if (payload.Status !== 0 || !payload.Answer?.length) {
+      throw new Error(payload.Comment || `No SRV records found for ${srvName}`);
+    }
+    return payload.Answer.map((answer) => {
+      const parts = answer.data.trim().split(/\s+/);
+      const port = parts[2];
+      const target = parts.slice(3).join(" ").replace(/\.$/, "");
+      return `${target}:${port}`;
+    });
+  }
+  async resolveTxtOptions(hostname) {
+    try {
+      const records = await resolveTxt(hostname);
+      return this.parseTxtRecords(records);
+    } catch (error) {
+      const code = error?.code;
+      if (code !== "ECONNREFUSED") {
+        throw error;
+      }
+    }
+    const response = await fetch(`https://dns.google/resolve?name=${encodeURIComponent(hostname)}&type=TXT`);
+    if (!response.ok) {
+      throw new Error(`TXT lookup failed with HTTP ${response.status}`);
+    }
+    const payload = await response.json();
+    if (payload.Status !== 0 || !payload.Answer?.length) {
+      return {};
+    }
+    return this.parseTxtRecords(payload.Answer.map((answer) => [answer.data]));
+  }
+  async buildResolvedUri() {
+    if (!this.options.uri) {
+      return this.buildUri();
+    }
+    if (!this.options.uri.startsWith("mongodb+srv://")) {
+      return this.options.uri;
+    }
+    const url = new URL(this.options.uri);
+    const hosts = await this.resolveSrvHosts(url.hostname);
+    const txtOptions = await this.resolveTxtOptions(url.hostname);
+    const query = new URLSearchParams(url.searchParams);
+    for (const [key2, value] of Object.entries(txtOptions)) {
+      if (!query.has(key2)) {
+        query.set(key2, value);
+      }
+    }
+    if (!query.has("tls") && !query.has("ssl")) {
+      query.set("tls", "true");
+    }
+    if ((url.username || url.password) && !query.has("authSource")) {
+      query.set("authSource", "admin");
+    }
+    const userInfo = url.username || url.password ? `${encodeURIComponent(decodeURIComponent(url.username))}${url.password ? `:${encodeURIComponent(decodeURIComponent(url.password))}` : ""}@` : "";
+    const path = url.pathname && url.pathname !== "/" ? url.pathname : `/${this.options.database || "test"}`;
+    const search = query.toString();
+    return `mongodb://${userInfo}${hosts.join(",")}${path}${search ? `?${search}` : ""}`;
+  }
+  getDatabase() {
+    if (!this.client) {
+      throw new ConnectionError("UNKNOWN", "\u5C1A\u672A\u9023\u7DDA\uFF0C\u8ACB\u5148\u547C\u53EB connect()", []);
+    }
+    return this.client.db(this.options.database || undefined);
+  }
   async connect() {
     const ClientClass = await this.resolveClientClass();
-    const uri = this.buildUri();
+    const uri = await this.buildResolvedUri();
     try {
       this.client = new ClientClass(uri, { serverSelectionTimeoutMS: this.options.timeout ?? 5000 });
       await this.client.connect();
@@ -79022,11 +79233,8 @@ class MongoDBAdapter {
     }
   }
   async execute(query, params) {
-    if (!this.client) {
-      throw new ConnectionError("UNKNOWN", "\u5C1A\u672A\u9023\u7DDA\uFF0C\u8ACB\u5148\u547C\u53EB connect()", []);
-    }
+    const db = this.getDatabase();
     const collectionName = params?.[0];
-    const db = this.client.db();
     const collection = db.collection(collectionName);
     let parsed;
     try {
@@ -79043,10 +79251,7 @@ class MongoDBAdapter {
     return { rows: docs, affectedRows: docs.length };
   }
   async listCollections() {
-    if (!this.client) {
-      throw new ConnectionError("UNKNOWN", "\u5C1A\u672A\u9023\u7DDA\uFF0C\u8ACB\u5148\u547C\u53EB connect()", []);
-    }
-    const db = this.client.db();
+    const db = this.getDatabase();
     const colls = await db.listCollections().toArray();
     const results = await Promise.all(colls.map(async (col) => {
       try {
@@ -79058,19 +79263,75 @@ class MongoDBAdapter {
     }));
     return results;
   }
+  async listTables() {
+    const collections = await this.listCollections();
+    return collections.map((c) => ({
+      name: c.name,
+      estimatedRowCount: c.documentCount,
+      columns: []
+    }));
+  }
+  async getTableSchema(collectionName) {
+    const db = this.getDatabase();
+    const collection = db.collection(collectionName);
+    const estimatedRowCount = await collection.estimatedDocumentCount();
+    const samples = await collection.find().limit(5).toArray();
+    const columnMap = new Map;
+    for (const doc of samples) {
+      for (const [key2, value] of Object.entries(doc)) {
+        if (!columnMap.has(key2)) {
+          columnMap.set(key2, new Set);
+        }
+        columnMap.get(key2).add(typeof value);
+      }
+    }
+    const columns = Array.from(columnMap.entries()).map(([name, types3]) => ({
+      name,
+      type: Array.from(types3).join(" | "),
+      nullable: true
+    }));
+    return {
+      name: collectionName,
+      columns,
+      estimatedRowCount,
+      tableType: "collection"
+    };
+  }
   async testConnection() {
     if (!this.client)
       return false;
-    await this.client.db().command({ ping: 1 });
+    await this.getDatabase().command({ ping: 1 });
     return true;
   }
   async getServerVersion() {
-    if (!this.client) {
-      throw new ConnectionError("UNKNOWN", "\u5C1A\u672A\u9023\u7DDA\uFF0C\u8ACB\u5148\u547C\u53EB connect()", []);
-    }
-    const info = await this.client.db().admin().serverInfo();
+    const info = await this.getDatabase().admin().serverInfo();
     return info.version ?? "unknown";
   }
+  async insert(collection, data) {
+    const db = this.getDatabase();
+    const result = await db.collection(collection).insertOne(data);
+    return {
+      rows: [],
+      affectedRows: result.acknowledged ? 1 : 0,
+      lastInsertId: result.insertedId.toString()
+    };
+  }
+  async update(collection, filter, update) {
+    const db = this.getDatabase();
+    const result = await db.collection(collection).updateMany(filter, update);
+    return {
+      rows: [],
+      affectedRows: result.modifiedCount
+    };
+  }
+  async delete(collection, filter) {
+    const db = this.getDatabase();
+    const result = await db.collection(collection).deleteMany(filter);
+    return {
+      rows: [],
+      affectedRows: result.deletedCount
+    };
+  }
 }
 
 // src/adapters/factory.ts
@@ -79082,6 +79343,8 @@ class AdapterFactory {
       case "mysql":
       case "mariadb":
         return new MySQLAdapter(options);
+      case "mongodb":
+        return new MongoDBAdapter(options);
       default:
         throw new Error(`Unsupported database system: ${options.system}`);
     }
@@ -79113,9 +79376,11 @@ function resolveConfigPath(command, options, fallback = ".dbcli") {
 // src/commands/init.ts
 var VALID_PERMISSIONS = ["query-only", "read-write", "data-admin", "admin"];
 async function checkOverwrite(configPath, shouldPrompt, force) {
+  const storagePath = await resolveConfigStoragePath(configPath);
   const fileExists = await Bun.file(configPath).exists();
-  const dirConfigExists = await Bun.file(join7(configPath, "config.json")).exists();
-  if (!fileExists && !dirConfigExists || force)
+  const dirConfigExists = await Bun.file(join8(configPath, "config.json")).exists();
+  const storageConfigExists = await Bun.file(join8(storagePath, "config.json")).exists();
+  if (!fileExists && !dirConfigExists && !storageConfigExists || force)
     return true;
   if (shouldPrompt) {
     const overwrite = await promptUser.confirm(t("init.config_exists_overwrite"));
@@ -79128,7 +79393,8 @@ async function checkOverwrite(configPath, shouldPrompt, force) {
   throw new Error(t("init.config_exists_use_force"));
 }
 async function handleRemove(configPath, name) {
-  const configFile = Bun.file(join7(configPath, "config.json"));
+  const storagePath = await resolveConfigStoragePath(configPath);
+  const configFile = Bun.file(join8(storagePath, "config.json"));
   if (!await configFile.exists()) {
     throw new Error(t("init.config_not_found"));
   }
@@ -79136,7 +79402,7 @@ async function handleRemove(configPath, name) {
   if (detectConfigVersion(raw) !== 2) {
     throw new Error(t("init.requires_v2_remove"));
   }
-  const config = await readV2Config(configPath);
+  const config = await readV2Config(storagePath);
   if (!config.connections[name]) {
     throw new Error(t_vars("init.connection_not_found", { name }));
   }
@@ -79144,14 +79410,14 @@ async function handleRemove(configPath, name) {
   if (connectionCount <= 1) {
     throw new Error(t("init.cannot_remove_last"));
   }
-  const { [name]: _removed, ...remaining } = config.connections;
+  const remaining = Object.fromEntries(Object.entries(config.connections).filter(([connectionName]) => connectionName !== name));
   const newDefault = config.default === name ? Object.keys(remaining)[0] : config.default;
   const updated = {
     ...config,
     default: newDefault,
     connections: remaining
   };
-  await writeV2Config(configPath, updated);
+  await writeV2Config(storagePath, updated);
   if (config.default === name) {
     console.log(t_vars("init.connection_removed_switched", { name, newDefault }));
   } else {
@@ -79163,7 +79429,8 @@ async function handleRename(configPath, renameArg) {
   if (!oldName || !newName) {
     throw new Error(t("init.rename_invalid_format"));
   }
-  const configFile = Bun.file(join7(configPath, "config.json"));
+  const storagePath = await resolveConfigStoragePath(configPath);
+  const configFile = Bun.file(join8(storagePath, "config.json"));
   if (!await configFile.exists()) {
     throw new Error(t("init.config_not_found"));
   }
@@ -79171,7 +79438,7 @@ async function handleRename(configPath, renameArg) {
   if (detectConfigVersion(raw) !== 2) {
     throw new Error(t("init.requires_v2_rename"));
   }
-  const config = await readV2Config(configPath);
+  const config = await readV2Config(storagePath);
   if (!config.connections[oldName]) {
     throw new Error(t_vars("init.connection_not_found", { name: oldName }));
   }
@@ -79184,17 +79451,54 @@ async function handleRename(configPath, renameArg) {
     default: config.default === oldName ? newName : config.default,
     connections: Object.fromEntries(entries)
   };
-  await writeV2Config(configPath, updated);
+  await writeV2Config(storagePath, updated);
   console.log(t_vars("init.connection_renamed", { oldName, newName }));
 }
 async function writeV2InitConfig(configPath, connectionName, connection, permission, envFile) {
-  const configJsonPath = join7(configPath, "config.json");
+  const storagePath = getProjectStoragePath(configPath);
+  const configJsonPath = join8(storagePath, "config.json");
   const configFile = Bun.file(configJsonPath);
+  const projectConfigFile = Bun.file(join8(configPath, "config.json"));
   let existingV2 = null;
   if (await configFile.exists()) {
     const raw = JSON.parse(await configFile.text());
     if (detectConfigVersion(raw) === 2) {
-      existingV2 = await readV2Config(configPath);
+      existingV2 = await readV2Config(storagePath);
+    } else {
+      const v1Config = await configModule.read(storagePath);
+      existingV2 = {
+        version: 2,
+        default: "default",
+        connections: {
+          default: {
+            ...v1Config.connection,
+            permission: v1Config.permission
+          }
+        },
+        schema: v1Config.schema || {},
+        schemas: { default: v1Config.schema || {} },
+        metadata: v1Config.metadata || { version: "1.0" },
+        blacklist: v1Config.blacklist || { tables: [], columns: {} }
+      };
+    }
+  } else if (await projectConfigFile.exists()) {
+    const raw = JSON.parse(await projectConfigFile.text());
+    if (detectConfigVersion(raw) === 2) {
+      const v1Config = await configModule.read(configPath);
+      existingV2 = {
+        version: 2,
+        default: "default",
+        connections: {
+          default: {
+            ...v1Config.connection,
+            permission: v1Config.permission
+          }
+        },
+        schema: v1Config.schema || {},
+        schemas: { default: v1Config.schema || {} },
+        metadata: v1Config.metadata || { version: "1.0" },
+        blacklist: v1Config.blacklist || { tables: [], columns: {} }
+      };
     } else {
       const v1Config = await configModule.read(configPath);
       existingV2 = {
@@ -79207,16 +79511,17 @@ async function writeV2InitConfig(configPath, connectionName, connection, permiss
           }
         },
         schema: v1Config.schema || {},
+        schemas: { default: v1Config.schema || {} },
         metadata: v1Config.metadata || { version: "1.0" },
         blacklist: v1Config.blacklist || { tables: [], columns: {} }
       };
     }
   } else {
-    const legacyFile = Bun.file(configPath);
+    const legacyFile = Bun.file(storagePath);
     if (await legacyFile.exists()) {
       const raw = JSON.parse(await legacyFile.text());
       if (detectConfigVersion(raw) !== 2) {
-        const v1Config = await configModule.read(configPath);
+        const v1Config = await configModule.read(storagePath);
         existingV2 = {
           version: 2,
           default: "default",
@@ -79227,6 +79532,7 @@ async function writeV2InitConfig(configPath, connectionName, connection, permiss
             }
           },
           schema: v1Config.schema || {},
+          schemas: { default: v1Config.schema || {} },
           metadata: v1Config.metadata || { version: "1.0" },
           blacklist: v1Config.blacklist || { tables: [], columns: {} }
         };
@@ -79253,11 +79559,13 @@ async function writeV2InitConfig(configPath, connectionName, connection, permiss
       [connectionName]: connEntry
     },
     schema: {},
+    schemas: {},
     metadata: { version: "1.0", createdAt: new Date().toISOString() },
     blacklist: { tables: [], columns: {} }
   };
-  await Bun.$`mkdir -p ${configPath}`;
-  await writeV2Config(configPath, v2Config);
+  await writeV2Config(storagePath, v2Config);
+  await migrateLegacyProjectEnvLocal(configPath, storagePath);
+  await writeProjectBinding(configPath, storagePath);
   console.log(t("init.config_saved"));
 }
 var initCommand = new Command("init").description("Initialize dbcli configuration with .env parsing and interactive prompts").option("--host <host>", "Database host").option("--port <port>", "Database port").option("--user <user>", "Database user").option("--password <password>", "Database password").option("--name <name>", "Database name").option("--system <system>", "Database system (postgresql, mysql, mariadb, mongodb)").option("--uri <uri>", "MongoDB connection URI (mongodb://user:pass@host:port/db?authSource=admin)").option("--auth-source <authSource>", "MongoDB auth database (default: admin when user/password are set)").option("--permission <permission>", "Permission level (query-only, read-write, data-admin, admin)", "query-only").option("--use-env-refs", "Store env var references in config instead of actual values (for CI/CD or multi-env)", false).option("--env-host <var>", "Env var name for host (with --use-env-refs)").option("--env-port <var>", "Env var name for port (with --use-env-refs)").option("--env-user <var>", "Env var name for user (with --use-env-refs)").option("--env-password <var>", "Env var name for password (with --use-env-refs)").option("--env-database <var>", "Env var name for database (with --use-env-refs)").option("--skip-test", "Skip database connection test").option("--no-interactive", "Non-interactive mode (requires all values via flags)").option("--force", "Skip overwrite confirmation if .dbcli exists").option("--conn-name <name>", "Connection name (creates v2 multi-connection config)").option("--env-file <path>", "Path to env file for this connection").option("--remove <name>", "Remove a named connection").option("--rename <names>", "Rename a connection (format: old:new)").action(async (options) => {
@@ -79296,7 +79604,8 @@ async function initCommandHandler(options, command) {
       console.log(t("init.env_parse_note"));
     }
   }
-  let system = options.system || envConfig?.system || "postgresql";
+  const systemFromCli = typeof options.system === "string" ? options.system : undefined;
+  let system = systemFromCli ?? envConfig?.system ?? "postgresql";
   if (shouldPrompt && !options.system && !envConfig?.system) {
     system = await promptUser.select(t("init.select_system"), [
       "postgresql",
@@ -79325,11 +79634,11 @@ async function initCommandHandler(options, command) {
   };
   let configForWrite;
   if (options.useEnvRefs && shouldPrompt) {
-    let envHost = options.envHost || await promptUser.text(t("init.prompt_host"), "DB_HOST");
-    let envPort = options.envPort || await promptUser.text(t("init.prompt_port"), "DB_PORT");
-    let envUser = options.envUser || await promptUser.text(t("init.prompt_user"), "DB_USER");
-    let envPassword = options.envPassword || await promptUser.text(t("init.prompt_password"), "DB_PASSWORD");
-    let envDatabase = options.envDatabase || await promptUser.text(t("init.prompt_name"), "DB_DATABASE");
+    const envHost = options.envHost || await promptUser.text(t("init.prompt_host"), "DB_HOST");
+    const envPort = options.envPort || await promptUser.text(t("init.prompt_port"), "DB_PORT");
+    const envUser = options.envUser || await promptUser.text(t("init.prompt_user"), "DB_USER");
+    const envPassword = options.envPassword || await promptUser.text(t("init.prompt_password"), "DB_PASSWORD");
+    const envDatabase = options.envDatabase || await promptUser.text(t("init.prompt_name"), "DB_DATABASE");
     configForWrite = {
       system: connection.system,
       host: { $env: envHost },
@@ -79338,7 +79647,8 @@ async function initCommandHandler(options, command) {
       password: { $env: envPassword },
       database: { $env: envDatabase }
     };
-    let permission2 = options.permission || "query-only";
+    const permissionFromCli2 = typeof options.permission === "string" ? options.permission : undefined;
+    let permission2 = permissionFromCli2 ?? "query-only";
     if (!options.permission) {
       permission2 = await promptUser.select(t("init.prompt_permission"), [
         "query-only",
@@ -79362,27 +79672,36 @@ async function initCommandHandler(options, command) {
       await writeV2InitConfig(configPath, connectionName, configForWrite, permission2, options.envFile);
       return;
     }
-    await configModule.write(configPath, newConfig2);
+    const storagePath2 = getProjectStoragePath(configPath);
+    await Bun.$`mkdir -p ${storagePath2}`;
+    await configModule.write(storagePath2, newConfig2);
+    await migrateLegacyProjectEnvLocal(configPath, storagePath2);
+    await writeProjectBinding(configPath, storagePath2);
     console.log(t("init.config_saved"));
     return;
   }
-  connection.host = options.host || envConfig?.host || (shouldPrompt ? await promptUser.text(t("init.prompt_host"), defaults2.host || "localhost") : defaults2.host || "localhost");
-  const portStr = options.port || (envConfig?.port ? String(envConfig.port) : null) || (shouldPrompt ? await promptUser.text(t("init.prompt_port"), String(defaults2.port || 5432)) : String(defaults2.port || 5432));
+  const strOpt = (v) => typeof v === "string" ? v : undefined;
+  const portStrOpt = (v) => typeof v === "string" || typeof v === "number" ? String(v) : undefined;
+  const defaultHost = typeof defaults2.host === "string" ? defaults2.host : "localhost";
+  const defaultPort = typeof defaults2.port === "number" ? defaults2.port : 5432;
+  connection.host = strOpt(options.host) ?? envConfig?.host ?? (shouldPrompt ? await promptUser.text(t("init.prompt_host"), defaultHost) : defaultHost);
+  const portStr = portStrOpt(options.port) ?? (envConfig?.port != null ? String(envConfig.port) : null) ?? (shouldPrompt ? await promptUser.text(t("init.prompt_port"), String(defaultPort)) : String(defaultPort));
   const port = parseInt(portStr, 10);
   if (isNaN(port) || port < 1 || port > 65535) {
     throw new Error(t_vars("errors.invalid_port", { port: portStr }));
   }
   connection.port = port;
-  connection.user = options.user || envConfig?.user || (shouldPrompt ? await promptUser.text(t("init.prompt_user")) : "");
+  connection.user = strOpt(options.user) ?? envConfig?.user ?? (shouldPrompt ? await promptUser.text(t("init.prompt_user")) : "");
   if (!connection.user && !shouldPrompt && !options.useEnvRefs) {
     throw new Error(t("errors.require_user"));
   }
-  connection.password = options.password || envConfig?.password || (shouldPrompt ? await promptUser.text(t("init.prompt_password")) : "");
-  connection.database = options.name || envConfig?.database || (shouldPrompt ? await promptUser.text(t("init.prompt_name")) : "");
+  connection.password = strOpt(options.password) ?? envConfig?.password ?? (shouldPrompt ? await promptUser.text(t("init.prompt_password")) : "");
+  connection.database = strOpt(options.name) ?? envConfig?.database ?? (shouldPrompt ? await promptUser.text(t("init.prompt_name")) : "");
   if (!connection.database && !shouldPrompt && !options.useEnvRefs) {
     throw new Error(t("errors.require_name"));
   }
-  let permission = options.permission || "query-only";
+  const permissionFromCli = typeof options.permission === "string" ? options.permission : undefined;
+  let permission = permissionFromCli ?? "query-only";
   if (shouldPrompt && !options.permission) {
     permission = await promptUser.select(t("init.prompt_permission"), [
       "query-only",
@@ -79467,7 +79786,11 @@ async function initCommandHandler(options, command) {
     await writeV2InitConfig(configPath, connectionName, configForWrite, permission, options.envFile);
     return;
   }
-  await configModule.write(configPath, newConfig);
+  const storagePath = getProjectStoragePath(configPath);
+  await Bun.$`mkdir -p ${storagePath}`;
+  await configModule.write(storagePath, newConfig);
+  await migrateLegacyProjectEnvLocal(configPath, storagePath);
+  await writeProjectBinding(configPath, storagePath);
   console.log(t("init.config_saved"));
 }
 async function handleMongoDBInit(ctx) {
@@ -79548,7 +79871,11 @@ async function handleMongoDBInit(ctx) {
     connection: mongoConfig,
     permission
   });
-  await configModule.write(configPath, newConfig);
+  const storagePath = getProjectStoragePath(configPath);
+  await Bun.$`mkdir -p ${storagePath}`;
+  await configModule.write(storagePath, newConfig);
+  await migrateLegacyProjectEnvLocal(configPath, storagePath);
+  await writeProjectBinding(configPath, storagePath);
   console.log(t("init.config_saved"));
 }
 
@@ -79569,13 +79896,7 @@ class TableFormatter {
       } 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
-      ]);
+      table.push([col.name, col.type, col.nullable ? "YES" : "NO", col.default || "NULL", keyType]);
     });
     return table.toString();
   }
@@ -79891,7 +80212,7 @@ init_schema_cache();
 
 // src/core/schema-writer.ts
 init_schema_index();
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 
 // src/core/atomic-writer.ts
 class AtomicFileWriter {
@@ -80024,7 +80345,7 @@ class SchemaWriter {
     for (const item of mapping.hot) {
       hotSchemas[item.table] = schema[item.table];
     }
-    await this.writer.writeJSON(join8(schemaRoot, "hot-schemas.json"), hotSchemas);
+    await this.writer.writeJSON(join9(schemaRoot, "hot-schemas.json"), hotSchemas);
     const coldGroups = {};
     for (const item of mapping.cold) {
       if (!coldGroups[item.file]) {
@@ -80032,10 +80353,10 @@ class SchemaWriter {
       }
       coldGroups[item.file][item.table] = schema[item.table];
     }
-    const coldDir = join8(schemaRoot, "cold");
+    const coldDir = join9(schemaRoot, "cold");
     await this.ensureDir(coldDir);
     for (const [fileName, tables] of Object.entries(coldGroups)) {
-      const filePath = join8(schemaRoot, fileName);
+      const filePath = join9(schemaRoot, fileName);
       await this.writer.writeJSON(filePath, tables);
     }
   }
@@ -80467,20 +80788,17 @@ var schemaCommand = new Command().name("schema").description("Display table sche
 async function schemaAction(table, options) {
   try {
     validateFormat(options.format, ALLOWED_FORMATS2, "schema");
+    const storagePath = await resolveConfigStoragePath(options.config);
     const config = await configModule.read(options.config);
     if (!config.connection) {
       console.error("Database not configured. Run: dbcli init");
       process.exit(1);
     }
-    if (config.connection?.system === "mongodb") {
-      console.error("\u6B64\u547D\u4EE4\u76EE\u524D\u4E0D\u652F\u63F4 MongoDB");
-      process.exit(1);
-    }
     const connectionName = await getSchemaIsolationConnectionName(options.config);
     let existingSchemaCount;
     if (connectionName !== undefined) {
       try {
-        const v2Raw = await readV2Config(options.config);
+        const v2Raw = await readV2Config(storagePath);
         existingSchemaCount = Object.keys(v2Raw.schemas?.[connectionName] ?? {}).length;
       } catch {
         existingSchemaCount = 0;
@@ -80492,13 +80810,13 @@ async function schemaAction(table, options) {
     await adapter.connect();
     try {
       if (options.reset) {
-        await handleSchemaReset(adapter, config, options, connectionName, existingSchemaCount);
+        await handleSchemaReset(adapter, config, options, connectionName, existingSchemaCount, storagePath);
       } else if (options.refresh) {
-        await handleSchemaRefresh(adapter, config, options, connectionName);
+        await handleSchemaRefresh(adapter, config, options, connectionName, storagePath);
       } else if (table) {
         await handleSingleTableSchema(adapter, table, options.format);
       } else {
-        await handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount);
+        await handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount, storagePath);
       }
     } finally {
       await adapter.disconnect();
@@ -80558,7 +80876,7 @@ Indexes:`);
     }
   }
 }
-async function handleSchemaRefresh(adapter, config, options, connectionName) {
+async function handleSchemaRefresh(adapter, config, options, connectionName, storagePath) {
   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) {
@@ -80569,7 +80887,7 @@ async function handleSchemaRefresh(adapter, config, options, connectionName) {
         schemaTableCount: Object.keys(config.schema || {}).length
       }
     });
-    await writeSchema(options.config, updatedConfig2, connectionName);
+    await writeSchema(storagePath, updatedConfig2, connectionName);
     console.log("\u2705 Schema is up-to-date (no changes detected)");
     return;
   }
@@ -80593,16 +80911,16 @@ async function handleSchemaRefresh(adapter, config, options, connectionName) {
       schemaTableCount: Object.keys(newSchema).length
     }
   });
-  const writer = new SchemaWriter(options.config);
+  const writer = new SchemaWriter(storagePath);
   await writer.save(newSchema, connectionName);
   console.log(`\u2705 Schema persisted to layered storage (.dbcli/schemas/${connectionName || ""})`);
-  await writeSchema(options.config, updatedConfig, connectionName);
+  await writeSchema(storagePath, updatedConfig, connectionName);
   console.log(`\u2705 Schema updated in .dbcli`);
 }
-async function handleSchemaReset(adapter, config, options, connectionName, existingCount) {
+async function handleSchemaReset(adapter, config, options, connectionName, existingCount, storagePath) {
   if (existingCount > 0 && !options.force) {
     const { SchemaLayeredLoader: SchemaLayeredLoader3 } = await Promise.resolve().then(() => (init_schema_loader(), exports_schema_loader));
-    const loader = new SchemaLayeredLoader3(options.config, { connectionName });
+    const loader = new SchemaLayeredLoader3(storagePath, { connectionName });
     const { index } = await loader.initialize();
     if (!index || Object.keys(index.tables).length === 0) {
       console.log(`\u26A0 This will clear ${existingCount} existing table schemas and re-fetch from database.`);
@@ -80621,8 +80939,8 @@ async function handleSchemaReset(adapter, config, options, connectionName, exist
     schema: {},
     metadata: { ...config.metadata, ...emptyMeta }
   };
-  await writeSchema(options.config, configWithoutSchema, connectionName);
-  const writer = new SchemaWriter(options.config);
+  await writeSchema(storagePath, configWithoutSchema, connectionName);
+  const writer = new SchemaWriter(storagePath);
   await writer.clear(connectionName);
   console.log(t("schema.scanning_database"));
   const tables = await adapter.listTables();
@@ -80658,7 +80976,7 @@ async function handleSchemaReset(adapter, config, options, connectionName, exist
   };
   await writer.save(schemaData, connectionName);
   console.log(`\u2705 Schema persisted to layered storage (.dbcli/schemas/${connectionName || ""})`);
-  await writeSchema(options.config, updatedConfig, connectionName);
+  await writeSchema(storagePath, updatedConfig, connectionName);
   if (existingCount > 0) {
     console.log(`
 \u2705 Schema reset complete \u2014 cleared ${existingCount} old tables, fetched ${tables.length} tables from database`);
@@ -80667,7 +80985,7 @@ 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) {
+async function handleFullDatabaseScan(adapter, config, options, connectionName, existingSchemaCount, storagePath) {
   console.log(t("schema.scanning_database"));
   const tables = await adapter.listTables();
   console.log(t_vars("schema.tables_found", { count: tables.length }));
@@ -80693,7 +81011,7 @@ async function handleFullDatabaseScan(adapter, config, options, connectionName,
   }
   if (existingSchemaCount > 0 && !options.force) {
     const { SchemaLayeredLoader: SchemaLayeredLoader3 } = await Promise.resolve().then(() => (init_schema_loader(), exports_schema_loader));
-    const loader = new SchemaLayeredLoader3(options.config, { connectionName });
+    const loader = new SchemaLayeredLoader3(storagePath, { connectionName });
     const { index } = await loader.initialize();
     if (!index || Object.keys(index.tables).length === 0) {
       console.log(`
@@ -80717,10 +81035,10 @@ async function handleFullDatabaseScan(adapter, config, options, connectionName,
       schemaTableCount: tables.length
     }
   };
-  const writer = new SchemaWriter(options.config);
+  const writer = new SchemaWriter(storagePath);
   await writer.save(schemaData, connectionName);
   console.log(`\u2705 Schema persisted to layered storage (.dbcli/schemas/${connectionName || ""})`);
-  await writeSchema(options.config, updatedConfig, connectionName);
+  await writeSchema(storagePath, updatedConfig, connectionName);
   console.log(`
 \u2705 Schema updated in .dbcli`);
   console.log(`   ${tables.length} tables with full column details and relationships`);
@@ -80919,12 +81237,7 @@ function determineConfidence(type, keyword, sql) {
   if (highConfidenceTypes.includes(type)) {
     return "HIGH";
   }
-  const mediumConfidenceTypes = [
-    "CREATE",
-    "ALTER",
-    "DROP",
-    "TRUNCATE"
-  ];
+  const mediumConfidenceTypes = ["CREATE", "ALTER", "DROP", "TRUNCATE"];
   if (mediumConfidenceTypes.includes(type)) {
     return "MEDIUM";
   }
@@ -80958,15 +81271,7 @@ function checkPermission(sql, permission) {
     };
   }
   if (permission === "data-admin") {
-    const allowedTypes = [
-      "SELECT",
-      "INSERT",
-      "UPDATE",
-      "DELETE",
-      "SHOW",
-      "DESCRIBE",
-      "EXPLAIN"
-    ];
+    const allowedTypes = ["SELECT", "INSERT", "UPDATE", "DELETE", "SHOW", "DESCRIBE", "EXPLAIN"];
     if (allowedTypes.includes(classification.type)) {
       return {
         allowed: true,
@@ -80981,14 +81286,7 @@ function checkPermission(sql, permission) {
     };
   }
   if (permission === "read-write") {
-    const allowedTypes = [
-      "SELECT",
-      "INSERT",
-      "UPDATE",
-      "SHOW",
-      "DESCRIBE",
-      "EXPLAIN"
-    ];
+    const allowedTypes = ["SELECT", "INSERT", "UPDATE", "SHOW", "DESCRIBE", "EXPLAIN"];
     if (allowedTypes.includes(classification.type)) {
       return {
         allowed: true,
@@ -81279,7 +81577,7 @@ async function queryCommand(sql, options, command) {
       throw new Error('Run "dbcli init" first');
     }
     if (config.connection.system === "mongodb") {
-      return mongoQueryBranch(sql, options.collection, config, options.format ?? "table");
+      return mongoQueryBranch(sql, options, config);
     }
     const mainTable = extractMainTable(sql);
     if (mainTable && config.schema && !options.noLimit) {
@@ -81333,10 +81631,12 @@ async function queryCommand(sql, options, command) {
 }
 function extractMainTable(sql) {
   const match = sql.match(/\bFROM\s+[`"']?(\w+)[`"']?/i);
-  return match ? match[1] : null;
+  return match?.[1] ?? null;
 }
 var SQL_PATTERN = /^\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|DROP|ALTER|SHOW|DESCRIBE)\b/i;
-async function mongoQueryBranch(queryStr, collection, config, format) {
+async function mongoQueryBranch(queryStr, options, config) {
+  const collection = options.collection;
+  const format = options.format ?? "table";
   if (SQL_PATTERN.test(queryStr)) {
     console.error("\u9019\u662F MongoDB \u9023\u7DDA\uFF0C\u8ACB\u4F7F\u7528 JSON filter \u8A9E\u6CD5\u3002");
     console.error(`\u7BC4\u4F8B\uFF1Adbcli query '{"field": "value"}' --collection <name>`);
@@ -81352,19 +81652,50 @@ async function mongoQueryBranch(queryStr, collection, config, format) {
     console.error("MongoDB \u67E5\u8A62\u5FC5\u9808\u662F\u6709\u6548\u7684 JSON\uFF08object filter \u6216 array pipeline\uFF09");
     process.exit(1);
   }
+  const blacklistManager = new BlacklistManager(config);
+  const blacklistValidator = new BlacklistValidator(blacklistManager);
+  try {
+    blacklistValidator.checkTableBlacklist("SELECT", collection, []);
+  } catch (error) {
+    if (error instanceof BlacklistError) {
+      console.error(error.message);
+      process.exit(1);
+    }
+    throw error;
+  }
+  if (config.schema && !options.noLimit) {
+    const tableSchema = config.schema[collection];
+    if (tableSchema) {
+      const { shouldBlockQuery: shouldBlockQuery2 } = await Promise.resolve().then(() => (init_query_size_guard(), exports_query_size_guard));
+      const isFiltered = queryStr.length > 2;
+      const hasLimit = options.limit !== undefined;
+      const dummySql = `SELECT * FROM ${collection}${isFiltered ? " WHERE" : ""}${hasLimit ? " LIMIT" : ""}`;
+      const guard = shouldBlockQuery2(dummySql, tableSchema);
+      if (guard.blocked) {
+        console.error(`\u26A0 ${guard.reason}`);
+        process.exit(1);
+      }
+    }
+  }
   const mongoAdapter = AdapterFactory.createMongoDBAdapter(config.connection);
   await mongoAdapter.connect();
   try {
     const result = await mongoAdapter.execute(queryStr, [collection]);
-    const columnNames = result.rows.length > 0 ? Object.keys(result.rows[0]) : [];
+    const columnNames = result.rows[0] ? Object.keys(result.rows[0]) : [];
+    const filterResult = blacklistValidator.filterColumns(collection, result.rows, columnNames);
     const queryResult = {
-      rows: result.rows,
-      rowCount: result.rows.length,
-      columnNames
+      rows: filterResult.filteredRows,
+      rowCount: filterResult.filteredRows.length,
+      columnNames: columnNames.filter((col) => !filterResult.omittedColumns.includes(col))
     };
     const formatter = new QueryResultFormatter;
     const output = formatter.format(queryResult, { format });
+    const securityNote = blacklistValidator.buildSecurityNotification(collection, filterResult.omittedColumns);
     console.log(output);
+    if (securityNote) {
+      console.log(`
+\u2139 ${securityNote}`);
+    }
   } finally {
     await mongoAdapter.disconnect();
   }
@@ -81702,8 +82033,23 @@ async function insertCommand(table, options, command) {
       throw new Error('Run "dbcli init" to configure database connection');
     }
     if (config.connection.system === "mongodb") {
-      console.error("\u6B64\u547D\u4EE4\u76EE\u524D\u4E0D\u652F\u63F4 MongoDB");
-      process.exit(1);
+      enforcePermission("INSERT INTO dummy", config.permission);
+      const adapter2 = AdapterFactory.createMongoDBAdapter(config.connection);
+      await adapter2.connect();
+      try {
+        const result = await adapter2.insert(table, data);
+        const output = {
+          status: "success",
+          operation: "insert",
+          rows_affected: result.affectedRows,
+          timestamp: new Date().toISOString(),
+          lastInsertId: result.lastInsertId
+        };
+        console.log(JSON.stringify(output, null, 2));
+        return;
+      } finally {
+        await adapter2.disconnect();
+      }
     }
     const adapter = AdapterFactory.createAdapter(config.connection);
     await adapter.connect();
@@ -81776,7 +82122,11 @@ function parseWhereClause(whereClause) {
     if (!match) {
       throw new Error(`Cannot parse WHERE clause: "${part}". Use format "column=value" or "col1=val1 AND col2=val2"`);
     }
-    const [_, column, valueStr] = match;
+    const column = match[1];
+    const valueStr = match[2];
+    if (valueStr === undefined || column === undefined) {
+      throw new Error(`Cannot parse WHERE clause: "${part}". Use format "column=value" or "col1=val1 AND col2=val2"`);
+    }
     let value = valueStr.trim();
     if (value.startsWith("'") && value.endsWith("'") || value.startsWith('"') && value.endsWith('"')) {
       value = value.slice(1, -1);
@@ -81806,11 +82156,10 @@ async function updateCommand(table, options, command) {
     if (!options.set || options.set.trim() === "") {
       throw new Error(`UPDATE requires --set flag with JSON data (e.g. --set '{"name":"Bob"}')`);
     }
-    let whereConditions;
-    try {
-      whereConditions = parseWhereClause(options.where);
-    } catch (error) {
-      throw new Error(`WHERE clause parsing failed: ${error.message}`);
+    const configPath = resolveConfigPath(command, options);
+    const config = await configModule.read(configPath);
+    if (!config.connection) {
+      throw new Error('Run "dbcli init" to configure database connection');
     }
     let setData;
     try {
@@ -81821,14 +82170,36 @@ async function updateCommand(table, options, command) {
     if (!setData || typeof setData !== "object" || Array.isArray(setData)) {
       throw new Error('JSON in --set must be an object (e.g. {"name":"Bob","email":"b@example.com"})');
     }
-    const configPath = resolveConfigPath(command, options);
-    const config = await configModule.read(configPath);
-    if (!config.connection) {
-      throw new Error('Run "dbcli init" to configure database connection');
-    }
     if (config.connection?.system === "mongodb") {
-      console.error("\u6B64\u547D\u4EE4\u76EE\u524D\u4E0D\u652F\u63F4 MongoDB");
-      process.exit(1);
+      enforcePermission("UPDATE dummy", config.permission);
+      const adapter2 = AdapterFactory.createMongoDBAdapter(config.connection);
+      await adapter2.connect();
+      try {
+        let filter;
+        try {
+          filter = JSON.parse(options.where);
+        } catch {
+          filter = parseWhereClause(options.where);
+        }
+        const updateDoc = Object.keys(setData).some((key2) => key2.startsWith("$")) ? setData : { $set: setData };
+        const result = await adapter2.update(table, filter, updateDoc);
+        const output = {
+          status: "success",
+          operation: "update",
+          rows_affected: result.affectedRows,
+          timestamp: new Date().toISOString()
+        };
+        console.log(JSON.stringify(output, null, 2));
+        return;
+      } finally {
+        await adapter2.disconnect();
+      }
+    }
+    let whereConditions;
+    try {
+      whereConditions = parseWhereClause(options.where);
+    } catch (error) {
+      throw new Error(`WHERE clause parsing failed: ${error.message}`);
     }
     const adapter = AdapterFactory.createAdapter(config.connection);
     await adapter.connect();
@@ -81929,23 +82300,48 @@ async function deleteCommand(table, options, command) {
     if (!options.where || options.where.trim() === "") {
       throw new Error('DELETE requires --where clause (e.g. --where "id=1")');
     }
-    let whereConditions;
-    try {
-      whereConditions = parseWhereClause2(options.where);
-    } catch (error) {
-      throw new Error(`WHERE clause parsing failed: ${error.message}`);
-    }
     const configPath = resolveConfigPath(command, options);
     const config = await configModule.read(configPath);
     if (!config.connection) {
       throw new Error('Run "dbcli init" to configure database connection');
     }
+    if (config.permission !== "data-admin" && config.permission !== "admin") {
+      throw new PermissionError(t("delete.admin_only"), {
+        type: "DELETE",
+        isDangerous: true,
+        keywords: ["DELETE"],
+        isComposite: false,
+        confidence: "HIGH"
+      }, config.permission);
+    }
     if (config.connection?.system === "mongodb") {
-      console.error("\u6B64\u547D\u4EE4\u76EE\u524D\u4E0D\u652F\u63F4 MongoDB");
-      process.exit(1);
+      const adapter2 = AdapterFactory.createMongoDBAdapter(config.connection);
+      await adapter2.connect();
+      try {
+        let filter;
+        try {
+          filter = JSON.parse(options.where);
+        } catch {
+          filter = parseWhereClause2(options.where);
+        }
+        const result = await adapter2.delete(table, filter);
+        const output = {
+          status: "success",
+          operation: "delete",
+          rows_affected: result.affectedRows,
+          timestamp: new Date().toISOString()
+        };
+        console.log(JSON.stringify(output, null, 2));
+        return;
+      } finally {
+        await adapter2.disconnect();
+      }
     }
-    if (config.permission !== "data-admin" && config.permission !== "admin") {
-      throw new PermissionError(t("delete.admin_only"), { type: "DELETE", isDangerous: true, keywords: ["DELETE"], isComposite: false, confidence: "HIGH" }, config.permission);
+    let whereConditions;
+    try {
+      whereConditions = parseWhereClause2(options.where);
+    } catch (error) {
+      throw new Error(`WHERE clause parsing failed: ${error.message}`);
     }
     const adapter = AdapterFactory.createAdapter(config.connection);
     await adapter.connect();
@@ -82073,7 +82469,7 @@ async function exportCommand(sql, options, command) {
 // src/commands/skill.ts
 var {$ } = globalThis.Bun;
 import * as path from "path";
-import { homedir } from "os";
+import { homedir as homedir2 } from "os";
 function findPackageRoot() {
   let dir = import.meta.dir;
   for (let i = 0;i < 5; i++) {
@@ -82085,6 +82481,7 @@ function findPackageRoot() {
   return path.resolve(import.meta.dir, "../..");
 }
 var SKILL_SOURCE_PATH = path.join(findPackageRoot(), "assets", "SKILL.md");
+var REFERENCE_SOURCE_PATH = path.join(findPackageRoot(), "assets", "reference.md");
 var SUPPORTED_PLATFORMS = ["claude", "gemini", "copilot", "cursor"];
 async function skillCommand(_program, options) {
   try {
@@ -82092,7 +82489,12 @@ async function skillCommand(_program, options) {
     if (!await skillFile.exists()) {
       throw new Error(`Skill source not found: ${SKILL_SOURCE_PATH}`);
     }
+    const refFile = Bun.file(REFERENCE_SOURCE_PATH);
+    if (!await refFile.exists()) {
+      throw new Error(`Skill reference not found: ${REFERENCE_SOURCE_PATH}`);
+    }
     const skillMarkdown = await skillFile.text();
+    const referenceMarkdown = await refFile.text();
     if (options.output) {
       await Bun.file(options.output).write(skillMarkdown);
       console.error(`Skill written to ${options.output}`);
@@ -82100,9 +82502,8 @@ async function skillCommand(_program, options) {
     }
     if (options.install) {
       const installPath = getInstallPath(options.install);
-      await ensureDir(path.dirname(installPath));
-      await Bun.file(installPath).write(skillMarkdown);
-      console.error(t_vars("skill.installed", { path: installPath }));
+      const { referencePath } = await writeSkillInstall(options.install, installPath, skillMarkdown, referenceMarkdown);
+      console.error(t_vars("skill.installed", { path: installPath, referencePath: referencePath ?? "" }));
       return;
     }
     console.log(skillMarkdown);
@@ -82135,7 +82536,7 @@ async function checkSkillUpdates() {
   return outdated;
 }
 function getInstallPath(platform) {
-  const home = process.env.HOME || homedir();
+  const home = process.env.HOME || homedir2();
   const platformLower = platform.toLowerCase();
   switch (platformLower) {
     case "claude":
@@ -82150,6 +82551,20 @@ function getInstallPath(platform) {
       throw new Error(`Unknown platform: ${platform}. Supported platforms: ${SUPPORTED_PLATFORMS.join(", ")}`);
   }
 }
+async function writeSkillInstall(platform, installPath, skillMarkdown, referenceMarkdown) {
+  const platformLower = platform.toLowerCase();
+  await ensureDir(path.dirname(installPath));
+  await Bun.file(installPath).write(skillMarkdown);
+  if (platformLower === "cursor") {
+    const refPath2 = path.join(process.cwd(), ".cursor", "skills", "dbcli", "reference.md");
+    await ensureDir(path.dirname(refPath2));
+    await Bun.file(refPath2).write(referenceMarkdown);
+    return { referencePath: refPath2 };
+  }
+  const refPath = path.join(path.dirname(installPath), "reference.md");
+  await Bun.file(refPath).write(referenceMarkdown);
+  return { referencePath: refPath };
+}
 async function ensureDir(dirPath) {
   try {
     await $`mkdir -p ${dirPath}`.quiet();
@@ -82242,7 +82657,7 @@ async function blacklistTableRemove(tableName, configPath) {
   }
   const newBlacklist = {
     ...blacklist,
-    tables: blacklist.tables.filter((t7) => t7 !== tableName)
+    tables: blacklist.tables.filter((t6) => t6 !== tableName)
   };
   await configModule.write(configPath, { ...config, blacklist: newBlacklist });
   console.log(t_vars("blacklist.table_removed", { table: tableName }));
@@ -82377,21 +82792,21 @@ async function checkAction(table, options) {
         const tables = await adapter.listTables();
         const reports = [];
         const skipped = [];
-        for (const t7 of tables) {
-          if (blacklistedTables.has(t7.name.toLowerCase())) {
-            skipped.push(`${t7.name} (blacklisted)`);
+        for (const t6 of tables) {
+          if (blacklistedTables.has(t6.name.toLowerCase())) {
+            skipped.push(`${t6.name} (blacklisted)`);
             continue;
           }
-          if (t7.tableType === "view") {
-            skipped.push(`${t7.name} (view)`);
+          if (t6.tableType === "view") {
+            skipped.push(`${t6.name} (view)`);
             continue;
           }
-          const category = getSizeCategory(t7.estimatedRowCount);
+          const category = getSizeCategory(t6.estimatedRowCount);
           if (category === "huge" && !options.includeLarge) {
-            skipped.push(`${t7.name} (~${(t7.estimatedRowCount || 0).toLocaleString()} rows, huge)`);
+            skipped.push(`${t6.name} (~${(t6.estimatedRowCount || 0).toLocaleString()} rows, huge)`);
             continue;
           }
-          const schema = await adapter.getTableSchema(t7.name);
+          const schema = await adapter.getTableSchema(t6.name);
           const report = await checker.check(schema, {
             checks: checkTypes,
             sample: sampleSize,
@@ -82475,31 +82890,49 @@ var ALLOWED_FORMATS5 = ["json", "table"];
 function compareSnapshots(before, after) {
   const beforeTables = new Set(Object.keys(before.tables));
   const afterTables = new Set(Object.keys(after.tables));
-  const addedTables = Array.from(afterTables).filter((t7) => !beforeTables.has(t7));
-  const removedTables = Array.from(beforeTables).filter((t7) => !afterTables.has(t7));
+  const addedTables = Array.from(afterTables).filter((t6) => !beforeTables.has(t6));
+  const removedTables = Array.from(beforeTables).filter((t6) => !afterTables.has(t6));
   const addedColumns = [];
   const removedColumns = [];
   const modifiedColumns = [];
   const indexChanges = [];
   for (const tableName of addedTables) {
-    for (const col of after.tables[tableName].columns) {
-      addedColumns.push({ table: tableName, column: col.name, type: col.type, nullable: col.nullable });
+    const added = after.tables[tableName];
+    if (!added)
+      continue;
+    for (const col of added.columns) {
+      addedColumns.push({
+        table: tableName,
+        column: col.name,
+        type: col.type,
+        nullable: col.nullable
+      });
     }
   }
   for (const tableName of removedTables) {
-    for (const col of before.tables[tableName].columns) {
+    const removed = before.tables[tableName];
+    if (!removed)
+      continue;
+    for (const col of removed.columns) {
       removedColumns.push({ table: tableName, column: col.name, type: col.type });
     }
   }
-  const commonTables = Array.from(afterTables).filter((t7) => beforeTables.has(t7));
+  const commonTables = Array.from(afterTables).filter((t6) => beforeTables.has(t6));
   for (const tableName of commonTables) {
     const beforeTable = before.tables[tableName];
     const afterTable = after.tables[tableName];
+    if (!beforeTable || !afterTable)
+      continue;
     const beforeColMap = new Map(beforeTable.columns.map((c) => [c.name, c]));
     const afterColMap = new Map(afterTable.columns.map((c) => [c.name, c]));
     for (const [name, col] of afterColMap) {
       if (!beforeColMap.has(name)) {
-        addedColumns.push({ table: tableName, column: name, type: col.type, nullable: col.nullable });
+        addedColumns.push({
+          table: tableName,
+          column: name,
+          type: col.type,
+          nullable: col.nullable
+        });
       }
     }
     for (const [name, col] of beforeColMap) {
@@ -82569,11 +83002,11 @@ async function diffAction(options) {
         tables: {},
         createdAt: new Date().toISOString()
       };
-      for (const t7 of tables) {
-        if (t7.tableType === "view")
+      for (const t6 of tables) {
+        if (t6.tableType === "view")
           continue;
-        const schema = await adapter.getTableSchema(t7.name);
-        currentSnapshot.tables[t7.name] = {
+        const schema = await adapter.getTableSchema(t6.name);
+        currentSnapshot.tables[t6.name] = {
           name: schema.name,
           columns: schema.columns,
           indexes: schema.indexes || []
@@ -82686,7 +83119,8 @@ var statusCommand = new Command("status").description("Show current configuratio
 // src/commands/doctor.ts
 init_validation();
 init_schema_path();
-import { join as join10 } from "path";
+import { join as join11 } from "path";
+import { resolveSrv as resolveSrv2 } from "dns/promises";
 var ALLOWED_FORMATS7 = ["text", "json"];
 var SENSITIVE_PATTERNS = [
   "password",
@@ -82735,7 +83169,9 @@ var runDoctorChecks = {
   },
   async checkLatestVersion(currentVersion) {
     try {
-      const response = await fetch("https://registry.npmjs.org/@carllee1983/dbcli/latest", { signal: AbortSignal.timeout(5000) });
+      const response = await fetch("https://registry.npmjs.org/@carllee1983/dbcli/latest", {
+        signal: AbortSignal.timeout(5000)
+      });
       if (!response.ok)
         throw new Error(`HTTP ${response.status}`);
       const data = await response.json();
@@ -82757,7 +83193,7 @@ var runDoctorChecks = {
     }
   },
   async checkConfigExists(configPath, existsFn) {
-    const exists = existsFn ? await existsFn(configPath) : await Bun.file(configPath).exists() || await Bun.file(join10(configPath, "config.json")).exists();
+    const exists = existsFn ? await existsFn(configPath) : await Bun.file(configPath).exists() || await Bun.file(join11(configPath, "config.json")).exists();
     return {
       group: "Configuration",
       label: "Config exists",
@@ -82831,8 +83267,70 @@ var runDoctorChecks = {
       message: versionResult.supported ? t_vars("version.doctor_pass", vars) : t_vars("version.doctor_warn", vars)
     };
   },
+  async checkMongoSrvConnectivity(uri, deps = {}) {
+    if (!uri || !uri.startsWith("mongodb+srv://")) {
+      return null;
+    }
+    const url = new URL(uri);
+    const srvName = `_mongodb._tcp.${url.hostname}`;
+    const resolveSrvFn = deps.resolveSrvFn ?? resolveSrv2;
+    const fetchFn = deps.fetchFn ?? fetch;
+    try {
+      const records = await resolveSrvFn(srvName);
+      if (!records.length) {
+        return {
+          group: "Environment",
+          label: "MongoDB SRV lookup",
+          status: "error",
+          message: `No SRV records found for ${url.hostname}`
+        };
+      }
+      return {
+        group: "Environment",
+        label: "MongoDB SRV lookup",
+        status: "pass",
+        message: `MongoDB SRV lookup reachable for ${url.hostname} (${records.length} record(s))`
+      };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      const code = error?.code;
+      const isExecutionEnvIssue = code === "ECONNREFUSED" || code === "ETIMEDOUT" || message.includes("Unable to connect. Is the computer able to access the url?") || message.includes("ConnectionRefused");
+      if (!isExecutionEnvIssue) {
+        return {
+          group: "Environment",
+          label: "MongoDB SRV lookup",
+          status: "error",
+          message: `MongoDB SRV lookup failed for ${url.hostname}: ${message}`
+        };
+      }
+      try {
+        const response = await fetchFn(`https://dns.google/resolve?name=${encodeURIComponent(srvName)}&type=SRV`, { signal: AbortSignal.timeout(5000) });
+        if (!response.ok) {
+          throw new Error(`HTTP ${response.status}`);
+        }
+        const payload = await response.json();
+        if (payload.Status !== 0 || !payload.Answer?.length) {
+          throw new Error(payload.Comment || `No SRV records found for ${url.hostname}`);
+        }
+        return {
+          group: "Environment",
+          label: "MongoDB SRV lookup",
+          status: "warn",
+          message: `Direct SRV DNS lookup failed in this shell, but DNS-over-HTTPS fallback resolved ` + `${url.hostname}. dbcli can still connect here, but this runtime environment cannot perform direct SRV lookups.`
+        };
+      } catch (fallbackError) {
+        const fallbackMessage = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
+        return {
+          group: "Environment",
+          label: "MongoDB SRV lookup",
+          status: "error",
+          message: `MongoDB SRV lookup failed in this environment (${code || "unknown"}); ` + `DNS-over-HTTPS fallback also failed: ${fallbackMessage}`
+        };
+      }
+    }
+  },
   checkLargeTables(tables) {
-    const large = tables.filter((t7) => (t7.estimatedRowCount ?? 0) > 1e6);
+    const large = tables.filter((t6) => (t6.estimatedRowCount ?? 0) > 1e6);
     if (large.length === 0) {
       return {
         group: "Connection & Data",
@@ -82841,7 +83339,7 @@ var runDoctorChecks = {
         message: "No tables exceed 1M rows"
       };
     }
-    const list = large.map((t7) => `${t7.name} (${((t7.estimatedRowCount ?? 0) / 1e6).toFixed(1)}M rows)`).join(", ");
+    const list = large.map((t6) => `${t6.name} (${((t6.estimatedRowCount ?? 0) / 1e6).toFixed(1)}M rows)`).join(", ");
     return {
       group: "Connection & Data",
       label: "Large tables",
@@ -82851,7 +83349,8 @@ var runDoctorChecks = {
   },
   async checkV2Config(configPath) {
     const results = [];
-    const configFile = Bun.file(join10(configPath, "config.json"));
+    const storagePath = await resolveConfigStoragePath(configPath);
+    const configFile = Bun.file(join11(storagePath, "config.json"));
     if (!await configFile.exists())
       return results;
     let raw;
@@ -82891,7 +83390,7 @@ var runDoctorChecks = {
     }
     for (const [name, conn] of Object.entries(config.connections)) {
       if (conn.envFile) {
-        const envPath = join10(configPath, "..", conn.envFile);
+        const envPath = join11(storagePath, conn.envFile);
         const exists = await Bun.file(envPath).exists();
         results.push({
           group: "Configuration",
@@ -82927,9 +83426,18 @@ var runDoctorChecks = {
 };
 async function collectMongoDoctorResults(config) {
   const results = [];
+  const mongoConn = config.connection.system === "mongodb" ? config.connection : null;
+  const mongoUriString = mongoConn && typeof mongoConn.uri === "string" ? mongoConn.uri : undefined;
+  const srvCheck = await runDoctorChecks.checkMongoSrvConnectivity(mongoUriString);
+  if (srvCheck) {
+    results.push(srvCheck);
+    if (srvCheck.status === "error") {
+      return results;
+    }
+  }
   const adapter = AdapterFactory.createMongoDBAdapter(config.connection);
-  await adapter.connect();
   try {
+    await adapter.connect();
     results.push({
       group: "Connection & Data",
       label: "Connection",
@@ -82945,10 +83453,20 @@ async function collectMongoDoctorResults(config) {
         message: `MongoDB ${version}`
       });
     } catch {}
-    const collections = await adapter.listCollections();
-    results.push(runDoctorChecks.checkLargeTables(collections.map((collection) => ({
-      name: collection.name,
-      estimatedRowCount: collection.documentCount
+    const collections = await adapter.listTables();
+    const tableColumns = new Map;
+    for (const coll of collections) {
+      try {
+        const schema = await adapter.getTableSchema(coll.name);
+        tableColumns.set(coll.name, schema.columns.map((c) => c.name));
+      } catch {}
+    }
+    if (config.blacklistedColumns) {
+      results.push(runDoctorChecks.checkBlacklistCompleteness(tableColumns, config.blacklistedColumns));
+    }
+    results.push(runDoctorChecks.checkLargeTables(collections.map((coll) => ({
+      name: coll.name,
+      estimatedRowCount: coll.estimatedRowCount
     }))));
     results.push({
       group: "Connection & Data",
@@ -82956,11 +83474,18 @@ async function collectMongoDoctorResults(config) {
       status: "pass",
       message: collections.length === 0 ? "No collections found" : `Found ${collections.length} collection(s)`
     });
+    const lastUpdated = config.metadata?.schemaLastUpdated ?? null;
+    const freshness = runDoctorChecks.checkSchemaCacheFreshness(lastUpdated);
+    if (!lastUpdated) {
+      freshness.message = 'Schema cache is not tracked for MongoDB \u2014 run "dbcli schema --refresh" to scan collections';
+    }
+    results.push(freshness);
+  } catch (error) {
     results.push({
       group: "Connection & Data",
-      label: "Schema cache",
-      status: "warn",
-      message: config.metadata?.schemaLastUpdated ? `Schema cache timestamp present: ${config.metadata.schemaLastUpdated}` : "Schema cache is not tracked for MongoDB \u2014 run collection inspections instead"
+      label: "Connection",
+      status: "error",
+      message: `Connection failed: ${error.message}`
     });
   } finally {
     await adapter.disconnect();
@@ -82972,11 +83497,12 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
   const logger = getLogger();
   const results = [];
   const configPath = resolveConfigPath(doctorCommand);
+  const storagePath = await resolveConfigStoragePath(configPath);
   const bunVersion = process.versions.bun ?? "unknown";
   const requiredBun = package_default.engines?.bun?.replace(">=", "") ?? "1.3.3";
   results.push(runDoctorChecks.checkBunVersion(bunVersion, requiredBun));
   results.push(await runDoctorChecks.checkLatestVersion(package_default.version));
-  const configExists = await runDoctorChecks.checkConfigExists(configPath);
+  const configExists = await runDoctorChecks.checkConfigExists(storagePath);
   results.push(configExists);
   if (configExists.status !== "error") {
     try {
@@ -83003,7 +83529,10 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
       }
       try {
         if (config.connection.system === "mongodb") {
-          results.push(...await collectMongoDoctorResults(config));
+          results.push(...await collectMongoDoctorResults({
+            ...config,
+            blacklistedColumns
+          }));
         } else {
           const adapter = AdapterFactory.createAdapter(config.connection);
           await adapter.connect();
@@ -83023,8 +83552,8 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
           try {
             const tables = await adapter.listTables();
             const tableColumns = new Map;
-            for (const t7 of tables) {
-              tableColumns.set(t7.name, t7.columns.map((c) => c.name));
+            for (const t6 of tables) {
+              tableColumns.set(t6.name, t6.columns.map((c) => c.name));
             }
             results.push(runDoctorChecks.checkBlacklistCompleteness(tableColumns, blacklistedColumns));
             results.push(runDoctorChecks.checkLargeTables(tables));
@@ -83033,7 +83562,7 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
           }
           try {
             const schemaConnName = await getSchemaIsolationConnectionName(configPath);
-            const indexPath = join10(resolveSchemaPath(configPath, schemaConnName), "index.json");
+            const indexPath = join11(resolveSchemaPath(storagePath, schemaConnName), "index.json");
             const indexFile = Bun.file(indexPath);
             let indexParsed = null;
             if (await indexFile.exists()) {
@@ -83075,8 +83604,8 @@ var doctorCommand = new Command("doctor").description("Run diagnostic checks on
 });
 
 // src/commands/completion.ts
-import { join as join11 } from "path";
-import { homedir as homedir2 } from "os";
+import { join as join12 } from "path";
+import { homedir as homedir3 } from "os";
 function extractCommands(program2) {
   return program2.commands.map((cmd) => ({
     name: cmd.name(),
@@ -83155,10 +83684,7 @@ _dbcli
 `;
 }
 function generateFishCompletion(commands, globalOptions) {
-  const lines2 = [
-    "# dbcli fish completion \u2014 auto-generated, do not edit",
-    ""
-  ];
+  const lines2 = ["# dbcli fish completion \u2014 auto-generated, do not edit", ""];
   for (const opt of globalOptions) {
     const longName = opt.replace(/^--/, "");
     lines2.push(`complete -c dbcli -n '__fish_use_subcommand' -l ${longName} -d '${opt}'`);
@@ -83177,14 +83703,14 @@ function generateFishCompletion(commands, globalOptions) {
 `;
 }
 function getInstallPath2(shell) {
-  const home = homedir2();
+  const home = homedir3();
   switch (shell) {
     case "bash":
-      return join11(home, ".bashrc");
+      return join12(home, ".bashrc");
     case "zsh":
-      return join11(home, ".zshrc");
+      return join12(home, ".zshrc");
     case "fish":
-      return join11(home, ".config", "fish", "completions", "dbcli.fish");
+      return join12(home, ".config", "fish", "completions", "dbcli.fish");
     default:
       throw new Error(`Unsupported shell: ${shell}. Supported: bash, zsh, fish`);
   }
@@ -83204,7 +83730,7 @@ var MARKER_END = "# <<< dbcli completion <<<";
 async function installCompletion(shell, script) {
   const targetPath = getInstallPath2(shell);
   if (shell === "fish") {
-    const dir = join11(homedir2(), ".config", "fish", "completions");
+    const dir = join12(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}`));
@@ -83431,8 +83957,8 @@ ${t("upgrade.failed")}`));
 
 // src/commands/shell.ts
 import { createInterface as createInterface2 } from "readline";
-import { join as join12 } from "path";
-import { homedir as homedir3 } from "os";
+import { join as join13 } from "path";
+import { homedir as homedir4 } from "os";
 
 // src/core/repl/types.ts
 var SQL_KEYWORDS_FOR_DETECTION = [
@@ -83952,7 +84478,7 @@ class ReplEngine {
       const tableName = this.extractTableName(sql);
       if (tableName) {
         const blacklistedTables = this.config.blacklist.tables ?? [];
-        const isBlacklisted = blacklistedTables.some((t7) => t7.toLowerCase() === tableName.toLowerCase());
+        const isBlacklisted = blacklistedTables.some((t6) => t6.toLowerCase() === tableName.toLowerCase());
         if (isBlacklisted) {
           return {
             action: "continue",
@@ -84027,13 +84553,7 @@ var TABLE_POSITION_KEYWORDS = new Set([
   "UPDATE",
   "TABLE"
 ]);
-var COMMANDS_TAKING_TABLE_ARG = new Set([
-  "schema",
-  "insert",
-  "update",
-  "delete",
-  "check"
-]);
+var COMMANDS_TAKING_TABLE_ARG = new Set(["schema", "insert", "update", "delete", "check"]);
 function createCompleter(ctx) {
   const allTableNames = ctx.tableNames;
   const allColumns = Object.values(ctx.columnsByTable).flat();
@@ -84107,7 +84627,7 @@ function extractTableFromLine(line, tableNames) {
   if (fromIdx >= 0) {
     const afterFrom = line.slice(fromIdx + 5).trim().split(/\s+/)[0];
     const candidate = afterFrom.replace(/[;,]/g, "").toLowerCase();
-    return tableNames.find((t7) => t7.toLowerCase() === candidate);
+    return tableNames.find((t6) => t6.toLowerCase() === candidate);
   }
   return;
 }
@@ -84157,7 +84677,7 @@ class MongoShellAdapter {
 }
 
 // src/commands/shell.ts
-var HISTORY_PATH = join12(homedir3(), ".dbcli_history");
+var HISTORY_PATH = join13(homedir4(), ".dbcli_history");
 var shellCommand = new Command("shell").description("Interactive database shell with auto-completion and syntax highlighting").option("--sql", "SQL-only mode (skip dbcli command parsing)").action(async (options, command) => {
   const configPath = resolveConfigPath(command);
   await runShell(options, configPath);
@@ -84171,7 +84691,8 @@ async function runShell(options, configPath) {
     process.exit(1);
   }
   const isMongoDB = config.connection.system === "mongodb";
-  const adapter = isMongoDB ? new MongoShellAdapter(AdapterFactory.createMongoDBAdapter(config.connection)) : AdapterFactory.createAdapter(config.connection);
+  const connectionOpts = config.connection;
+  const adapter = isMongoDB ? new MongoShellAdapter(AdapterFactory.createMongoDBAdapter(connectionOpts)) : AdapterFactory.createAdapter(connectionOpts);
   try {
     await adapter.connect();
   } catch (error) {
@@ -84179,7 +84700,7 @@ async function runShell(options, configPath) {
     process.exit(1);
   }
   let tableNames = [];
-  let columnsByTable = {};
+  const columnsByTable = {};
   if (isMongoDB) {
     const collections = await adapter.listTables();
     tableNames = collections.map((collection) => collection.name);
@@ -84349,25 +84870,25 @@ class PostgreSQLDDLGenerator {
   alterColumn(options) {
     const statements = [];
     const warnings = [];
-    const t7 = q(options.table);
+    const t6 = q(options.table);
     const c = q(options.column);
     if (options.type) {
-      statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} TYPE ${options.type.toUpperCase()};`);
+      statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} TYPE ${options.type.toUpperCase()};`);
     }
     if (options.rename) {
-      statements.push(`ALTER TABLE ${t7} RENAME COLUMN ${c} TO ${q(options.rename)};`);
+      statements.push(`ALTER TABLE ${t6} RENAME COLUMN ${c} TO ${q(options.rename)};`);
     }
     if (options.setDefault !== undefined) {
-      statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} SET DEFAULT ${options.setDefault};`);
+      statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} SET DEFAULT ${options.setDefault};`);
     }
     if (options.dropDefault) {
-      statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} DROP DEFAULT;`);
+      statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} DROP DEFAULT;`);
     }
     if (options.setNullable) {
-      statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} DROP NOT NULL;`);
+      statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} DROP NOT NULL;`);
     }
     if (options.dropNullable) {
-      statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} SET NOT NULL;`);
+      statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} SET NOT NULL;`);
     }
     if (statements.length === 0) {
       warnings.push("No alter operations specified");
@@ -84389,14 +84910,14 @@ class PostgreSQLDDLGenerator {
     return { sql: `DROP INDEX ${q(indexName)};`, warnings: [] };
   }
   addConstraint(constraint) {
-    const t7 = q(constraint.table);
+    const t6 = q(constraint.table);
     const warnings = [];
     switch (constraint.type) {
       case "foreign_key": {
         const name = constraint.name || `fk_${constraint.table}_${constraint.column}`;
         const onDelete = constraint.onDelete ? ` ON DELETE ${constraint.onDelete.toUpperCase().replace("_", " ")}` : "";
         return {
-          sql: `ALTER TABLE ${t7} ADD CONSTRAINT ${q(name)} FOREIGN KEY (${q(constraint.column)}) REFERENCES ${q(constraint.references.table)}(${q(constraint.references.column)})${onDelete};`,
+          sql: `ALTER TABLE ${t6} ADD CONSTRAINT ${q(name)} FOREIGN KEY (${q(constraint.column)}) REFERENCES ${q(constraint.references.table)}(${q(constraint.references.column)})${onDelete};`,
           warnings
         };
       }
@@ -84404,14 +84925,14 @@ class PostgreSQLDDLGenerator {
         const name = constraint.name || `uq_${constraint.table}_${constraint.columns.join("_")}`;
         const cols = constraint.columns.map(q).join(", ");
         return {
-          sql: `ALTER TABLE ${t7} ADD CONSTRAINT ${q(name)} UNIQUE (${cols});`,
+          sql: `ALTER TABLE ${t6} ADD CONSTRAINT ${q(name)} UNIQUE (${cols});`,
           warnings
         };
       }
       case "check": {
         const name = constraint.name || `ck_${constraint.table}`;
         return {
-          sql: `ALTER TABLE ${t7} ADD CONSTRAINT ${q(name)} CHECK (${constraint.expression});`,
+          sql: `ALTER TABLE ${t6} ADD CONSTRAINT ${q(name)} CHECK (${constraint.expression});`,
           warnings
         };
       }
@@ -84514,19 +85035,19 @@ class MySQLDDLGenerator {
   alterColumn(options) {
     const statements = [];
     const warnings = [];
-    const t7 = q2(options.table);
+    const t6 = q2(options.table);
     const c = q2(options.column);
     if (options.type) {
       const nullable = options.dropNullable ? " NOT NULL" : "";
       const def = options.setDefault !== undefined ? ` DEFAULT ${options.setDefault}` : "";
-      statements.push(`ALTER TABLE ${t7} MODIFY COLUMN ${c} ${options.type.toUpperCase()}${nullable}${def};`);
+      statements.push(`ALTER TABLE ${t6} MODIFY COLUMN ${c} ${options.type.toUpperCase()}${nullable}${def};`);
       warnings.push("MySQL MODIFY COLUMN resets column attributes not explicitly specified");
     } else {
       if (options.setDefault !== undefined) {
-        statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} SET DEFAULT ${options.setDefault};`);
+        statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} SET DEFAULT ${options.setDefault};`);
       }
       if (options.dropDefault) {
-        statements.push(`ALTER TABLE ${t7} ALTER COLUMN ${c} DROP DEFAULT;`);
+        statements.push(`ALTER TABLE ${t6} ALTER COLUMN ${c} DROP DEFAULT;`);
       }
       if (options.setNullable) {
         warnings.push("MySQL requires MODIFY COLUMN with full type to change nullability \u2014 use --type to specify");
@@ -84536,7 +85057,7 @@ class MySQLDDLGenerator {
       }
     }
     if (options.rename) {
-      statements.push(`ALTER TABLE ${t7} RENAME COLUMN ${c} TO ${q2(options.rename)};`);
+      statements.push(`ALTER TABLE ${t6} RENAME COLUMN ${c} TO ${q2(options.rename)};`);
     }
     if (statements.length === 0 && warnings.length === 0) {
       warnings.push("No alter operations specified");
@@ -84562,14 +85083,14 @@ class MySQLDDLGenerator {
     };
   }
   addConstraint(constraint) {
-    const t7 = q2(constraint.table);
+    const t6 = q2(constraint.table);
     const warnings = [];
     switch (constraint.type) {
       case "foreign_key": {
         const name = constraint.name || `fk_${constraint.table}_${constraint.column}`;
         const onDelete = constraint.onDelete ? ` ON DELETE ${constraint.onDelete.toUpperCase().replace("_", " ")}` : "";
         return {
-          sql: `ALTER TABLE ${t7} ADD CONSTRAINT ${q2(name)} FOREIGN KEY (${q2(constraint.column)}) REFERENCES ${q2(constraint.references.table)}(${q2(constraint.references.column)})${onDelete};`,
+          sql: `ALTER TABLE ${t6} ADD CONSTRAINT ${q2(name)} FOREIGN KEY (${q2(constraint.column)}) REFERENCES ${q2(constraint.references.table)}(${q2(constraint.references.column)})${onDelete};`,
           warnings
         };
       }
@@ -84577,14 +85098,14 @@ class MySQLDDLGenerator {
         const name = constraint.name || `uq_${constraint.table}_${constraint.columns.join("_")}`;
         const cols = constraint.columns.map(q2).join(", ");
         return {
-          sql: `ALTER TABLE ${t7} ADD CONSTRAINT ${q2(name)} UNIQUE (${cols});`,
+          sql: `ALTER TABLE ${t6} ADD CONSTRAINT ${q2(name)} UNIQUE (${cols});`,
           warnings
         };
       }
       case "check": {
         const name = constraint.name || `ck_${constraint.table}`;
         return {
-          sql: `ALTER TABLE ${t7} ADD CONSTRAINT ${q2(name)} CHECK (${constraint.expression});`,
+          sql: `ALTER TABLE ${t6} ADD CONSTRAINT ${q2(name)} CHECK (${constraint.expression});`,
           warnings: ["CHECK constraints enforced in MySQL 8.0.16+ and MariaDB 10.2.1+ only"]
         };
       }
@@ -84599,13 +85120,17 @@ class MySQLDDLGenerator {
   addEnum(_definition) {
     return {
       sql: "",
-      warnings: [`MySQL has no standalone ENUM type \u2014 use ENUM in column definition instead (e.g., "status:enum('a','b'):not-null")`]
+      warnings: [
+        `MySQL has no standalone ENUM type \u2014 use ENUM in column definition instead (e.g., "status:enum('a','b'):not-null")`
+      ]
     };
   }
   alterEnum(_name, _addValue) {
     return {
       sql: "",
-      warnings: ["MySQL has no standalone ENUM type \u2014 use ALTER TABLE MODIFY COLUMN to change enum values"]
+      warnings: [
+        "MySQL has no standalone ENUM type \u2014 use ALTER TABLE MODIFY COLUMN to change enum values"
+      ]
     };
   }
   dropEnum(_name) {
@@ -85093,7 +85618,7 @@ addExecOpts(migrateCommand.command("drop-enum <name>").description(t("migrate.dr
 });
 
 // src/commands/use.ts
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 async function switchDefault(configPath, name, config) {
   if (!config.connections[name]) {
     const available = Object.keys(config.connections).join(", ");
@@ -85115,15 +85640,41 @@ function listConnectionsForDisplay(config) {
   });
 }
 async function ensureV2Config(configPath) {
-  const configFile = Bun.file(join13(configPath, "config.json"));
-  if (!await configFile.exists()) {
+  const storagePath = await resolveConfigStoragePath(configPath);
+  const configFile = Bun.file(join14(storagePath, "config.json"));
+  const legacyFile = Bun.file(configPath);
+  if (!await configFile.exists() && !await legacyFile.exists()) {
     throw new ConfigError(t("init.config_not_found"));
   }
-  const raw = JSON.parse(await configFile.text());
-  if (!raw.version || raw.version !== 2 || !raw.connections) {
+  try {
+    const raw = await (async () => {
+      if (await configFile.exists())
+        return JSON.parse(await configFile.text());
+      return JSON.parse(await legacyFile.text());
+    })();
+    if (!raw.version || raw.version !== 2 || !raw.connections) {
+      const v1Config = await configModule.read(configPath);
+      return {
+        version: 2,
+        default: "default",
+        connections: {
+          default: {
+            ...v1Config.connection,
+            permission: v1Config.permission
+          }
+        },
+        schema: v1Config.schema || {},
+        schemas: { default: v1Config.schema || {} },
+        metadata: v1Config.metadata || { version: "1.0" },
+        blacklist: v1Config.blacklist || { tables: [], columns: {} }
+      };
+    }
+    return readV2Config(storagePath);
+  } catch (error) {
+    if (error instanceof ConfigError)
+      throw error;
     throw new ConfigError(t("use.requires_v2"));
   }
-  return readV2Config(configPath);
 }
 var useCommand = new Command("use").description("Switch or display the default database connection (v2 config)").argument("[name]", "Connection name to switch to").option("--list", "List all connections").action(async (name, options) => {
   try {
@@ -85152,7 +85703,7 @@ var useCommand = new Command("use").description("Switch or display the default d
 });
 
 // src/cli.ts
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 var _bgVersionCheckResult;
 var program2 = new Command().name("dbcli").description("Database CLI for AI agents").version(package_default.version).option("--no-color", "Disable colored output").option("-v, --verbose", "Increase verbosity (-v verbose, -vv debug)", (_, prev) => prev + 1, 0).option("-q, --quiet", "Suppress non-essential output").option("--config <path>", "Path to .dbcli config file", ".dbcli").option("--use <connection>", "Use a specific named connection (v2 config)");
 program2.hook("preAction", (thisCommand, actionCommand) => {
@@ -85178,7 +85729,7 @@ program2.hook("preAction", (thisCommand, actionCommand) => {
       try {
         let cache = null;
         try {
-          const cacheFile = Bun.file(join14(configPath, "version-check.json"));
+          const cacheFile = Bun.file(join15(configPath, "version-check.json"));
           if (await cacheFile.exists()) {
             cache = await cacheFile.json();
           }