@carllee1983/dbcli 1.45.1 → 1.46.0

package/dist/cli.mjs

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@carllee1983/dbcli",
-    version: "1.45.1",
+    version: "1.46.0",
     description: "Database CLI for AI agents",
     type: "module",
     publishConfig: {
@@ -7463,7 +7463,11 @@ var init_validation = __esm(() => {
     port: OptNumberOrEnvRef,
     user: OptStringOrEnvRef,
     password: OptStringOrEnvRef,
-    database: OptStringOrEnvRef
+    database: OptStringOrEnvRef,
+    authSource: exports_external.union([exports_external.string(), EnvRefSchema]).optional(),
+    replicaSet: exports_external.union([exports_external.string(), EnvRefSchema]).optional(),
+    tls: exports_external.boolean().optional(),
+    srv: exports_external.boolean().optional().default(false)
   });
   SqlConnectionConfigSchema = exports_external.object({
     system: exports_external.enum(["postgresql", "mysql", "mariadb"]),
@@ -24355,12 +24359,40 @@ class MongoDBAdapter {
   buildUri() {
     if (this.options.uri)
       return this.options.uri;
-    const { user, password, host, port, database, authSource } = this.options;
-    if (user && password) {
-      const auth = authSource ?? "admin";
-      return `mongodb://${user}:${encodeURIComponent(password)}@${host}:${port}/${database}?authSource=${auth}`;
+    const { user, password, host, port, database, authSource, replicaSet, tls, srv } = this.options;
+    if (!host) {
+      throw new ConnectionError("UNKNOWN", "MongoDB host \u672A\u8A2D\u5B9A", [
+        "\u8ACB\u586B\u5BEB host\uFF0C\u6216\u6539\u7528 uri \u6B04\u4F4D\u6307\u5B9A\u5B8C\u6574\u9023\u7DDA\u5B57\u4E32"
+      ]);
+    }
+    const isBracketedIpv6 = /^\[[0-9a-f:]+\]$/i.test(host);
+    if (!isBracketedIpv6 && /[/@?#:\s\\]/.test(host)) {
+      throw new ConnectionError("UNKNOWN", `MongoDB host \u542B\u6709\u975E\u6CD5\u5B57\u5143: ${host}`, [
+        "host \u53EA\u61C9\u5305\u542B\u4E3B\u6A5F\u540D\u7A31\u6216 IP\uFF0C\u4E0D\u8981\u542B /\u3001@\u3001?\u3001#\u3001: \u6216\u7A7A\u767D",
+        "\u57E0\u865F\u8ACB\u586B\u5728 port \u6B04\u4F4D\uFF0C\u4E0D\u8981\u4F75\u9032 host",
+        "IPv6 \u4F4D\u5740\u8ACB\u52A0\u65B9\u62EC\u865F\uFF0C\u4F8B\u5982 [::1]",
+        "\u82E5\u8981\u6307\u5B9A\u5B8C\u6574\u9023\u7DDA\u5B57\u4E32\uFF0C\u8ACB\u6539\u7528 uri \u6B04\u4F4D"
+      ]);
+    }
+    if (user && !password) {
+      throw new ConnectionError("UNKNOWN", "\u5DF2\u6307\u5B9A user \u4F46\u672A\u63D0\u4F9B password", [
+        '\u8ACB\u88DC\u4E0A password\uFF0C\u6216\u6539\u7528\u74B0\u5883\u8B8A\u6578\u53C3\u7167 {"$env": "..."}',
+        "\u82E5\u78BA\u5B9A\u8981\u4EE5\u7121\u8A8D\u8B49\u65B9\u5F0F\u9023\u7DDA\uFF0C\u8ACB\u4E00\u4F75\u6E05\u7A7A user"
+      ]);
     }
-    return `mongodb://${host}:${port}/${database}`;
+    const userInfo = user ? `${encodeURIComponent(user)}:${encodeURIComponent(password)}@` : "";
+    const scheme = srv ? "mongodb+srv://" : "mongodb://";
+    const authority = srv ? host : `${host}:${port}`;
+    const path5 = database ? `/${encodeURIComponent(database)}` : "/";
+    const query = new URLSearchParams;
+    if (user)
+      query.set("authSource", authSource || "admin");
+    if (replicaSet)
+      query.set("replicaSet", replicaSet);
+    if (tls !== undefined)
+      query.set("tls", String(tls));
+    const search = query.toString();
+    return `${scheme}${userInfo}${authority}${path5}${search ? `?${search}` : ""}`;
   }
   parseTxtRecords(records) {
     const combined = records.flat().map((record) => record.replace(/^"|"$/g, "")).join("&");
@@ -24422,13 +24454,11 @@ class MongoDBAdapter {
     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 canonical = this.buildUri();
+    if (!canonical.startsWith("mongodb+srv://")) {
+      return canonical;
     }
-    const url = new URL(this.options.uri);
+    const url = new URL(canonical);
     const hosts = await this.resolveSrvHosts(url.hostname);
     const txtOptions = await this.resolveTxtOptions(url.hostname);
     const query = new URLSearchParams(url.searchParams);
@@ -24448,6 +24478,37 @@ class MongoDBAdapter {
     const search = query.toString();
     return `mongodb://${userInfo}${hosts.join(",")}${path5}${search ? `?${search}` : ""}`;
   }
+  connectionHints(error, message) {
+    const AUTH_HINTS = [
+      "\u8A8D\u8B49\u5931\u6557\uFF1A\u8ACB\u78BA\u8A8D user / password \u6B63\u78BA",
+      "\u8ACB\u78BA\u8A8D authSource \u6307\u5411\u5B58\u653E\u8A72\u5E33\u865F\u7684\u8CC7\u6599\u5EAB\uFF08Atlas \u8207\u591A\u6578\u81EA\u67B6\u74B0\u5883\u70BA admin\uFF09"
+    ];
+    const DNS_HINTS = [
+      "DNS/SRV \u89E3\u6790\u5931\u6557\uFF1A\u8ACB\u78BA\u8A8D host \u70BA SRV \u7DB2\u57DF\uFF0C\u4E14 srv \u8A2D\u5B9A\u8207\u5B83\u4E00\u81F4",
+      "\u82E5\u8A72\u4E3B\u6A5F\u4E0D\u662F SRV \u7DB2\u57DF\uFF0C\u8ACB\u95DC\u9589 srv \u4E26\u6539\u586B host \u8207 port",
+      "\u8ACB\u78BA\u8A8D\u672C\u6A5F DNS \u6216\u7DB2\u8DEF\uFF08VPN\u3001\u516C\u53F8\u7DB2\u8DEF\uFF09\u5141\u8A31 SRV \u67E5\u8A62"
+    ];
+    const TLS_HINTS = [
+      "TLS \u63E1\u624B\u5931\u6557\uFF1A\u8ACB\u78BA\u8A8D tls \u6B04\u4F4D\u8A2D\u5B9A\u8207\u4F3A\u670D\u5668\u4E00\u81F4",
+      "\u81EA\u7C3D\u6191\u8B49\u74B0\u5883\u9700\u8981\u5728\u4F3A\u670D\u5668\u7AEF\u6216\u7CFB\u7D71\u4FE1\u4EFB\u93C8\u4E2D\u5B89\u88DD CA \u6191\u8B49"
+    ];
+    const err = error;
+    const causeCode = String(err?.cause?.code ?? err?.code ?? "");
+    if (err?.code === 18 || err?.codeName === "AuthenticationFailed")
+      return AUTH_HINTS;
+    if (["ENOTFOUND", "EAI_AGAIN"].includes(causeCode))
+      return DNS_HINTS;
+    if (causeCode.startsWith("ERR_TLS") || causeCode.startsWith("SELF_SIGNED"))
+      return TLS_HINTS;
+    if (/authentication failed|not authorized|bad auth/i.test(message))
+      return AUTH_HINTS;
+    if (/querySrv|getaddrinfo (ENOTFOUND|EAI_AGAIN)/i.test(message))
+      return DNS_HINTS;
+    if (/unable to verify the first certificate|self.signed certificate|certificate has expired|ERR_TLS/i.test(message)) {
+      return TLS_HINTS;
+    }
+    return ["\u8ACB\u78BA\u8A8D MongoDB \u670D\u52D9\u6B63\u5728\u57F7\u884C", "\u8ACB\u78BA\u8A8D\u9023\u7DDA\u8A2D\u5B9A\uFF08URI \u6216 host/port\uFF09\u6B63\u78BA"];
+  }
   getDatabase() {
     if (!this.client) {
       throw new ConnectionError("UNKNOWN", "\u5C1A\u672A\u9023\u7DDA\uFF0C\u8ACB\u5148\u547C\u53EB connect()", []);
@@ -24463,10 +24524,7 @@ class MongoDBAdapter {
     } catch (err) {
       const message = err.message ?? "Unknown error";
       const code = message.includes("ECONNREFUSED") ? "ECONNREFUSED" : message.includes("ETIMEDOUT") ? "ETIMEDOUT" : "UNKNOWN";
-      throw new ConnectionError(code, `MongoDB \u9023\u7DDA\u5931\u6557: ${message}`, [
-        "\u8ACB\u78BA\u8A8D MongoDB \u670D\u52D9\u6B63\u5728\u57F7\u884C",
-        "\u8ACB\u78BA\u8A8D\u9023\u7DDA\u8A2D\u5B9A\uFF08URI \u6216 host/port\uFF09\u6B63\u78BA"
-      ]);
+      throw new ConnectionError(code, `MongoDB \u9023\u7DDA\u5931\u6557: ${message}`, this.connectionHints(err, message));
     }
   }
   async disconnect() {
@@ -26112,9 +26170,8 @@ var init_adapters = __esm(() => {
   init_elasticsearch_adapter();
 });
 
-// src/commands/init.ts
+// src/commands/init-shared.ts
 import { join as join14 } from "path";
-import { mkdir as mkdir5 } from "fs/promises";
 async function checkOverwrite(configPath, shouldPrompt, force) {
   const storagePath = await resolveConfigStoragePath(configPath);
   const fileExists = await Bun.file(configPath).exists();
@@ -26132,68 +26189,6 @@ async function checkOverwrite(configPath, shouldPrompt, force) {
   }
   throw new Error(t("init.config_exists_use_force"));
 }
-async function handleRemove(configPath, name2) {
-  const storagePath = await resolveConfigStoragePath(configPath);
-  const configFile = Bun.file(join14(storagePath, "config.json"));
-  if (!await configFile.exists()) {
-    throw new Error(t("init.config_not_found"));
-  }
-  const raw = JSON.parse(await configFile.text());
-  if (detectConfigVersion(raw) !== 2) {
-    throw new Error(t("init.requires_v2_remove"));
-  }
-  const config = await readV2Config(storagePath);
-  if (!config.connections[name2]) {
-    throw new Error(t_vars("init.connection_not_found", { name: name2 }));
-  }
-  const connectionCount = Object.keys(config.connections).length;
-  if (connectionCount <= 1) {
-    throw new Error(t("init.cannot_remove_last"));
-  }
-  const remaining = Object.fromEntries(Object.entries(config.connections).filter(([connectionName]) => connectionName !== name2));
-  const newDefault = config.default === name2 ? Object.keys(remaining)[0] : config.default;
-  const updated = {
-    ...config,
-    default: newDefault,
-    connections: remaining
-  };
-  await writeV2Config(storagePath, updated);
-  if (config.default === name2) {
-    console.log(t_vars("init.connection_removed_switched", { name: name2, newDefault }));
-  } else {
-    console.log(t_vars("init.connection_removed", { name: name2 }));
-  }
-}
-async function handleRename(configPath, renameArg) {
-  const [oldName, newName] = renameArg.split(":");
-  if (!oldName || !newName) {
-    throw new Error(t("init.rename_invalid_format"));
-  }
-  const storagePath = await resolveConfigStoragePath(configPath);
-  const configFile = Bun.file(join14(storagePath, "config.json"));
-  if (!await configFile.exists()) {
-    throw new Error(t("init.config_not_found"));
-  }
-  const raw = JSON.parse(await configFile.text());
-  if (detectConfigVersion(raw) !== 2) {
-    throw new Error(t("init.requires_v2_rename"));
-  }
-  const config = await readV2Config(storagePath);
-  if (!config.connections[oldName]) {
-    throw new Error(t_vars("init.connection_not_found", { name: oldName }));
-  }
-  if (config.connections[newName]) {
-    throw new Error(t_vars("init.connection_already_exists", { name: newName }));
-  }
-  const entries = Object.entries(config.connections).map(([key, value]) => [key === oldName ? newName : key, value]);
-  const updated = {
-    ...config,
-    default: config.default === oldName ? newName : config.default,
-    connections: Object.fromEntries(entries)
-  };
-  await writeV2Config(storagePath, updated);
-  console.log(t_vars("init.connection_renamed", { oldName, newName }));
-}
 async function writeV2InitConfig(configPath, connectionName, connection, permission, envFile) {
   const globalConfig = isGlobalConfigPath(configPath);
   const storagePath = globalConfig ? configPath : getProjectStoragePath(configPath);
@@ -26319,6 +26314,270 @@ async function writeV2InitConfig(configPath, connectionName, connection, permiss
   }
   console.log(globalConfig ? t_vars("init.config_saved_global", { path: join14(configPath, "config.json") }) : t("init.config_saved"));
 }
+var init_init_shared = __esm(() => {
+  init_message_loader();
+  init_config();
+  init_config_v2();
+  init_prompts();
+  init_config_binding();
+});
+
+// src/commands/init-mongodb.ts
+import { mkdir as mkdir5 } from "fs/promises";
+async function handleMongoDBInit(ctx) {
+  const { options, configPath, connectionName, isV2Init, existingConfig } = ctx;
+  const isInteractive = options.interactive !== false && process.stdin.isTTY;
+  const SETUP_MODES = ["\u9010\u6B04\u586B\u5BEB\uFF08\u5EFA\u8B70\uFF09", "\u8CBC\u4E0A\u5B8C\u6574\u9023\u7DDA\u5B57\u4E32\uFF08\u9032\u968E\uFF09"];
+  const URI_MODE_INDEX = 1;
+  const useEnvRefs = Boolean(options.useEnvRefs);
+  let mongoUri = options.uri;
+  let useUriMode = Boolean(mongoUri);
+  if (!mongoUri && isInteractive) {
+    const mode = await promptUser.select("\u9023\u7DDA\u8A2D\u5B9A\u65B9\u5F0F / Connection setup", [...SETUP_MODES]);
+    useUriMode = mode === SETUP_MODES[URI_MODE_INDEX];
+    while (useUriMode && !mongoUri) {
+      const input = await promptUser.text("MongoDB \u9023\u7DDA\u5B57\u4E32 / connection string (mongodb://user:pass@host:27017/db)", "");
+      if (input.trim()) {
+        mongoUri = input.trim();
+      } else {
+        console.log("\u672A\u8F38\u5165\u9023\u7DDA\u5B57\u4E32\uFF0C\u6539\u7528\u9010\u6B04\u586B\u5BEB\u3002");
+        useUriMode = false;
+      }
+    }
+  }
+  const useFieldEnvRefs = useEnvRefs && !useUriMode;
+  if (useEnvRefs && useUriMode) {
+    console.warn("\u26A0\uFE0F  --use-env-refs \u4E0D\u9069\u7528\u65BC\u5B8C\u6574\u9023\u7DDA\u5B57\u4E32\uFF1AURI \u6703\u539F\u6A23\u5BEB\u5165\u8A2D\u5B9A\u6A94\uFF0C\u5E33\u5BC6\u4E0D\u6703\u88AB\u62BD\u6210\u74B0\u5883\u8B8A\u6578\u53C3\u7167\u3002");
+  }
+  const fields = {
+    host: options.host || "localhost",
+    port: parseInt(options.port || "27017", 10),
+    user: options.user || "",
+    password: options.password || "",
+    authSource: options.authSource || "",
+    replicaSet: "",
+    tls: undefined,
+    srv: false
+  };
+  const promptPort = async (fallback) => {
+    for (;; ) {
+      const raw = await promptUser.text("Port\uFF08\u57E0\u865F\uFF09", String(fallback));
+      const parsed = parseInt(raw, 10);
+      if (Number.isInteger(parsed) && parsed > 0 && parsed <= 65535)
+        return parsed;
+      console.log("\u8ACB\u8F38\u5165 1-65535 \u7684\u6574\u6578\u3002");
+    }
+  };
+  if (!useUriMode && isInteractive) {
+    if (!useFieldEnvRefs) {
+      fields.host = await promptUser.text("Host\uFF08\u4E3B\u6A5F\u4F4D\u5740\uFF09", fields.host);
+    }
+    fields.srv = await promptUser.confirm("\u9019\u662F SRV \u7DB2\u57DF\u55CE\uFF08Atlas \u7B49 mongodb+srv \u9023\u7DDA\uFF09\uFF1F");
+    if (!fields.srv && !useFieldEnvRefs) {
+      fields.port = await promptPort(fields.port);
+    }
+    if (!useFieldEnvRefs) {
+      fields.user = await promptUser.text("User\uFF08\u5E33\u865F\uFF0C\u7121\u8A8D\u8B49\u8ACB\u7559\u7A7A\uFF09", fields.user);
+      if (fields.user) {
+        fields.password = await promptUser.text("Password\uFF08\u5BC6\u78BC\uFF09", fields.password);
+        fields.authSource = await promptUser.text("authSource\uFF08\u8A8D\u8B49\u8CC7\u6599\u5EAB\uFF09", fields.authSource || "admin");
+      }
+    }
+    if (await promptUser.confirm("\u8A2D\u5B9A\u9032\u968E\u9078\u9805\uFF08replicaSet / tls\uFF09\uFF1F")) {
+      fields.replicaSet = await promptUser.text("replicaSet\uFF08\u8907\u672C\u96C6\u540D\u7A31\uFF0C\u53EF\u7559\u7A7A\uFF09", "");
+      fields.tls = await promptUser.confirm("\u555F\u7528 tls\uFF1F");
+    }
+  }
+  let database = options.name || "";
+  if (!database && isInteractive && !useFieldEnvRefs) {
+    database = await promptUser.text("Database name", "testdb");
+  }
+  const envRefFor = async (flag, label, suggestion) => {
+    const name2 = flag ?? (isInteractive ? await promptUser.text(label, suggestion) : "");
+    return name2.trim() ? { $env: name2.trim() } : null;
+  };
+  let envRefConfig = null;
+  if (useFieldEnvRefs) {
+    const hostRef = await envRefFor(options.envHost, "Host \u7684\u74B0\u5883\u8B8A\u6578\u540D\u7A31", "MONGO_HOST");
+    const portRef = await envRefFor(options.envPort, "Port \u7684\u74B0\u5883\u8B8A\u6578\u540D\u7A31\uFF08\u53EF\u7559\u7A7A\uFF09", "");
+    const userRef = await envRefFor(options.envUser, "User \u7684\u74B0\u5883\u8B8A\u6578\u540D\u7A31\uFF08\u53EF\u7559\u7A7A\uFF09", "");
+    const passwordRef = await envRefFor(options.envPassword, "Password \u7684\u74B0\u5883\u8B8A\u6578\u540D\u7A31\uFF08\u53EF\u7559\u7A7A\uFF09", "");
+    const databaseRef = await envRefFor(options.envDatabase, "Database \u7684\u74B0\u5883\u8B8A\u6578\u540D\u7A31\uFF08\u53EF\u7559\u7A7A\uFF09", "");
+    if (!hostRef) {
+      throw new Error("--use-env-refs \u9700\u8981 host \u7684\u74B0\u5883\u8B8A\u6578\u540D\u7A31\uFF08--env-host\uFF09");
+    }
+    if (!databaseRef && !database && isInteractive) {
+      database = await promptUser.text("Database name", "testdb");
+    }
+    if (!databaseRef && !database) {
+      throw new Error(t("errors.require_name"));
+    }
+    envRefConfig = {
+      system: "mongodb",
+      host: hostRef,
+      port: portRef ?? fields.port,
+      user: userRef ?? "",
+      password: passwordRef ?? "",
+      database: databaseRef ?? database,
+      ...fields.authSource ? { authSource: fields.authSource } : {},
+      ...fields.replicaSet ? { replicaSet: fields.replicaSet } : {},
+      ...fields.tls !== undefined ? { tls: fields.tls } : {},
+      ...fields.srv ? { srv: true } : {}
+    };
+  }
+  if (!database && !isInteractive && !useFieldEnvRefs) {
+    throw new Error(t("errors.require_name"));
+  }
+  const mongoConfig = envRefConfig ?? (useUriMode ? {
+    system: "mongodb",
+    uri: mongoUri,
+    database,
+    host: "",
+    port: 27017,
+    user: "",
+    password: ""
+  } : {
+    system: "mongodb",
+    host: fields.host,
+    port: fields.port,
+    user: fields.user,
+    password: fields.password,
+    database,
+    ...fields.user ? { authSource: fields.authSource || "admin" } : {},
+    ...fields.replicaSet ? { replicaSet: fields.replicaSet } : {},
+    ...fields.tls !== undefined ? { tls: fields.tls } : {},
+    ...fields.srv ? { srv: true } : {}
+  });
+  let permission = options.permission || "query-only";
+  if (isInteractive && !options.permission) {
+    permission = await promptUser.select(t("init.prompt_permission"), [
+      "query-only",
+      "read-write",
+      "data-admin",
+      "admin"
+    ]);
+  }
+  if (!VALID_PERMISSIONS.includes(permission)) {
+    throw new Error(t_vars("errors.invalid_permission", { permission }));
+  }
+  const canProceed = await checkOverwrite(configPath, isInteractive, !!options.force);
+  if (!canProceed)
+    return;
+  if (!options.skipTest && !useFieldEnvRefs) {
+    console.log(t("init.connection_testing"));
+    const mongoAdapter = AdapterFactory.createMongoDBAdapter(mongoConfig);
+    try {
+      await mongoAdapter.connect();
+      await mongoAdapter.testConnection();
+      console.log(t("init.connection_success"));
+    } catch (error) {
+      if (error instanceof ConnectionError) {
+        console.error(t_vars("errors.connection_failed", { message: error.message }));
+        console.error(t("init.connection_hints"));
+        error.hints.forEach((hint) => console.error(`  \u2022 ${hint}`));
+        process.exit(1);
+      }
+      throw error;
+    } finally {
+      await mongoAdapter.disconnect();
+    }
+  } else {
+    console.log(`\u23ED\uFE0F  ${t(useFieldEnvRefs ? "init.skip_test_env_ref" : "init.skip_test")}`);
+  }
+  if (isV2Init) {
+    await writeV2InitConfig(configPath, connectionName, mongoConfig, permission, options.envFile);
+    return;
+  }
+  const newConfig = configModule.merge(existingConfig, {
+    connection: mongoConfig,
+    permission
+  });
+  const globalConfig = isGlobalConfigPath(configPath);
+  const storagePath = globalConfig ? configPath : getProjectStoragePath(configPath);
+  await mkdir5(storagePath, { recursive: true });
+  await configModule.write(storagePath, newConfig);
+  if (!globalConfig) {
+    await migrateLegacyProjectEnvLocal(configPath, storagePath);
+    await writeProjectBinding(configPath, storagePath);
+  }
+  console.log(t("init.config_saved"));
+}
+var VALID_PERMISSIONS;
+var init_init_mongodb = __esm(() => {
+  init_message_loader();
+  init_config();
+  init_prompts();
+  init_adapters();
+  init_config_binding();
+  init_init_shared();
+  VALID_PERMISSIONS = ["query-only", "read-write", "data-admin", "admin"];
+});
+
+// src/commands/init.ts
+import { join as join15 } from "path";
+import { mkdir as mkdir6 } from "fs/promises";
+async function handleRemove(configPath, name2) {
+  const storagePath = await resolveConfigStoragePath(configPath);
+  const configFile = Bun.file(join15(storagePath, "config.json"));
+  if (!await configFile.exists()) {
+    throw new Error(t("init.config_not_found"));
+  }
+  const raw = JSON.parse(await configFile.text());
+  if (detectConfigVersion(raw) !== 2) {
+    throw new Error(t("init.requires_v2_remove"));
+  }
+  const config = await readV2Config(storagePath);
+  if (!config.connections[name2]) {
+    throw new Error(t_vars("init.connection_not_found", { name: name2 }));
+  }
+  const connectionCount = Object.keys(config.connections).length;
+  if (connectionCount <= 1) {
+    throw new Error(t("init.cannot_remove_last"));
+  }
+  const remaining = Object.fromEntries(Object.entries(config.connections).filter(([connectionName]) => connectionName !== name2));
+  const newDefault = config.default === name2 ? Object.keys(remaining)[0] : config.default;
+  const updated = {
+    ...config,
+    default: newDefault,
+    connections: remaining
+  };
+  await writeV2Config(storagePath, updated);
+  if (config.default === name2) {
+    console.log(t_vars("init.connection_removed_switched", { name: name2, newDefault }));
+  } else {
+    console.log(t_vars("init.connection_removed", { name: name2 }));
+  }
+}
+async function handleRename(configPath, renameArg) {
+  const [oldName, newName] = renameArg.split(":");
+  if (!oldName || !newName) {
+    throw new Error(t("init.rename_invalid_format"));
+  }
+  const storagePath = await resolveConfigStoragePath(configPath);
+  const configFile = Bun.file(join15(storagePath, "config.json"));
+  if (!await configFile.exists()) {
+    throw new Error(t("init.config_not_found"));
+  }
+  const raw = JSON.parse(await configFile.text());
+  if (detectConfigVersion(raw) !== 2) {
+    throw new Error(t("init.requires_v2_rename"));
+  }
+  const config = await readV2Config(storagePath);
+  if (!config.connections[oldName]) {
+    throw new Error(t_vars("init.connection_not_found", { name: oldName }));
+  }
+  if (config.connections[newName]) {
+    throw new Error(t_vars("init.connection_already_exists", { name: newName }));
+  }
+  const entries = Object.entries(config.connections).map(([key, value]) => [key === oldName ? newName : key, value]);
+  const updated = {
+    ...config,
+    default: config.default === oldName ? newName : config.default,
+    connections: Object.fromEntries(entries)
+  };
+  await writeV2Config(storagePath, updated);
+  console.log(t_vars("init.connection_renamed", { oldName, newName }));
+}
 async function initCommandHandler(options, command) {
   const configPath = resolveConfigPath(command);
   if (options.remove) {
@@ -26399,7 +26658,7 @@ async function initCommandHandler(options, command) {
         "admin"
       ]);
     }
-    if (!VALID_PERMISSIONS.includes(permission2)) {
+    if (!VALID_PERMISSIONS2.includes(permission2)) {
       throw new Error(t_vars("errors.invalid_permission", { permission: permission2 }));
     }
     const newConfig2 = configModule.merge(existingConfig, {
@@ -26415,7 +26674,7 @@ async function initCommandHandler(options, command) {
       return;
     }
     const storagePath2 = isGlobalConfig ? configPath : getProjectStoragePath(configPath);
-    await mkdir5(storagePath2, { recursive: true });
+    await mkdir6(storagePath2, { recursive: true });
     await configModule.write(storagePath2, newConfig2);
     if (!isGlobalConfig) {
       await migrateLegacyProjectEnvLocal(configPath, storagePath2);
@@ -26454,7 +26713,7 @@ async function initCommandHandler(options, command) {
       "admin"
     ]);
   }
-  if (!VALID_PERMISSIONS.includes(permission)) {
+  if (!VALID_PERMISSIONS2.includes(permission)) {
     throw new Error(t_vars("errors.invalid_permission", { permission }));
   }
   configForWrite = connection;
@@ -26531,7 +26790,7 @@ async function initCommandHandler(options, command) {
     return;
   }
   const storagePath = isGlobalConfig ? configPath : getProjectStoragePath(configPath);
-  await mkdir5(storagePath, { recursive: true });
+  await mkdir6(storagePath, { recursive: true });
   await configModule.write(storagePath, newConfig);
   if (!isGlobalConfig) {
     await migrateLegacyProjectEnvLocal(configPath, storagePath);
@@ -26539,95 +26798,7 @@ async function initCommandHandler(options, command) {
   }
   console.log(t("init.config_saved"));
 }
-async function handleMongoDBInit(ctx) {
-  const { options, configPath, connectionName, isV2Init, existingConfig } = ctx;
-  const isInteractive = options.interactive !== false && process.stdin.isTTY;
-  let mongoUri = options.uri;
-  if (!mongoUri && isInteractive) {
-    const input = await promptUser.text("MongoDB URI (e.g. mongodb://user:pass@host:27017/db?authSource=admin) \u2014 \u7559\u7A7A\u7528 host/port/user/password", "");
-    if (input.trim())
-      mongoUri = input.trim();
-  }
-  let database = options.name || "";
-  if (!database && isInteractive) {
-    database = await promptUser.text("Database name", "testdb");
-  }
-  if (!database && !isInteractive) {
-    throw new Error(t("errors.require_name"));
-  }
-  const authSource = options.authSource || "";
-  const mongoConfig = mongoUri ? {
-    system: "mongodb",
-    uri: mongoUri,
-    database,
-    host: "",
-    port: 27017,
-    user: "",
-    password: ""
-  } : {
-    system: "mongodb",
-    host: options.host || "localhost",
-    port: parseInt(options.port || "27017", 10),
-    user: options.user || "",
-    password: options.password || "",
-    database,
-    ...authSource ? { authSource } : {}
-  };
-  let permission = options.permission || "query-only";
-  if (isInteractive && !options.permission) {
-    permission = await promptUser.select(t("init.prompt_permission"), [
-      "query-only",
-      "read-write",
-      "data-admin",
-      "admin"
-    ]);
-  }
-  if (!VALID_PERMISSIONS.includes(permission)) {
-    throw new Error(t_vars("errors.invalid_permission", { permission }));
-  }
-  const canProceed = await checkOverwrite(configPath, isInteractive, !!options.force);
-  if (!canProceed)
-    return;
-  if (!options.skipTest) {
-    console.log(t("init.connection_testing"));
-    const mongoAdapter = AdapterFactory.createMongoDBAdapter(mongoConfig);
-    try {
-      await mongoAdapter.connect();
-      await mongoAdapter.testConnection();
-      console.log(t("init.connection_success"));
-    } catch (error) {
-      if (error instanceof ConnectionError) {
-        console.error(t_vars("errors.connection_failed", { message: error.message }));
-        console.error(t("init.connection_hints"));
-        error.hints.forEach((hint) => console.error(`  \u2022 ${hint}`));
-        process.exit(1);
-      }
-      throw error;
-    } finally {
-      await mongoAdapter.disconnect();
-    }
-  } else {
-    console.log(`\u23ED\uFE0F  ${t("init.skip_test")}`);
-  }
-  if (isV2Init) {
-    await writeV2InitConfig(configPath, connectionName, mongoConfig, permission, options.envFile);
-    return;
-  }
-  const newConfig = configModule.merge(existingConfig, {
-    connection: mongoConfig,
-    permission
-  });
-  const globalConfig = isGlobalConfigPath(configPath);
-  const storagePath = globalConfig ? configPath : getProjectStoragePath(configPath);
-  await mkdir5(storagePath, { recursive: true });
-  await configModule.write(storagePath, newConfig);
-  if (!globalConfig) {
-    await migrateLegacyProjectEnvLocal(configPath, storagePath);
-    await writeProjectBinding(configPath, storagePath);
-  }
-  console.log(t("init.config_saved"));
-}
-var VALID_PERMISSIONS, initCommand;
+var VALID_PERMISSIONS2, initCommand;
 var init_init = __esm(() => {
   init_esm();
   init_message_loader();
@@ -26638,7 +26809,9 @@ var init_init = __esm(() => {
   init_adapters();
   init_config_path();
   init_config_binding();
-  VALID_PERMISSIONS = ["query-only", "read-write", "data-admin", "admin"];
+  init_init_shared();
+  init_init_mongodb();
+  VALID_PERMISSIONS2 = ["query-only", "read-write", "data-admin", "admin"];
   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, redis, elasticsearch)").option("--cloud-id <id>", "Elasticsearch Cloud ID").option("--api-key <key>", "Elasticsearch API Key").option("--uri <uri>", "MongoDB connection URI (mongodb://user:pass@host:27017/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) => {
     try {
       await initCommandHandler(options, initCommand);
@@ -28906,7 +29079,7 @@ class AtomicFileWriter {
 }
 
 // src/core/schema-writer.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 class SchemaWriter {
   dbcliPath;
@@ -28927,7 +29100,7 @@ class SchemaWriter {
         hotSchemas[item.table] = tableSchema;
       }
     }
-    await this.writer.writeJSON(join15(schemaRoot, "hot-schemas.json"), hotSchemas);
+    await this.writer.writeJSON(join16(schemaRoot, "hot-schemas.json"), hotSchemas);
     const coldGroups = {};
     for (const item of mapping.cold) {
       if (!coldGroups[item.file]) {
@@ -28938,10 +29111,10 @@ class SchemaWriter {
         coldGroups[item.file][item.table] = tableSchema;
       }
     }
-    const coldDir = join15(schemaRoot, "cold");
+    const coldDir = join16(schemaRoot, "cold");
     await this.ensureDir(coldDir);
     for (const [fileName, tables] of Object.entries(coldGroups)) {
-      const filePath = join15(schemaRoot, fileName);
+      const filePath = join16(schemaRoot, fileName);
       await this.writer.writeJSON(filePath, tables);
     }
   }
@@ -29487,8 +29660,8 @@ var init_artifact = __esm(() => {
 });
 
 // src/core/verification/artifact-writer.ts
-import { mkdir as mkdir6, writeFile as writeFile2, link, unlink as unlink4 } from "fs/promises";
-import { join as join16 } from "path";
+import { mkdir as mkdir7, writeFile as writeFile2, link, unlink as unlink4 } from "fs/promises";
+import { join as join17 } from "path";
 function pad(n, len = 2) {
   return String(n).padStart(len, "0");
 }
@@ -29505,9 +29678,9 @@ function verificationArtifactFilename(artifact) {
   return `verification-${timeStamp(artifact.createdAt)}-${shortId(artifact.id)}.json`;
 }
 async function writeVerificationArtifact(storageDir, artifact) {
-  const dir = join16(storageDir, VERIFICATION_DIR_RELATIVE);
-  await mkdir6(dir, { recursive: true });
-  const target = join16(dir, verificationArtifactFilename(artifact));
+  const dir = join17(storageDir, VERIFICATION_DIR_RELATIVE);
+  await mkdir7(dir, { recursive: true });
+  const target = join17(dir, verificationArtifactFilename(artifact));
   const tmp = `${target}.${process.pid}.tmp`;
   try {
     await writeFile2(tmp, JSON.stringify(artifact, null, 2), "utf8");
@@ -29768,7 +29941,7 @@ var init_assert_artifact = __esm(() => {
 
 // src/core/verification/reader.ts
 import { lstat as lstat2, readdir as readdir2, readFile as readFile2 } from "fs/promises";
-import { join as join17, isAbsolute, resolve as resolve4, sep as sep2 } from "path";
+import { join as join18, isAbsolute, resolve as resolve4, sep as sep2 } from "path";
 function isArtifactFilename(name2) {
   return /^verification-.*\.json$/.test(name2);
 }
@@ -29852,7 +30025,7 @@ function validateVerificationArtifact(value) {
   return value;
 }
 async function readVerificationArtifacts(storageRoot) {
-  const storageDir = join17(storageRoot, VERIFICATION_DIR_RELATIVE);
+  const storageDir = join18(storageRoot, VERIFICATION_DIR_RELATIVE);
   let names;
   try {
     names = await readdir2(storageDir);
@@ -29865,7 +30038,7 @@ async function readVerificationArtifacts(storageRoot) {
   const artifacts = [];
   const invalid = [];
   for (const filename of names.filter(isArtifactFilename)) {
-    const path5 = join17(storageDir, filename);
+    const path5 = join18(storageDir, filename);
     try {
       const stats = await lstat2(path5);
       if (!stats.isFile()) {
@@ -30346,7 +30519,7 @@ var init_core = __esm(() => {
 // src/core/audit/lock.ts
 import { hostname } from "os";
 import { dirname as dirname5 } from "path";
-import { mkdir as mkdir7, open as open2, rm } from "fs/promises";
+import { mkdir as mkdir8, open as open2, rm } from "fs/promises";
 
 class AuditLockManager {
   auditFilePath;
@@ -30404,7 +30577,7 @@ class AuditLockManager {
   }
   async tryAcquireLock(operationName) {
     try {
-      await mkdir7(dirname5(this.lockPath), { recursive: true });
+      await mkdir8(dirname5(this.lockPath), { recursive: true });
       const lockFile = Bun.file(this.lockPath);
       if (await lockFile.exists()) {
         const lockContent = await lockFile.json();
@@ -30457,8 +30630,8 @@ var init_rotation = __esm(() => {
 });
 
 // src/core/audit/logger.ts
-import { appendFile, mkdir as mkdir8, readFile as readFile3, stat as stat2 } from "fs/promises";
-import { join as join18 } from "path";
+import { appendFile, mkdir as mkdir9, readFile as readFile3, stat as stat2 } from "fs/promises";
+import { join as join19 } from "path";
 import { randomUUID as randomUUID3 } from "crypto";
 
 class AuditLogger {
@@ -30484,8 +30657,8 @@ class AuditLogger {
     this.enabled = opts.enabled;
     this.maxBytes = opts.rotation.maxBytes;
     this.maxEntries = opts.rotation.maxEntries;
-    this.auditDir = join18(opts.storagePath, ".dbcli", "audit");
-    this.auditFilePath = join18(this.auditDir, `${opts.connectionName}.jsonl`);
+    this.auditDir = join19(opts.storagePath, ".dbcli", "audit");
+    this.auditFilePath = join19(this.auditDir, `${opts.connectionName}.jsonl`);
     this.previousFilePath = `${this.auditFilePath}.1`;
     this.sessionIdService = opts.sessionIdService;
     this.lockManager = opts.lockManager ?? new AuditLockManager(this.auditFilePath);
@@ -30506,7 +30679,7 @@ class AuditLogger {
     try {
       const sessionId = await this.sessionIdService.resolve();
       this.cachedSessionId = sessionId;
-      await mkdir8(this.auditDir, { recursive: true });
+      await mkdir9(this.auditDir, { recursive: true });
       if (!this.writerInitialized) {
         await this.syncCountersFromDisk();
         this.writerInitialized = true;
@@ -30611,15 +30784,15 @@ var init_logger2 = __esm(() => {
 });
 
 // src/core/audit/session-id.ts
-import { mkdir as mkdir9, readFile as readFile4, rename as rename4, stat as stat3, writeFile as writeFile3 } from "fs/promises";
+import { mkdir as mkdir10, readFile as readFile4, rename as rename4, stat as stat3, writeFile as writeFile3 } from "fs/promises";
 import { randomBytes as randomBytes2 } from "crypto";
-import { dirname as dirname6, join as join19 } from "path";
+import { dirname as dirname6, join as join20 } from "path";
 function generateSessionId(pid, nowMs) {
   const random = randomBytes2(3).toString("hex");
   return `${pid}-${nowMs}-${random}`;
 }
 async function readSessionIdFile(storagePath) {
-  const target = join19(storagePath, LAST_SESSION_ID_RELATIVE);
+  const target = join20(storagePath, LAST_SESSION_ID_RELATIVE);
   try {
     await stat3(target);
   } catch {
@@ -30641,10 +30814,10 @@ async function readSessionIdFile(storagePath) {
   }
 }
 async function writeSessionIdFile(storagePath, payload) {
-  const target = join19(storagePath, LAST_SESSION_ID_RELATIVE);
+  const target = join20(storagePath, LAST_SESSION_ID_RELATIVE);
   const tmp = `${target}.tmp`;
   try {
-    await mkdir9(dirname6(target), { recursive: true });
+    await mkdir10(dirname6(target), { recursive: true });
     await writeFile3(tmp, JSON.stringify(payload, null, 2), "utf8");
     await rename4(tmp, target);
   } catch {}
@@ -32373,14 +32546,14 @@ var init_render_markdown = __esm(() => {
 });
 
 // src/core/recovery/last-envelope.ts
-import { writeFile as writeFile4, readFile as readFile5, rename as rename5, mkdir as mkdir10, stat as stat4 } from "fs/promises";
-import { dirname as dirname7, join as join20 } from "path";
+import { writeFile as writeFile4, readFile as readFile5, rename as rename5, mkdir as mkdir11, stat as stat4 } from "fs/promises";
+import { dirname as dirname7, join as join21 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
 function sanitizeCommandSummary(argv) {
   return redactArgv(argv);
 }
 async function writeLastEnvelope(cwd, envelope, argv, now = () => new Date, id = randomUUID4(), auditRef) {
-  const target = join20(cwd, LAST_ENVELOPE_PATH);
+  const target = join21(cwd, LAST_ENVELOPE_PATH);
   const tmp = `${target}.tmp`;
   const payload = {
     schemaVersion: 1,
@@ -32392,13 +32565,13 @@ async function writeLastEnvelope(cwd, envelope, argv, now = () => new Date, id =
     envelope
   };
   try {
-    await mkdir10(dirname7(target), { recursive: true });
+    await mkdir11(dirname7(target), { recursive: true });
     await writeFile4(tmp, JSON.stringify(payload, null, 2), "utf8");
     await rename5(tmp, target);
   } catch {}
 }
 async function readLastEnvelope(cwd) {
-  const target = join20(cwd, LAST_ENVELOPE_PATH);
+  const target = join21(cwd, LAST_ENVELOPE_PATH);
   try {
     await stat4(target);
   } catch {
@@ -32412,7 +32585,7 @@ async function readLastEnvelope(cwd) {
   }
 }
 async function readLastEnvelopeRaw(cwd) {
-  const target = join20(cwd, LAST_ENVELOPE_PATH);
+  const target = join21(cwd, LAST_ENVELOPE_PATH);
   try {
     await stat4(target);
   } catch {
@@ -32437,7 +32610,7 @@ var init_last_envelope = __esm(() => {
 
 // src/core/recovery/emit.ts
 import { writeFileSync as writeFileSync2, mkdirSync, renameSync, writeSync } from "fs";
-import { dirname as dirname8, join as join21 } from "path";
+import { dirname as dirname8, join as join22 } from "path";
 import { randomUUID as randomUUID5 } from "crypto";
 function emitRecoveryEnvelope(error, ctx, options = {}) {
   const envelope = classifyError(error, ctx);
@@ -32454,7 +32627,7 @@ function buildArgvFromProcess() {
   return ["dbcli", ...userArgs];
 }
 function writeLastEnvelopeSync(cwd, envelope, argv, id, auditRef) {
-  const target = join21(cwd, LAST_ENVELOPE_PATH);
+  const target = join22(cwd, LAST_ENVELOPE_PATH);
   const tmp = `${target}.tmp`;
   const payload = {
     schemaVersion: 1,
@@ -34387,7 +34560,7 @@ var init_query_size_guard = __esm(() => {
 // src/commands/query.ts
 import crypto3 from "crypto";
 import { tmpdir } from "os";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function requireSqlConnection2(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
     throw new Error(`This command requires a SQL connection, got: ${connection.system}`);
@@ -34698,7 +34871,7 @@ async function presentSingleResult(query, options, execution, tableCellLimit) {
       } : {}
     });
     if (options.ui) {
-      const tempPath = join22(tmpdir(), `dbcli-query-${Date.now()}.html`);
+      const tempPath = join23(tmpdir(), `dbcli-query-${Date.now()}.html`);
       await Bun.write(tempPath, html);
       await openInBrowser(tempPath);
     } else {
@@ -35458,7 +35631,7 @@ __export(exports_q_mongo, {
   qMongoBranch: () => qMongoBranch
 });
 import { tmpdir as tmpdir2 } from "os";
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 async function qMongoBranch(snippet, prepared, options, config) {
   const collection = options.collection ?? prepared.execHints?.collection;
   if (!collection) {
@@ -35490,7 +35663,7 @@ async function qMongoBranch(snippet, prepared, options, config) {
         ...securityNotification ? { securityNotification } : {}
       });
       if (options.ui) {
-        const tempPath = join23(tmpdir2(), `dbcli-report-${Date.now()}.html`);
+        const tempPath = join24(tmpdir2(), `dbcli-report-${Date.now()}.html`);
         await Bun.write(tempPath, html);
         await openInBrowser(tempPath);
       } else {
@@ -35531,7 +35704,7 @@ var init_q_mongo = __esm(() => {
 // src/commands/q.ts
 import crypto4 from "crypto";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 function formatDryRun(input) {
   const lines = ["Dry-run preview (no execution):"];
   if (input.family === "es") {
@@ -35632,7 +35805,7 @@ async function qCommand(name2, options, command) {
           ...securityNotification ? { securityNotification } : {}
         });
         if (options.ui) {
-          const tempPath = join24(tmpdir3(), `dbcli-report-${Date.now()}.html`);
+          const tempPath = join25(tmpdir3(), `dbcli-report-${Date.now()}.html`);
           await Bun.write(tempPath, html);
           await openInBrowser(tempPath);
         } else {
@@ -36081,7 +36254,7 @@ var exports_queries_rename = {};
 __export(exports_queries_rename, {
   queriesRename: () => queriesRename
 });
-import { rename as rename6, mkdir as mkdir11 } from "fs/promises";
+import { rename as rename6, mkdir as mkdir12 } from "fs/promises";
 import { dirname as dirname9 } from "path";
 async function queriesRename(oldName, newName, options = {}) {
   if (!oldName.startsWith("@") || !newName.startsWith("@")) {
@@ -36103,7 +36276,7 @@ async function queriesRename(oldName, newName, options = {}) {
   for (const v of local) {
     const dst = snippetKeyToFile(cwd, newName, "local");
     const dstWithSuffix = preserveEngineSuffix(v.query.file, dst);
-    await mkdir11(dirname9(dstWithSuffix), { recursive: true });
+    await mkdir12(dirname9(dstWithSuffix), { recursive: true });
     await rename6(v.query.file, dstWithSuffix);
     await rewriteFrontmatterName(dstWithSuffix, newName.slice(1));
     console.log(`renamed ${v.query.file} \u2192 ${dstWithSuffix}`);
@@ -36129,7 +36302,7 @@ var exports_queries_copy = {};
 __export(exports_queries_copy, {
   queriesCopy: () => queriesCopy
 });
-import { mkdir as mkdir12, copyFile } from "fs/promises";
+import { mkdir as mkdir13, copyFile } from "fs/promises";
 import { dirname as dirname10, basename as basename4 } from "path";
 async function queriesCopy(src, dst, options = {}) {
   if (!src.startsWith("@") || !dst.startsWith("@")) {
@@ -36148,7 +36321,7 @@ async function queriesCopy(src, dst, options = {}) {
   }
   for (const v of variants) {
     const dstFile = mapEngineSuffix(v.query.file, snippetKeyToFile(cwd, dst, "local"));
-    await mkdir12(dirname10(dstFile), { recursive: true });
+    await mkdir13(dirname10(dstFile), { recursive: true });
     await copyFile(v.query.file, dstFile);
     console.log(`copied ${v.query.file} \u2192 ${dstFile}`);
   }
@@ -36166,8 +36339,8 @@ var exports_queries_import = {};
 __export(exports_queries_import, {
   queriesImport: () => queriesImport
 });
-import { stat as stat6, mkdir as mkdir13, copyFile as copyFile2 } from "fs/promises";
-import { basename as basename5, join as join25, extname as extname2 } from "path";
+import { stat as stat6, mkdir as mkdir14, copyFile as copyFile2 } from "fs/promises";
+import { basename as basename5, join as join26, extname as extname2 } from "path";
 async function queriesImport(filePath, options = {}) {
   const cwd = options.cwd ?? process.cwd();
   if (extname2(filePath) !== ".sql") {
@@ -36178,9 +36351,9 @@ async function queriesImport(filePath, options = {}) {
   const baseName = options.as ? options.as.replace(/^@/, "") : basename5(filePath, ".sql").replace(/\.(postgres|mysql)$/, "");
   const key = "@" + baseName;
   parseSavedQuery({ key, file: filePath, source: "local", text: text2 });
-  const targetDir = join25(cwd, ".dbcli/queries");
-  await mkdir13(targetDir, { recursive: true });
-  const target = join25(targetDir, basename5(filePath));
+  const targetDir = join26(cwd, ".dbcli/queries");
+  await mkdir14(targetDir, { recursive: true });
+  const target = join26(targetDir, basename5(filePath));
   if (await Bun.file(target).exists()) {
     if (!options.force) {
       const ok = await dist_default6({ message: `Overwrite ${target}?`, default: false });
@@ -36233,7 +36406,7 @@ var init_queries_export = __esm(() => {
 });
 
 // src/commands/queries.ts
-import { mkdir as mkdir14, writeFile as writeFile6 } from "fs/promises";
+import { mkdir as mkdir15, writeFile as writeFile6 } from "fs/promises";
 import { dirname as dirname11 } from "path";
 import { spawn as spawn2 } from "child_process";
 async function deriveEngine(command) {
@@ -36342,7 +36515,7 @@ async function queriesNew(name2, options) {
     process.exit(1);
     return;
   }
-  await mkdir14(dirname11(file), { recursive: true });
+  await mkdir15(dirname11(file), { recursive: true });
   await writeFile6(file, scaffold(name2), "utf8");
   console.log(`Created ${file}`);
   if (source === "shared")
@@ -39064,15 +39237,15 @@ var init_types6 = __esm(() => {
 });
 
 // src/core/agent-tasks/task-paths.ts
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 function resolveBuiltinDir2() {
   return packageAssetPath("tasks");
 }
 function resolveAgentTaskDirs(workspaceRoot) {
   return {
     builtinDir: resolveBuiltinDir2(),
-    sharedDir: join26(workspaceRoot, ".dbcli-shared", "tasks"),
-    localDir: join26(workspaceRoot, ".dbcli", "tasks")
+    sharedDir: join27(workspaceRoot, ".dbcli-shared", "tasks"),
+    localDir: join27(workspaceRoot, ".dbcli", "tasks")
   };
 }
 var init_task_paths = __esm(() => {
@@ -39219,7 +39392,7 @@ var init_parser2 = __esm(() => {
 
 // src/core/agent-tasks/loader.ts
 import { readdir as readdir3 } from "fs/promises";
-import { join as join27, relative as relative2, sep as sep4 } from "path";
+import { join as join28, relative as relative2, sep as sep4 } from "path";
 async function loadAgentTasks(opts, flags) {
   const errors3 = [];
   const builtin = await walkAndParse2(opts.builtinDir, "builtin", errors3);
@@ -39276,7 +39449,7 @@ async function safeCollectMd(root) {
       return;
     }
     for (const e of entries) {
-      const full = join27(dir, e.name);
+      const full = join28(dir, e.name);
       if (e.isDirectory())
         await walk(full);
       else
@@ -92641,7 +92814,7 @@ var init_collect_snippets = __esm(() => {
 });
 
 // src/core/inspect/collect-schema-cache.ts
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 async function collectSchemaCache(opts) {
   const warnings = [];
   if (opts.system && !SQL_SYSTEMS2.includes(opts.system)) {
@@ -92651,7 +92824,7 @@ async function collectSchemaCache(opts) {
     };
   }
   const root = resolveSchemaPath(opts.dbcliPath, opts.connectionName);
-  const indexPath = join28(root, "index.json");
+  const indexPath = join29(root, "index.json");
   const file = Bun.file(indexPath);
   if (!await file.exists()) {
     return { section: { available: false }, warnings };
@@ -92921,7 +93094,7 @@ function buildHints(snap, ctx = {}) {
 }
 
 // src/core/inspect/collector.ts
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 async function collectInspect(opts) {
   const warnings = [];
   let config = null;
@@ -93005,7 +93178,7 @@ async function collectInspect(opts) {
   return { ...snapWithoutSuggestions, suggestedCommands, hints, warnings };
 }
 async function hasConfig(configPath) {
-  if (await Bun.file(join29(configPath, "config.json")).exists())
+  if (await Bun.file(join30(configPath, "config.json")).exists())
     return true;
   if (await Bun.file(configPath).exists()) {
     const stat7 = await Bun.file(configPath).stat().catch(() => null);
@@ -96094,9 +96267,9 @@ function relationBindings(statement) {
   const bindings = [];
   for (const item of statement.from) {
     const source = item;
-    const join30 = typeof source.join === "string" ? source.join.toUpperCase() : "";
-    const nullExtendsPrevious = join30.startsWith("RIGHT") || join30.startsWith("FULL");
-    const nullExtendsCurrent = join30.startsWith("LEFT") || join30.startsWith("FULL");
+    const join31 = typeof source.join === "string" ? source.join.toUpperCase() : "";
+    const nullExtendsPrevious = join31.startsWith("RIGHT") || join31.startsWith("FULL");
+    const nullExtendsCurrent = join31.startsWith("LEFT") || join31.startsWith("FULL");
     if (nullExtendsPrevious) {
       for (const binding of bindings)
         binding.nullExtended = true;
@@ -97412,7 +97585,7 @@ var init_serializer = __esm(() => {
 });
 
 // src/commands/snapshot.ts
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 function requireSqlConnection9(connection) {
   if (!SQL_SYSTEMS6.includes(connection.system)) {
     throw new Error(`snapshot currently supports SQL engines only, got: ${connection.system}`);
@@ -97425,7 +97598,7 @@ function pad2(n) {
 function defaultSnapshotPath() {
   const d = new Date;
   const stamp = `${d.getFullYear()}${pad2(d.getMonth() + 1)}${pad2(d.getDate())}-${pad2(d.getHours())}${pad2(d.getMinutes())}${pad2(d.getSeconds())}`;
-  return join30(".dbcli", "snapshots", `snap-${stamp}.json`);
+  return join31(".dbcli", "snapshots", `snap-${stamp}.json`);
 }
 var ALLOWED_FORMATS12, SQL_SYSTEMS6, snapshotCommand;
 var init_snapshot = __esm(() => {
@@ -100414,12 +100587,12 @@ Verification artifact: ${verificationArtifactPath}`);
 
 // src/commands/audit.ts
 import { rm as rm3, stat as stat8 } from "fs/promises";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 async function resolveAuditPaths(configPath, config) {
   const storagePath = await resolveConfigStoragePath(configPath);
   const connName = config.effectiveConnectionName || getGlobalConnectionName() || "default";
-  const auditDir = join31(storagePath, ".dbcli", "audit");
-  const auditFile = join31(auditDir, `${connName}.jsonl`);
+  const auditDir = join32(storagePath, ".dbcli", "audit");
+  const auditFile = join32(auditDir, `${connName}.jsonl`);
   return { auditDir, connectionName: connName, auditFile };
 }
 function isAuditDisabled(config) {
@@ -100847,7 +101020,7 @@ var init_audit = __esm(() => {
 });
 
 // src/utils/runtime-info.ts
-import { join as join32, normalize, relative as relative3, sep as sep5 } from "path";
+import { join as join33, normalize, relative as relative3, sep as sep5 } from "path";
 function normalized(path6) {
   return normalize(path6).replaceAll("\\", "/");
 }
@@ -100873,7 +101046,7 @@ async function collectRuntimeInfo(packageVersion) {
   const launcherPath = process.argv[1] ?? "unknown";
   let packageFileVersion = null;
   try {
-    const packageFile = Bun.file(join32(packageRoot, "package.json"));
+    const packageFile = Bun.file(join33(packageRoot, "package.json"));
     if (await packageFile.exists()) {
       const parsed = await packageFile.json();
       if (typeof parsed.version === "string" && parsed.version.length > 0) {
@@ -100901,7 +101074,7 @@ var init_runtime_info = __esm(() => {
 });
 
 // src/commands/doctor.ts
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 import { resolveSrv as resolveSrv2 } from "dns/promises";
 function requireSqlConnection12(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
@@ -101013,13 +101186,33 @@ 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);
+  const srvProbeUri = mongoUriString ?? (mongoConn?.srv === true && typeof mongoConn.host === "string" && mongoConn.host ? `mongodb+srv://${mongoConn.host}/` : undefined);
+  const srvCheck = await runDoctorChecks.checkMongoSrvConnectivity(srvProbeUri);
   if (srvCheck) {
     results.push(srvCheck);
     if (srvCheck.status === "error") {
       return results;
     }
   }
+  if (mongoConn) {
+    const hasFieldConfig = Boolean(mongoConn.host) || Boolean(mongoConn.user);
+    if (mongoUriString && hasFieldConfig) {
+      results.push({
+        group: "Connection & Data",
+        label: "MongoDB connection fields",
+        status: "warn",
+        message: "Both uri and per-field settings (host/user) are present; uri takes precedence and the per-field values are ignored."
+      });
+    }
+    if (mongoConn.srv === true && typeof mongoConn.port === "number" && mongoConn.port !== 27017) {
+      results.push({
+        group: "Connection & Data",
+        label: "MongoDB SRV port",
+        status: "warn",
+        message: `srv is enabled, so port ${mongoConn.port} is ignored \u2014 SRV records carry their own ports.`
+      });
+    }
+  }
   const adapter = AdapterFactory.createMongoDBAdapter(config.connection);
   try {
     await adapter.connect();
@@ -101217,7 +101410,7 @@ var init_doctor = __esm(() => {
       }
     },
     async checkConfigExists(configPath, existsFn) {
-      const exists = existsFn ? await existsFn(configPath) : await Bun.file(configPath).exists() || await Bun.file(join33(configPath, "config.json")).exists();
+      const exists = existsFn ? await existsFn(configPath) : await Bun.file(configPath).exists() || await Bun.file(join34(configPath, "config.json")).exists();
       return {
         group: "Configuration",
         label: "Config exists",
@@ -101301,7 +101494,17 @@ var init_doctor = __esm(() => {
       if (!uri || !uri.startsWith("mongodb+srv://")) {
         return null;
       }
-      const url = new URL(uri);
+      let url;
+      try {
+        url = new URL(uri);
+      } catch {
+        return {
+          group: "Environment",
+          label: "MongoDB SRV lookup",
+          status: "error",
+          message: `Cannot parse ${uri} as a connection string \u2014 check the host value`
+        };
+      }
       const srvName = `_mongodb._tcp.${url.hostname}`;
       const resolveSrvFn = deps.resolveSrvFn ?? resolveSrv2;
       const fetchFn = deps.fetchFn ?? fetch;
@@ -101384,7 +101587,7 @@ var init_doctor = __esm(() => {
     async checkV2Config(configPath) {
       const results = [];
       const storagePath = await resolveConfigStoragePath(configPath);
-      const configFile = Bun.file(join33(storagePath, "config.json"));
+      const configFile = Bun.file(join34(storagePath, "config.json"));
       if (!await configFile.exists())
         return results;
       let raw;
@@ -101424,7 +101627,7 @@ var init_doctor = __esm(() => {
       }
       for (const [name2, conn] of Object.entries(config.connections)) {
         if (conn.envFile) {
-          const envPath = join33(storagePath, conn.envFile);
+          const envPath = join34(storagePath, conn.envFile);
           const exists = await Bun.file(envPath).exists();
           results.push({
             group: "Configuration",
@@ -101534,7 +101737,7 @@ var init_doctor = __esm(() => {
             }
             try {
               const schemaConnName = await getSchemaIsolationConnectionName(configPath);
-              const indexPath = join33(resolveSchemaPath(storagePath, schemaConnName), "index.json");
+              const indexPath = join34(resolveSchemaPath(storagePath, schemaConnName), "index.json");
               const indexFile = Bun.file(indexPath);
               let indexParsed = null;
               if (await indexFile.exists()) {
@@ -101643,9 +101846,9 @@ function flattenCommandTree(root) {
 }
 
 // src/commands/completion.ts
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 import { homedir as homedir3 } from "os";
-import { mkdir as mkdir15 } from "fs/promises";
+import { mkdir as mkdir16 } from "fs/promises";
 function resolveHome() {
   return process.env.HOME ?? homedir3();
 }
@@ -101895,11 +102098,11 @@ function getInstallPath2(shell) {
   const home = resolveHome();
   switch (shell) {
     case "bash":
-      return join34(home, ".bashrc");
+      return join35(home, ".bashrc");
     case "zsh":
-      return join34(home, ".zshrc");
+      return join35(home, ".zshrc");
     case "fish":
-      return join34(home, ".config", "fish", "completions", "dbcli.fish");
+      return join35(home, ".config", "fish", "completions", "dbcli.fish");
     default:
       throw new Error(`Unsupported shell: ${shell}. Supported: bash, zsh, fish`);
   }
@@ -101917,8 +102120,8 @@ function detectShell() {
 async function installCompletion(shell, script) {
   const targetPath = getInstallPath2(shell);
   if (shell === "fish") {
-    const dir = join34(resolveHome(), ".config", "fish", "completions");
-    await mkdir15(dir, { recursive: true });
+    const dir = join35(resolveHome(), ".config", "fish", "completions");
+    await mkdir16(dir, { recursive: true });
     await Bun.file(targetPath).write(script);
     console.log(colors.success(`\u2713 Fish completion installed to ${targetPath}`));
     return;
@@ -102902,7 +103105,7 @@ var init_command_registry = __esm(() => {
 
 // src/commands/shell.ts
 import { createInterface as createInterface3 } from "readline";
-import { join as join35 } from "path";
+import { join as join36 } from "path";
 import { homedir as homedir4 } from "os";
 function requireSqlConnection13(connection) {
   if (!["postgresql", "mysql", "mariadb"].includes(connection.system)) {
@@ -103096,7 +103299,7 @@ var init_shell3 = __esm(() => {
   init_message_loader();
   init_es_shell();
   import_picocolors5 = __toESM(require_picocolors(), 1);
-  HISTORY_PATH = join35(homedir4(), ".dbcli_history");
+  HISTORY_PATH = join36(homedir4(), ".dbcli_history");
   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);
@@ -103941,7 +104144,7 @@ var init_migrate = __esm(() => {
 });
 
 // src/commands/use.ts
-import { join as join36 } from "path";
+import { join as join37 } from "path";
 async function switchDefault(configPath, name2, config, options = {}) {
   const connection = config.connections[name2];
   if (!connection) {
@@ -103984,7 +104187,7 @@ function listConnectionIdentities(config) {
 }
 async function ensureV2Config(configPath) {
   const storagePath = await resolveConfigStoragePath(configPath);
-  const configFile = Bun.file(join36(storagePath, "config.json"));
+  const configFile = Bun.file(join37(storagePath, "config.json"));
   const legacyFile = Bun.file(configPath);
   if (!await configFile.exists() && !await legacyFile.exists()) {
     throw new ConfigError(t("init.config_not_found"));
@@ -104142,7 +104345,7 @@ var init_sql_metadata = __esm(() => {
 });
 
 // src/proxy/events.ts
-import { appendFile as appendFile2, mkdir as mkdir16, readFile as readFile8, stat as stat9 } from "fs/promises";
+import { appendFile as appendFile2, mkdir as mkdir17, readFile as readFile8, stat as stat9 } from "fs/promises";
 import { dirname as dirname13 } from "path";
 function hasSql(e) {
   return e.type === "query_observed" || e.type === "query_completed" || e.type === "query_errored";
@@ -104182,7 +104385,7 @@ class EventWriter {
   }
   async writeInternal(event) {
     if (!this.dirEnsured) {
-      await mkdir16(dirname13(this.path), { recursive: true });
+      await mkdir17(dirname13(this.path), { recursive: true });
       this.dirEnsured = true;
     }
     if (!this.initialized) {
@@ -105111,7 +105314,7 @@ function renderAnalysisText(report, top) {
 }
 
 // src/commands/proxy.ts
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 function parseHostPort(value) {
   const idx = value.lastIndexOf(":");
   if (idx <= 0 || idx === value.length - 1) {
@@ -105174,7 +105377,7 @@ async function runProxy(subcommandEngine, options, command) {
       target: options.target,
       connection
     });
-    const eventsPath = options.events ?? join37(".dbcli", "proxy", "events.jsonl");
+    const eventsPath = options.events ?? join38(".dbcli", "proxy", "events.jsonl");
     const slowMs = Number(options.slowMs ?? 1000);
     if (!Number.isFinite(slowMs) || slowMs < 0) {
       throw new Error(`Invalid --slow-ms "${options.slowMs}". Expected a non-negative number`);
@@ -105223,7 +105426,7 @@ async function runProxy(subcommandEngine, options, command) {
   }
 }
 function addCommonOptions(cmd) {
-  return cmd.option("--listen <host:port>", "Local proxy listen address (required)").option("--target <host:port>", "Upstream DB target (optional when config provides host/port)").option("--events <path>", "Event JSONL path", join37(".dbcli", "proxy", "events.jsonl")).option("--slow-ms <number>", "Threshold (ms); queries at/above it get slow:true in the event + a terminal warning", "1000").option("--redact <mode>", "SQL redaction: none | literals", "none").option("--format <format>", "Runtime status output: text | json", "text");
+  return cmd.option("--listen <host:port>", "Local proxy listen address (required)").option("--target <host:port>", "Upstream DB target (optional when config provides host/port)").option("--events <path>", "Event JSONL path", join38(".dbcli", "proxy", "events.jsonl")).option("--slow-ms <number>", "Threshold (ms); queries at/above it get slow:true in the event + a terminal warning", "1000").option("--redact <mode>", "SQL redaction: none | literals", "none").option("--format <format>", "Runtime status output: text | json", "text");
 }
 function parseNonNegInt(value, flag, fallback) {
   if (value === undefined)
@@ -105241,7 +105444,7 @@ async function runAnalyze(options) {
     const top = parseNonNegInt(options.top, "top", 20);
     const slowMs = parseNonNegInt(options.slowMs, "slow-ms", 1000);
     const nPlusOne = parseNonNegInt(options.nPlusOne, "n-plus-one", 10);
-    const eventsPath = options.events ?? join37(".dbcli", "proxy", "events.jsonl");
+    const eventsPath = options.events ?? join38(".dbcli", "proxy", "events.jsonl");
     const { events, malformedLines, files } = await readEvents(eventsPath, {
       includeRotated: options.includeRotated !== false
     });
@@ -105288,7 +105491,7 @@ var init_proxy = __esm(() => {
     });
   }
   ANALYZE_FORMATS = ["json", "text"];
-  proxyCommand.command("analyze").description("Analyze a proxy event log offline (no DB connection)").option("--events <path>", "Event JSONL path", join37(".dbcli", "proxy", "events.jsonl")).option("--format <format>", "Output format: json | text", "json").option("--top <number>", "Rows shown in text + suggestedCommands depth", "20").option("--slow-ms <number>", "Slow-query threshold (ms) for slowCount", "1000").option("--n-plus-one <number>", "Min repeats per (session,fingerprint) to flag N+1", "10").option("--no-include-rotated", "Do not merge the rotated <events>.1 segment").action(async (options) => {
+  proxyCommand.command("analyze").description("Analyze a proxy event log offline (no DB connection)").option("--events <path>", "Event JSONL path", join38(".dbcli", "proxy", "events.jsonl")).option("--format <format>", "Output format: json | text", "json").option("--top <number>", "Rows shown in text + suggestedCommands depth", "20").option("--slow-ms <number>", "Slow-query threshold (ms) for slowCount", "1000").option("--n-plus-one <number>", "Min repeats per (session,fingerprint) to flag N+1", "10").option("--no-include-rotated", "Do not merge the rotated <events>.1 segment").action(async (options) => {
     await runAnalyze(options);
   });
   addCommonOptions(proxyCommand).action(async (options, command) => {
@@ -105497,7 +105700,7 @@ var init_backfill_artifact = __esm(() => {
 
 // src/commands/backfill.ts
 import { dirname as dirname14, resolve as resolve9 } from "path";
-import { mkdir as mkdir17 } from "fs/promises";
+import { mkdir as mkdir18 } from "fs/promises";
 function identityFor(config, name2) {
   const connection = config.connections[name2];
   if (!connection) {
@@ -105547,7 +105750,7 @@ var init_backfill = __esm(() => {
       return;
     }
     const out = resolve9(options.out ?? `.dbcli/backfills/${artifact2.source.sha256.slice(0, 12)}.json`);
-    await mkdir17(dirname14(out), { recursive: true });
+    await mkdir18(dirname14(out), { recursive: true });
     await Bun.write(out, JSON.stringify(artifact2, null, 2) + `
 `);
     console.log(JSON.stringify({ path: out, artifact: artifact2 }, null, 2));
@@ -105862,7 +106065,7 @@ async function claimUpdateHint(configPath, kind, sessionKey, value) {
 // src/cli.ts
 init_program();
 init_cli_error();
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 import { writeSync as writeSync2 } from "fs";
 import { format } from "util";
 function installSynchronousRedirectedStdout() {
@@ -105990,7 +106193,7 @@ program2.hook("preAction", (thisCommand, actionCommand) => {
       try {
         let cache = null;
         try {
-          const cacheFile = Bun.file(join38(configPath, "version-check.json"));
+          const cacheFile = Bun.file(join39(configPath, "version-check.json"));
           if (await cacheFile.exists()) {
             cache = await cacheFile.json();
           }