@keynv/cli 0.1.0-rc.23 → 0.1.0-rc.25

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { createRequire } from 'module';
 import * as nodePath from 'path';
-import { relative, join, isAbsolute, resolve, sep, dirname, basename } from 'path';
+import { relative, join, isAbsolute, resolve, dirname, sep, basename } from 'path';
 import { createHash } from 'crypto';
 import { readFileSync, existsSync, writeFileSync, statSync, realpathSync, readdirSync, renameSync, mkdirSync, rmSync, constants as constants$1, lstatSync } from 'fs';
 import { homedir, hostname, platform } from 'os';
@@ -1070,7 +1070,7 @@ var require_lib = __commonJS({
 var VERSION, AGENT;
 var init_version = __esm({
   "src/version.ts"() {
-    VERSION = "0.1.0-rc.23" ;
+    VERSION = "0.1.0-rc.25" ;
     AGENT = `keynv-cli/${VERSION}`;
   }
 });
@@ -1156,7 +1156,7 @@ function findAliasesInArgv(argv2) {
   }
   return result;
 }
-function replaceAliases(text, resolve4, opts = {}) {
+function replaceAliases(text, resolve6, opts = {}) {
   if (typeof text !== "string" || text.length === 0)
     return text;
   const matches = findAliases(text, opts);
@@ -1167,7 +1167,7 @@ function replaceAliases(text, resolve4, opts = {}) {
     const m = matches[i];
     if (!m)
       continue;
-    const replacement = resolve4(m);
+    const replacement = resolve6(m);
     if (parseAlias(replacement) !== null) {
       throw new Error(`replaceAliases: resolved value for ${m.literal} is itself a valid alias (${replacement}). Circular or misconfigured resolution detected.`);
     }
@@ -6223,12 +6223,12 @@ async function startRpcServer(registry) {
     socket.on("error", () => {
     });
   });
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     server.once("error", reject);
     server.listen(path, () => {
       void chmodIfExists(path, 384).catch(() => {
       });
-      resolve4({
+      resolve6({
         socketPath: path,
         close: () => new Promise((res) => {
           server.close(() => res());
@@ -6290,7 +6290,7 @@ function handleLine(line, socket, registry) {
 async function registerValueWithWatcher(value, timeoutMs = 200) {
   if (value.length === 0) return null;
   const path = socketPath();
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const socket = createConnection(path);
     let buffer = "";
     let settled = false;
@@ -6298,7 +6298,7 @@ async function registerValueWithWatcher(value, timeoutMs = 200) {
       if (settled) return;
       settled = true;
       socket.destroy();
-      resolve4(result);
+      resolve6(result);
     };
     const timer = setTimeout(() => settle(null), timeoutMs);
     socket.once("error", () => {
@@ -6626,20 +6626,30 @@ var init_collision = __esm({
     KEY_RE3 = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/;
   }
 });
-function findProjectRoot(startDir) {
-  const result = walkUp(startDir, (dir) => {
-    for (const marker of PROJECT_MARKERS) {
-      if (existsSync(join(dir, marker))) {
-        return { dir, marker };
-      }
-    }
-    if (existsSync(join(dir, GIT_MARKER))) {
-      return { dir, marker: GIT_MARKER };
-    }
-    return null;
-  });
-  if (!result) return null;
-  return buildRoot(result.dir, result.marker);
+function findProjectRoot(startDir, boundaryDir = homedir()) {
+  const start = resolve(startDir);
+  const boundary = resolve(boundaryDir);
+  let dir = start;
+  for (let i = 0; i < 64; i++) {
+    if (dir === boundary || isAncestorOf(dir, boundary)) break;
+    const marker = markerAt(dir);
+    if (marker) return buildRoot(dir, marker);
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return buildRoot(start, "current directory");
+}
+function markerAt(dir) {
+  for (const marker of PROJECT_MARKERS) {
+    if (existsSync(join(dir, marker))) return marker;
+  }
+  if (existsSync(join(dir, GIT_MARKER))) return GIT_MARKER;
+  return null;
+}
+function isAncestorOf(ancestor, descendant) {
+  const rel = relative(resolve(ancestor), resolve(descendant));
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
 }
 function buildRoot(dir, marker) {
   let suggestedName = basename(dir);
@@ -6671,6 +6681,7 @@ function buildRoot(dir, marker) {
 function findEnvFilesRecursive(rootDir, opts = {}) {
   const maxDepth = Math.max(1, opts.maxDepth ?? DEFAULT_MAX_DEPTH);
   const ignore = opts.ignore ?? IGNORE_DIRS;
+  const limit = Math.max(1, opts.limit ?? DEFAULT_MAX_RESULTS);
   let rootReal;
   try {
     rootReal = realpathSync(rootDir);
@@ -6712,6 +6723,7 @@ function findEnvFilesRecursive(rootDir, opts = {}) {
       if (isFile) {
         if (!ENV_GLOB.test(entry2.name)) continue;
         if (ENV_EXAMPLE.test(entry2.name)) continue;
+        if (ENV_BACKUP_EXCLUDE.test(entry2.name)) continue;
         if (KEYNV_ENV_EXCLUDE.test(entry2.name)) continue;
         const suffixMatch = entry2.name.match(/^\.env\.(.+)$/);
         const suffix = suffixMatch ? suffixMatch[1] : null;
@@ -6725,10 +6737,15 @@ function findEnvFilesRecursive(rootDir, opts = {}) {
           relativeDir,
           containingDir: dir
         });
+        if (hits.length >= limit) {
+          queue.length = 0;
+          break;
+        }
         continue;
       }
       if (isDir && depth + 1 < maxDepth) {
         if (ignore.has(entry2.name)) continue;
+        if (entry2.name.startsWith(".")) continue;
         let realDir;
         try {
           realDir = realpathSync(full);
@@ -6776,10 +6793,9 @@ function suggestedEnvForSuffix(suffix) {
 function hasExistingKeynvEnv(rootDir) {
   return existsSync(join(rootDir, KEYNV_ENV_BASENAME));
 }
-var PROJECT_MARKERS, GIT_MARKER, ENV_GLOB, ENV_EXAMPLE, KEYNV_ENV_BASENAME, KEYNV_ENV_EXCLUDE, IGNORE_DIRS, DEFAULT_MAX_DEPTH;
+var PROJECT_MARKERS, GIT_MARKER, ENV_GLOB, ENV_EXAMPLE, ENV_BACKUP_EXCLUDE, KEYNV_ENV_BASENAME, KEYNV_ENV_EXCLUDE, IGNORE_DIRS, DEFAULT_MAX_DEPTH, DEFAULT_MAX_RESULTS;
 var init_detect = __esm({
   "src/init/detect.ts"() {
-    init_fs();
     PROJECT_MARKERS = [
       "package.json",
       "pyproject.toml",
@@ -6793,6 +6809,7 @@ var init_detect = __esm({
     GIT_MARKER = ".git";
     ENV_GLOB = /^\.env(\.[A-Za-z0-9_-]+)?$/;
     ENV_EXAMPLE = /^\.env\.(example|sample|template|dist|defaults)$/;
+    ENV_BACKUP_EXCLUDE = /^\.env\.backup(-\d{8}-\d{4}(-\d+)?)?$/;
     KEYNV_ENV_BASENAME = ".keynv.env";
     KEYNV_ENV_EXCLUDE = /^\.keynv\.(.+\.)?env$/;
     IGNORE_DIRS = /* @__PURE__ */ new Set([
@@ -6862,6 +6879,7 @@ var init_detect = __esm({
       ".fleet"
     ]);
     DEFAULT_MAX_DEPTH = 5;
+    DEFAULT_MAX_RESULTS = 100;
   }
 });
 function shannonEntropyBits(s) {
@@ -9315,7 +9333,13 @@ async function runInitFlow(client, opts) {
   if (root.packageJsonInvalid) {
     R2.warn(`package.json at ${root.path} is not valid JSON \u2014 script wrapping will be skipped.`);
   }
-  const envFiles = findEnvFilesRecursive(root.path);
+  const atHome = resolve(root.path) === resolve(homedir());
+  if (atHome) {
+    R2.warn(
+      "Running in your home directory \u2014 scanning only this folder, not the whole tree. cd into a project directory for a focused setup."
+    );
+  }
+  const envFiles = findEnvFilesRecursive(root.path, atHome ? { maxDepth: 1 } : void 0);
   const intoExisting = hasExistingKeynvEnv(root.path);
   if (envFiles.length === 0 && !intoExisting) {
     Se(
@@ -9334,22 +9358,40 @@ async function runInitFlow(client, opts) {
     ye("Create your first secret with `keynv secret create`.");
     return { exitCode: 0 };
   }
+  if (envFiles.length >= DEFAULT_MAX_RESULTS) {
+    R2.warn(
+      `Found ${envFiles.length}+ env files \u2014 that usually means keynv is running too high up the tree. Consider cd-ing into a specific project.`
+    );
+  }
   Se(
     [
       `Project root: ${root.path}`,
       `Marker: ${root.marker}`,
-      envFiles.length > 0 ? `Found env files:
-${envFiles.map((f) => `  ${displayName(f)}`).join("\n")}` : "Found env files: (none)",
+      envFiles.length === 0 ? "Found env files: (none)" : envFiles.length === 1 ? `Found env file: ${displayName(envFiles[0])}` : `Found ${envFiles.length} env files`,
       intoExisting ? "Existing root .keynv.env detected \u2014 will merge new entries in." : ""
     ].filter(Boolean).join("\n"),
     "Detected"
   );
+  let selectedFiles = envFiles;
+  if (envFiles.length > 1) {
+    const initialValues = envFiles.filter((f) => f.relativeDir === "").map((f) => f.path);
+    const picked = unwrap(
+      await ve({
+        message: "Which env files do you want to import?",
+        options: envFiles.map((f) => ({ value: f.path, label: displayName(f) })),
+        initialValues,
+        required: true
+      })
+    );
+    const pickedSet = new Set(picked);
+    selectedFiles = envFiles.filter((f) => pickedSet.has(f.path));
+  }
   const projectChoice = await pickOrCreateProject(client, root.suggestedName);
   if (projectChoice === null) {
     me("No project selected.");
     return { exitCode: 130 };
   }
-  const fileMapping = await pickFileEnvMapping(envFiles, projectChoice);
+  const fileMapping = await pickFileEnvMapping(selectedFiles, projectChoice);
   if (fileMapping === null) {
     me("No env mapping selected.");
     return { exitCode: 130 };
@@ -9461,7 +9503,7 @@ ${detail}`
   for (const g of groups.values()) {
     const dirs = [...new Set(g.sources.map((s) => s.source.relativeDir || "<root>"))];
     if (dirs.length > 1) g.label = `${g.label}  (shared by ${dirs.join(", ")})`;
-    else if (envFiles.some((f) => f.relativeDir !== "")) {
+    else if (selectedFiles.some((f) => f.relativeDir !== "")) {
       const only = dirs[0];
       if (only && only !== "<root>") g.label = `${g.label}  [${only}]`;
     }
@@ -9638,7 +9680,7 @@ ${detail}`
       );
     }
   }
-  for (const f of envFiles) {
+  for (const f of selectedFiles) {
     const relSrc = relFromRoot(root.path, f.path);
     try {
       const { renamedTo } = backupEnvFile(f.path);
@@ -9881,7 +9923,7 @@ var init_tty = __esm({
   }
 });
 function sleep(ms) {
-  return new Promise((resolve4) => setTimeout(resolve4, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 async function errorMessage(res, fallback) {
   const text = await res.text();
@@ -10145,16 +10187,16 @@ async function runSecretMenu(client, project, alias2) {
 async function copyToClipboard(value) {
   const platform4 = process.platform;
   const cmd = platform4 === "darwin" ? ["pbcopy", []] : platform4 === "win32" ? ["clip", []] : ["xclip", ["-selection", "clipboard"]];
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     try {
       const child = spawn(cmd[0], cmd[1], {
         stdio: ["pipe", "ignore", "ignore"]
       });
-      child.on("error", () => resolve4(false));
-      child.on("exit", (code) => resolve4(code === 0));
+      child.on("error", () => resolve6(false));
+      child.on("exit", (code) => resolve6(code === 0));
       child.stdin.end(value);
     } catch {
-      resolve4(false);
+      resolve6(false);
     }
   });
 }
@@ -27082,11 +27124,11 @@ var require_connection = __commonJS({
             const config = this.config;
             tracePromise(
               connectChannel,
-              () => new Promise((resolve4, reject) => {
+              () => new Promise((resolve6, reject) => {
                 let onConnect, onError;
                 onConnect = (param) => {
                   this.removeListener("error", onError);
-                  resolve4(param);
+                  resolve6(param);
                 };
                 onError = (err) => {
                   this.removeListener("connect", onConnect);
@@ -27511,9 +27553,9 @@ var require_connection = __commonJS({
         } else if (shouldTrace(queryChannel)) {
           tracePromise(
             queryChannel,
-            () => new Promise((resolve4, reject) => {
+            () => new Promise((resolve6, reject) => {
               cmdQuery.once("error", reject);
-              cmdQuery.once("end", () => resolve4());
+              cmdQuery.once("end", () => resolve6());
               this.addCommand(cmdQuery);
             }),
             () => {
@@ -27660,12 +27702,12 @@ var require_connection = __commonJS({
         } else if (shouldTrace(executeChannel)) {
           tracePromise(
             executeChannel,
-            () => new Promise((resolve4, reject) => {
+            () => new Promise((resolve6, reject) => {
               prepareAndExecute((err) => {
                 executeCommand.emit("error", err);
               });
               executeCommand.once("error", reject);
-              executeCommand.once("end", () => resolve4());
+              executeCommand.once("end", () => resolve6());
             }),
             () => {
               const server = getServerContext(this.config);
@@ -27930,13 +27972,13 @@ var require_capture_local_err = __commonJS({
 var require_make_done_cb = __commonJS({
   "../../node_modules/.pnpm/mysql2@3.22.3_@types+node@24.12.3/node_modules/mysql2/lib/promise/make_done_cb.js"(exports, module) {
     var { applyCapturedStack } = require_capture_local_err();
-    function makeDoneCb(resolve4, reject, stackHolder) {
+    function makeDoneCb(resolve6, reject, stackHolder) {
       return function(err, rows, fields) {
         if (err) {
           applyCapturedStack(err, stackHolder);
           reject(err);
         } else {
-          resolve4([rows, fields]);
+          resolve6([rows, fields]);
         }
       };
     }
@@ -27959,8 +28001,8 @@ var require_prepared_statement_info = __commonJS({
         const stackHolder = captureStackHolder(
           _PromisePreparedStatementInfo.prototype.execute
         );
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           if (parameters) {
             s.execute(parameters, done);
           } else {
@@ -27969,9 +28011,9 @@ var require_prepared_statement_info = __commonJS({
         });
       }
       close() {
-        return new this.Promise((resolve4) => {
+        return new this.Promise((resolve6) => {
           this.statement.close();
-          resolve4();
+          resolve6();
         });
       }
     };
@@ -28042,8 +28084,8 @@ var require_connection2 = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           if (params !== void 0) {
             c2.query(query, params, done);
           } else {
@@ -28059,8 +28101,8 @@ var require_connection2 = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           if (params !== void 0) {
             c2.execute(query, params, done);
           } else {
@@ -28069,8 +28111,8 @@ var require_connection2 = __commonJS({
         });
       }
       end() {
-        return new this.Promise((resolve4) => {
-          this.connection.end(resolve4);
+        return new this.Promise((resolve6) => {
+          this.connection.end(resolve6);
         });
       }
       async [Symbol.asyncDispose]() {
@@ -28083,16 +28125,16 @@ var require_connection2 = __commonJS({
         const stackHolder = captureStackHolder(
           _PromiseConnection.prototype.beginTransaction
         );
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           c2.beginTransaction(done);
         });
       }
       commit() {
         const c2 = this.connection;
         const stackHolder = captureStackHolder(_PromiseConnection.prototype.commit);
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           c2.commit(done);
         });
       }
@@ -28101,21 +28143,21 @@ var require_connection2 = __commonJS({
         const stackHolder = captureStackHolder(
           _PromiseConnection.prototype.rollback
         );
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           c2.rollback(done);
         });
       }
       ping() {
         const c2 = this.connection;
         const stackHolder = captureStackHolder(_PromiseConnection.prototype.ping);
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           c2.ping((err) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
               reject(err);
             } else {
-              resolve4(true);
+              resolve6(true);
             }
           });
         });
@@ -28123,13 +28165,13 @@ var require_connection2 = __commonJS({
       reset() {
         const c2 = this.connection;
         const stackHolder = captureStackHolder(_PromiseConnection.prototype.reset);
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           c2.reset((err) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
               reject(err);
             } else {
-              resolve4();
+              resolve6();
             }
           });
         });
@@ -28137,13 +28179,13 @@ var require_connection2 = __commonJS({
       connect() {
         const c2 = this.connection;
         const stackHolder = captureStackHolder(_PromiseConnection.prototype.connect);
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           c2.connect((err, param) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
               reject(err);
             } else {
-              resolve4(param);
+              resolve6(param);
             }
           });
         });
@@ -28152,7 +28194,7 @@ var require_connection2 = __commonJS({
         const c2 = this.connection;
         const promiseImpl = this.Promise;
         const stackHolder = captureStackHolder(_PromiseConnection.prototype.prepare);
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           c2.prepare(options, (err, statement) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
@@ -28162,7 +28204,7 @@ var require_connection2 = __commonJS({
                 statement,
                 promiseImpl
               );
-              resolve4(wrappedStatement);
+              resolve6(wrappedStatement);
             }
           });
         });
@@ -28172,13 +28214,13 @@ var require_connection2 = __commonJS({
         const stackHolder = captureStackHolder(
           _PromiseConnection.prototype.changeUser
         );
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           c2.changeUser(options, (err) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
               reject(err);
             } else {
-              resolve4();
+              resolve6();
             }
           });
         });
@@ -28640,12 +28682,12 @@ var require_pool2 = __commonJS({
       }
       getConnection() {
         const corePool = this.pool;
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           corePool.getConnection((err, coreConnection) => {
             if (err) {
               reject(err);
             } else {
-              resolve4(new PromisePoolConnection(coreConnection, this.Promise));
+              resolve6(new PromisePoolConnection(coreConnection, this.Promise));
             }
           });
         });
@@ -28661,8 +28703,8 @@ var require_pool2 = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           if (args !== void 0) {
             corePool.query(sql, args, done);
           } else {
@@ -28678,8 +28720,8 @@ var require_pool2 = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           if (args) {
             corePool.execute(sql, args, done);
           } else {
@@ -28690,13 +28732,13 @@ var require_pool2 = __commonJS({
       end() {
         const corePool = this.pool;
         const stackHolder = captureStackHolder(_PromisePool.prototype.end);
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           corePool.end((err) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
               reject(err);
             } else {
-              resolve4();
+              resolve6();
             }
           });
         });
@@ -29121,12 +29163,12 @@ var require_pool_cluster2 = __commonJS({
       }
       getConnection() {
         const corePoolNamespace = this.poolNamespace;
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           corePoolNamespace.getConnection((err, coreConnection) => {
             if (err) {
               reject(err);
             } else {
-              resolve4(new PromisePoolConnection(coreConnection, this.Promise));
+              resolve6(new PromisePoolConnection(coreConnection, this.Promise));
             }
           });
         });
@@ -29141,8 +29183,8 @@ var require_pool_cluster2 = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           corePoolNamespace.query(sql, values, done);
         });
       }
@@ -29156,8 +29198,8 @@ var require_pool_cluster2 = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           corePoolNamespace.execute(sql, values, done);
         });
       }
@@ -29195,9 +29237,9 @@ var require_promise = __commonJS({
           "no Promise implementation available.Use promise-enabled node version or pass userland Promise implementation as parameter, for example: { Promise: require('bluebird') }"
         );
       }
-      return new thePromise((resolve4, reject) => {
+      return new thePromise((resolve6, reject) => {
         coreConnection.once("connect", () => {
-          resolve4(new PromiseConnection(coreConnection, thePromise));
+          resolve6(new PromiseConnection(coreConnection, thePromise));
         });
         coreConnection.once("error", (err) => {
           applyCapturedStack(err, stackHolder);
@@ -29224,7 +29266,7 @@ var require_promise = __commonJS({
       }
       getConnection(pattern, selector) {
         const corePoolCluster = this.poolCluster;
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           corePoolCluster.getConnection(
             pattern,
             selector,
@@ -29232,7 +29274,7 @@ var require_promise = __commonJS({
               if (err) {
                 reject(err);
               } else {
-                resolve4(new PromisePoolConnection(coreConnection, this.Promise));
+                resolve6(new PromisePoolConnection(coreConnection, this.Promise));
               }
             }
           );
@@ -29246,8 +29288,8 @@ var require_promise = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           corePoolCluster.query(sql, args, done);
         });
       }
@@ -29261,8 +29303,8 @@ var require_promise = __commonJS({
             "Callback function is not available with promise clients."
           );
         }
-        return new this.Promise((resolve4, reject) => {
-          const done = makeDoneCb(resolve4, reject, stackHolder);
+        return new this.Promise((resolve6, reject) => {
+          const done = makeDoneCb(resolve6, reject, stackHolder);
           corePoolCluster.execute(sql, args, done);
         });
       }
@@ -29275,13 +29317,13 @@ var require_promise = __commonJS({
       end() {
         const corePoolCluster = this.poolCluster;
         const stackHolder = captureStackHolder(_PromisePoolCluster.prototype.end);
-        return new this.Promise((resolve4, reject) => {
+        return new this.Promise((resolve6, reject) => {
           corePoolCluster.end((err) => {
             if (err) {
               applyCapturedStack(err, stackHolder);
               reject(err);
             } else {
-              resolve4();
+              resolve6();
             }
           });
         });
@@ -32356,7 +32398,7 @@ var require_dist = __commonJS({
     function parse(stream, callback) {
       const parser = new parser_1.Parser();
       stream.on("data", (buffer) => parser.parse(buffer, callback));
-      return new Promise((resolve4) => stream.on("end", () => resolve4()));
+      return new Promise((resolve6) => stream.on("end", () => resolve6()));
     }
     exports.parse = parse;
   }
@@ -33081,12 +33123,12 @@ var require_client2 = __commonJS({
           this._connect(callback);
           return;
         }
-        return new this._Promise((resolve4, reject) => {
+        return new this._Promise((resolve6, reject) => {
           this._connect((error) => {
             if (error) {
               reject(error);
             } else {
-              resolve4(this);
+              resolve6(this);
             }
           });
         });
@@ -33432,8 +33474,8 @@ var require_client2 = __commonJS({
           readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
           query = new Query2(config, values, callback);
           if (!query.callback) {
-            result = new this._Promise((resolve4, reject) => {
-              query.callback = (err, res) => err ? reject(err) : resolve4(res);
+            result = new this._Promise((resolve6, reject) => {
+              query.callback = (err, res) => err ? reject(err) : resolve6(res);
             }).catch((err) => {
               Error.captureStackTrace(err);
               throw err;
@@ -33510,8 +33552,8 @@ var require_client2 = __commonJS({
         if (cb) {
           this.connection.once("end", cb);
         } else {
-          return new this._Promise((resolve4) => {
-            this.connection.once("end", resolve4);
+          return new this._Promise((resolve6) => {
+            this.connection.once("end", resolve6);
           });
         }
       }
@@ -33559,8 +33601,8 @@ var require_pg_pool = __commonJS({
       const cb = function(err, client) {
         err ? rej(err) : res(client);
       };
-      const result = new Promise2(function(resolve4, reject) {
-        res = resolve4;
+      const result = new Promise2(function(resolve6, reject) {
+        res = resolve6;
         rej = reject;
       }).catch((err) => {
         Error.captureStackTrace(err);
@@ -33621,7 +33663,7 @@ var require_pg_pool = __commonJS({
         if (typeof Promise2.try === "function") {
           return Promise2.try(f);
         }
-        return new Promise2((resolve4) => resolve4(f()));
+        return new Promise2((resolve6) => resolve6(f()));
       }
       _isFull() {
         return this._clients.length >= this.options.max;
@@ -34013,8 +34055,8 @@ var require_query4 = __commonJS({
     NativeQuery.prototype._getPromise = function() {
       if (this._promise) return this._promise;
       this._promise = new Promise(
-        function(resolve4, reject) {
-          this._once("end", resolve4);
+        function(resolve6, reject) {
+          this._once("end", resolve6);
           this._once("error", reject);
         }.bind(this)
       );
@@ -34191,12 +34233,12 @@ var require_client3 = __commonJS({
         this._connect(callback);
         return;
       }
-      return new this._Promise((resolve4, reject) => {
+      return new this._Promise((resolve6, reject) => {
         this._connect((error) => {
           if (error) {
             reject(error);
           } else {
-            resolve4(this);
+            resolve6(this);
           }
         });
       });
@@ -34220,8 +34262,8 @@ var require_client3 = __commonJS({
         query = new NativeQuery(config, values, callback);
         if (!query.callback) {
           let resolveOut, rejectOut;
-          result = new this._Promise((resolve4, reject) => {
-            resolveOut = resolve4;
+          result = new this._Promise((resolve6, reject) => {
+            resolveOut = resolve6;
             rejectOut = reject;
           }).catch((err) => {
             Error.captureStackTrace(err);
@@ -34281,8 +34323,8 @@ var require_client3 = __commonJS({
       }
       let result;
       if (!cb) {
-        result = new this._Promise(function(resolve4, reject) {
-          cb = (err) => err ? reject(err) : resolve4();
+        result = new this._Promise(function(resolve6, reject) {
+          cb = (err) => err ? reject(err) : resolve6();
         });
       }
       this.native.end(function() {
@@ -39389,7 +39431,7 @@ var require_Command = __commonJS({
         }
       }
       initPromise() {
-        const promise = new Promise((resolve4, reject) => {
+        const promise = new Promise((resolve6, reject) => {
           if (!this.transformed) {
             this.transformed = true;
             const transformer = _Command._transformer.argument[this.name];
@@ -39398,7 +39440,7 @@ var require_Command = __commonJS({
             }
             this.stringifyArguments();
           }
-          this.resolve = this._convertValue(resolve4);
+          this.resolve = this._convertValue(resolve6);
           this.reject = (err) => {
             this._clearTimers();
             if (this.errorStack) {
@@ -39431,11 +39473,11 @@ var require_Command = __commonJS({
       /**
        * Convert the value from buffer to the target encoding.
        */
-      _convertValue(resolve4) {
+      _convertValue(resolve6) {
         return (value) => {
           try {
             this._clearTimers();
-            resolve4(this.transformReply(value));
+            resolve6(this.transformReply(value));
             this.isResolved = true;
           } catch (err) {
             this.reject(err);
@@ -39713,13 +39755,13 @@ var require_autoPipelining = __commonJS({
       if (client.isCluster && !client.slots.length) {
         if (client.status === "wait")
           client.connect().catch(lodash_1.noop);
-        return (0, standard_as_callback_1.default)(new Promise(function(resolve4, reject) {
+        return (0, standard_as_callback_1.default)(new Promise(function(resolve6, reject) {
           client.delayUntilReady((err) => {
             if (err) {
               reject(err);
               return;
             }
-            executeWithAutoPipelining(client, functionName, commandName, args, null).then(resolve4, reject);
+            executeWithAutoPipelining(client, functionName, commandName, args, null).then(resolve6, reject);
           });
         }), callback);
       }
@@ -39740,13 +39782,13 @@ var require_autoPipelining = __commonJS({
         pipeline[exports.kExec] = true;
         setImmediate(executeAutoPipeline, client, slotKey);
       }
-      const autoPipelinePromise = new Promise(function(resolve4, reject) {
+      const autoPipelinePromise = new Promise(function(resolve6, reject) {
         pipeline[exports.kCallbacks].push(function(err, value) {
           if (err) {
             reject(err);
             return;
           }
-          resolve4(value);
+          resolve6(value);
         });
         if (functionName === "call") {
           args.unshift(commandName);
@@ -39981,8 +40023,8 @@ var require_Pipeline = __commonJS({
           this[name] = redis[name];
           this[name + "Buffer"] = redis[name + "Buffer"];
         });
-        this.promise = new Promise((resolve4, reject) => {
-          this.resolve = resolve4;
+        this.promise = new Promise((resolve6, reject) => {
+          this.resolve = resolve6;
           this.reject = reject;
         });
         const _this = this;
@@ -40282,13 +40324,13 @@ var require_transaction = __commonJS({
           if (this.isCluster && !this.redis.slots.length) {
             if (this.redis.status === "wait")
               this.redis.connect().catch(utils_1.noop);
-            return (0, standard_as_callback_1.default)(new Promise((resolve4, reject) => {
+            return (0, standard_as_callback_1.default)(new Promise((resolve6, reject) => {
               this.redis.delayUntilReady((err) => {
                 if (err) {
                   reject(err);
                   return;
                 }
-                this.exec(pipeline).then(resolve4, reject);
+                this.exec(pipeline).then(resolve6, reject);
               });
             }), callback);
           }
@@ -41417,7 +41459,7 @@ var require_cluster = __commonJS({
        * Connect to a cluster
        */
       connect() {
-        return new Promise((resolve4, reject) => {
+        return new Promise((resolve6, reject) => {
           if (this.status === "connecting" || this.status === "connect" || this.status === "ready") {
             reject(new Error("Redis is already connecting/connected"));
             return;
@@ -41446,7 +41488,7 @@ var require_cluster = __commonJS({
               this.retryAttempts = 0;
               this.executeOfflineCommands();
               this.resetNodesRefreshInterval();
-              resolve4();
+              resolve6();
             };
             let closeListener = void 0;
             const refreshListener = () => {
@@ -42056,7 +42098,7 @@ var require_cluster = __commonJS({
         });
       }
       resolveSrv(hostname2) {
-        return new Promise((resolve4, reject) => {
+        return new Promise((resolve6, reject) => {
           this.options.resolveSrv(hostname2, (err, records) => {
             if (err) {
               return reject(err);
@@ -42070,7 +42112,7 @@ var require_cluster = __commonJS({
               if (!group.records.length) {
                 sortedKeys.shift();
               }
-              self2.dnsLookup(record.name).then((host) => resolve4({
+              self2.dnsLookup(record.name).then((host) => resolve6({
                 host,
                 port: record.port
               }), tryFirstOne);
@@ -42080,14 +42122,14 @@ var require_cluster = __commonJS({
         });
       }
       dnsLookup(hostname2) {
-        return new Promise((resolve4, reject) => {
+        return new Promise((resolve6, reject) => {
           this.options.dnsLookup(hostname2, (err, address) => {
             if (err) {
               debug2("failed to resolve hostname %s to IP: %s", hostname2, err.message);
               reject(err);
             } else {
               debug2("resolved hostname %s to IP %s", hostname2, address);
-              resolve4(address);
+              resolve6(address);
             }
           });
         });
@@ -42242,7 +42284,7 @@ var require_StandaloneConnector = __commonJS({
         if (options.tls) {
           Object.assign(connectionOptions, options.tls);
         }
-        return new Promise((resolve4, reject) => {
+        return new Promise((resolve6, reject) => {
           process.nextTick(() => {
             if (!this.connecting) {
               reject(new Error(utils_1.CONNECTION_CLOSED_ERROR_MSG));
@@ -42261,7 +42303,7 @@ var require_StandaloneConnector = __commonJS({
             this.stream.once("error", (err) => {
               this.firstError = err;
             });
-            resolve4(this.stream);
+            resolve6(this.stream);
           });
         });
       }
@@ -42417,7 +42459,7 @@ var require_SentinelConnector = __commonJS({
             const error = new Error(errorMsg);
             if (typeof retryDelay === "number") {
               eventEmitter("error", error);
-              await new Promise((resolve4) => setTimeout(resolve4, retryDelay));
+              await new Promise((resolve6) => setTimeout(resolve6, retryDelay));
               return connectToNext();
             } else {
               throw error;
@@ -43734,7 +43776,7 @@ var require_Redis = __commonJS({
        * if the connection fails, times out, or if Redis is already connecting/connected.
        */
       connect(callback) {
-        const promise = new Promise((resolve4, reject) => {
+        const promise = new Promise((resolve6, reject) => {
           if (this.status === "connecting" || this.status === "connect" || this.status === "ready") {
             reject(new Error("Redis is already connecting/connected"));
             return;
@@ -43813,7 +43855,7 @@ var require_Redis = __commonJS({
             }
             const connectionReadyHandler = function() {
               _this.removeListener("close", connectionCloseHandler);
-              resolve4();
+              resolve6();
             };
             var connectionCloseHandler = function() {
               _this.removeListener("ready", connectionReadyHandler);
@@ -43907,10 +43949,10 @@ var require_Redis = __commonJS({
           monitor: true,
           lazyConnect: false
         });
-        return (0, standard_as_callback_1.default)(new Promise(function(resolve4, reject) {
+        return (0, standard_as_callback_1.default)(new Promise(function(resolve6, reject) {
           monitorInstance.once("error", reject);
           monitorInstance.once("monitoring", function() {
-            resolve4(monitorInstance);
+            resolve6(monitorInstance);
           });
         }), callback);
       }
@@ -47884,7 +47926,7 @@ function resolverSocketPath() {
 }
 function resolveReferenceToken(token, timeoutMs = 5e3) {
   const path = resolverSocketPath();
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const socket = createConnection(path);
     let buffer = "";
     let settled = false;
@@ -47892,7 +47934,7 @@ function resolveReferenceToken(token, timeoutMs = 5e3) {
       if (settled) return;
       settled = true;
       socket.destroy();
-      resolve4(result);
+      resolve6(result);
     };
     const timer = setTimeout(
       () => settle({ ok: false, error: "timed out waiting for keynv-mcp resolver" }),
@@ -48095,7 +48137,7 @@ function spawnPrivileged(opts) {
     }, opts.timeoutS * 1e3);
     timer.unref();
   }
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     child.on("error", (err) => {
       if (timer) clearTimeout(timer);
       clearSensitiveReferences(env2, literals);
@@ -48104,7 +48146,7 @@ function spawnPrivileged(opts) {
     child.on("close", (code, signal) => {
       if (timer) clearTimeout(timer);
       clearSensitiveReferences(env2, literals);
-      resolve4({
+      resolve6({
         exitCode: code ?? 0,
         signal,
         durationMs: Date.now() - startedAt
@@ -49049,7 +49091,7 @@ async function promptHidden(prompt) {
   process.stdin.setRawMode(true);
   process.stdin.resume();
   process.stdin.setEncoding("utf8");
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     let buf = "";
     const onData = (chunk) => {
       for (const ch of chunk) {
@@ -49058,7 +49100,7 @@ async function promptHidden(prompt) {
           process.stdin.pause();
           process.stdin.removeListener("data", onData);
           process.stdout.write("\n");
-          resolve4(buf);
+          resolve6(buf);
           return;
         }
         if (ch === "") {
@@ -49076,10 +49118,10 @@ async function promptHidden(prompt) {
 }
 async function promptLine(prompt) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     rl.question(prompt, (answer) => {
       rl.close();
-      resolve4(answer.trim());
+      resolve6(answer.trim());
     });
   });
 }
@@ -49474,9 +49516,9 @@ here (see the streaming-mode limitation in the redactor package).
 `
   });
   async execute() {
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve6, reject) => {
       const transform = createRedactStream();
-      this.context.stdin.pipe(transform).pipe(this.context.stdout).on("error", reject).on("finish", () => resolve4(0));
+      this.context.stdin.pipe(transform).pipe(this.context.stdout).on("error", reject).on("finish", () => resolve6(0));
       this.context.stdin.on("error", reject);
     });
   }
@@ -49738,11 +49780,11 @@ async function copyToClipboard2(value) {
   );
 }
 function pipeToCommand(cmd, args, input) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     const child = spawn(cmd, args, { stdio: ["pipe", "ignore", "ignore"] });
     child.on("error", reject);
     child.on("close", (code) => {
-      if (code === 0) resolve4();
+      if (code === 0) resolve6();
       else reject(new Error(`${cmd} exited with code ${code}`));
     });
     child.stdin.on("error", reject);
@@ -50966,7 +51008,7 @@ var sshTester = {
     }
     const start = Date.now();
     const { Client: Client2 } = await import('ssh2');
-    return new Promise((resolve4) => {
+    return new Promise((resolve6) => {
       const client = new Client2();
       let settled = false;
       const settle = (result) => {
@@ -50977,7 +51019,7 @@ var sshTester = {
           client.end();
         } catch {
         }
-        resolve4(result);
+        resolve6(result);
       };
       client.once("ready", () => {
         client.exec("true", (err, stream) => {
@@ -51062,12 +51104,12 @@ function sanitizeResult(result, secret) {
 
 // ../../packages/testers/dist/run.js
 function withTimeout(promise, ms) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     const t = setTimeout(() => reject(new Error(`tester timed out after ${ms}ms`)), ms);
     t.unref();
     promise.then((v2) => {
       clearTimeout(t);
-      resolve4(v2);
+      resolve6(v2);
     }, (err) => {
       clearTimeout(t);
       reject(err);
@@ -51428,8 +51470,8 @@ async function runWatcher(options = {}) {
     awaitWriteFinish: false,
     ...options.usePolling ? { usePolling: true, interval: 500 } : {}
   });
-  const readyPromise2 = new Promise((resolve4) => {
-    watcher.once("ready", () => resolve4());
+  const readyPromise2 = new Promise((resolve6) => {
+    watcher.once("ready", () => resolve6());
   });
   watcher.on("add", (path) => {
     if (matchesExt(path)) filesWatched += 1;