norn-cli 1.13.1 → 2.0.0

package/dist/cli.js

@@ -8881,11 +8881,11 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path18) {
-      if (!path18 || typeof path18 !== "string") {
+    function lookup(path19) {
+      if (!path19 || typeof path19 !== "string") {
         return false;
       }
-      var extension2 = extname3("x." + path18).toLowerCase().substr(1);
+      var extension2 = extname3("x." + path19).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -9990,11 +9990,11 @@ var require_form_data = __commonJS({
     "use strict";
     var CombinedStream = require_combined_stream();
     var util4 = require("util");
-    var path18 = require("path");
+    var path19 = require("path");
     var http3 = require("http");
     var https3 = require("https");
     var parseUrl = require("url").parse;
-    var fs21 = require("fs");
+    var fs20 = require("fs");
     var Stream = require("stream").Stream;
     var crypto8 = require("crypto");
     var mime = require_mime_types();
@@ -10061,7 +10061,7 @@ var require_form_data = __commonJS({
         if (value.end != void 0 && value.end != Infinity && value.start != void 0) {
           callback(null, value.end + 1 - (value.start ? value.start : 0));
         } else {
-          fs21.stat(value.path, function(err, stat) {
+          fs20.stat(value.path, function(err, stat) {
             if (err) {
               callback(err);
               return;
@@ -10118,11 +10118,11 @@ var require_form_data = __commonJS({
     FormData3.prototype._getContentDisposition = function(value, options) {
       var filename;
       if (typeof options.filepath === "string") {
-        filename = path18.normalize(options.filepath).replace(/\\/g, "/");
+        filename = path19.normalize(options.filepath).replace(/\\/g, "/");
       } else if (options.filename || value && (value.name || value.path)) {
-        filename = path18.basename(options.filename || value && (value.name || value.path));
+        filename = path19.basename(options.filename || value && (value.name || value.path));
       } else if (value && value.readable && hasOwn(value, "httpVersion")) {
-        filename = path18.basename(value.client._httpMessage.path || "");
+        filename = path19.basename(value.client._httpMessage.path || "");
       }
       if (filename) {
         return 'filename="' + filename + '"';
@@ -15089,7 +15089,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve15.call(this, root, ref);
+      let _sch = resolve16.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a2 = root.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref];
         const { schemaId } = this.opts;
@@ -15116,7 +15116,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve15(root, ref) {
+    function resolve16(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -15331,8 +15331,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path18) {
-      let input2 = path18;
+    function removeDotSegments(path19) {
+      let input2 = path19;
       const output2 = [];
       let nextSlash = -1;
       let len = 0;
@@ -15531,8 +15531,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path18, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path18 && path18 !== "/" ? path18 : void 0;
+        const [path19, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path19 && path19 !== "/" ? path19 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -15691,7 +15691,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve15(baseURI, relativeURI, options) {
+    function resolve16(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse5(baseURI, schemelessOptions), parse5(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -15918,7 +15918,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve15,
+      resolve: resolve16,
       resolveComponent,
       equal,
       serialize,
@@ -20212,15 +20212,15 @@ var require_pg_connection_string = __commonJS({
       if (config2.sslcert || config2.sslkey || config2.sslrootcert || config2.sslmode) {
         config2.ssl = {};
       }
-      const fs21 = config2.sslcert || config2.sslkey || config2.sslrootcert ? require("fs") : null;
+      const fs20 = config2.sslcert || config2.sslkey || config2.sslrootcert ? require("fs") : null;
       if (config2.sslcert) {
-        config2.ssl.cert = fs21.readFileSync(config2.sslcert).toString();
+        config2.ssl.cert = fs20.readFileSync(config2.sslcert).toString();
       }
       if (config2.sslkey) {
-        config2.ssl.key = fs21.readFileSync(config2.sslkey).toString();
+        config2.ssl.key = fs20.readFileSync(config2.sslkey).toString();
       }
       if (config2.sslrootcert) {
-        config2.ssl.ca = fs21.readFileSync(config2.sslrootcert).toString();
+        config2.ssl.ca = fs20.readFileSync(config2.sslrootcert).toString();
       }
       if (options.useLibpqCompat && config2.uselibpqcompat) {
         throw new Error("Both useLibpqCompat and uselibpqcompat are set. Please use only one of them.");
@@ -21616,7 +21616,7 @@ var require_dist = __commonJS({
     function parse5(stream4, callback) {
       const parser = new parser_1.Parser();
       stream4.on("data", (buffer) => parser.parse(buffer, callback));
-      return new Promise((resolve15) => stream4.on("end", () => resolve15()));
+      return new Promise((resolve16) => stream4.on("end", () => resolve16()));
     }
     exports2.parse = parse5;
   }
@@ -21985,7 +21985,7 @@ var require_split2 = __commonJS({
 var require_helper = __commonJS({
   "node_modules/pgpass/lib/helper.js"(exports2, module2) {
     "use strict";
-    var path18 = require("path");
+    var path19 = require("path");
     var Stream = require("stream").Stream;
     var split = require_split2();
     var util4 = require("util");
@@ -22024,7 +22024,7 @@ var require_helper = __commonJS({
     };
     module2.exports.getFileName = function(rawEnv) {
       var env3 = rawEnv || process.env;
-      var file2 = env3.PGPASSFILE || (isWin ? path18.join(env3.APPDATA || "./", "postgresql", "pgpass.conf") : path18.join(env3.HOME || "./", ".pgpass"));
+      var file2 = env3.PGPASSFILE || (isWin ? path19.join(env3.APPDATA || "./", "postgresql", "pgpass.conf") : path19.join(env3.HOME || "./", ".pgpass"));
       return file2;
     };
     module2.exports.usePgPass = function(stats, fname) {
@@ -22156,16 +22156,16 @@ var require_helper = __commonJS({
 var require_lib = __commonJS({
   "node_modules/pgpass/lib/index.js"(exports2, module2) {
     "use strict";
-    var path18 = require("path");
-    var fs21 = require("fs");
+    var path19 = require("path");
+    var fs20 = require("fs");
     var helper = require_helper();
     module2.exports = function(connInfo, cb) {
       var file2 = helper.getFileName();
-      fs21.stat(file2, function(err, stat) {
+      fs20.stat(file2, function(err, stat) {
         if (err || !helper.usePgPass(stat, file2)) {
           return cb(void 0);
         }
-        var st = fs21.createReadStream(file2);
+        var st = fs20.createReadStream(file2);
         helper.getPassword(connInfo, st, cb);
       });
     };
@@ -22347,12 +22347,12 @@ var require_client = __commonJS({
           this._connect(callback);
           return;
         }
-        return new this._Promise((resolve15, reject) => {
+        return new this._Promise((resolve16, reject) => {
           this._connect((error2) => {
             if (error2) {
               reject(error2);
             } else {
-              resolve15(this);
+              resolve16(this);
             }
           });
         });
@@ -22698,8 +22698,8 @@ var require_client = __commonJS({
           readTimeout = config2.query_timeout || this.connectionParameters.query_timeout;
           query = new Query2(config2, values, callback);
           if (!query.callback) {
-            result = new this._Promise((resolve15, reject) => {
-              query.callback = (err, res) => err ? reject(err) : resolve15(res);
+            result = new this._Promise((resolve16, reject) => {
+              query.callback = (err, res) => err ? reject(err) : resolve16(res);
             }).catch((err) => {
               Error.captureStackTrace(err);
               throw err;
@@ -22776,8 +22776,8 @@ var require_client = __commonJS({
         if (cb) {
           this.connection.once("end", cb);
         } else {
-          return new this._Promise((resolve15) => {
-            this.connection.once("end", resolve15);
+          return new this._Promise((resolve16) => {
+            this.connection.once("end", resolve16);
           });
         }
       }
@@ -22826,8 +22826,8 @@ var require_pg_pool = __commonJS({
       const cb = function(err, client) {
         err ? rej(err) : res(client);
       };
-      const result = new Promise2(function(resolve15, reject) {
-        res = resolve15;
+      const result = new Promise2(function(resolve16, reject) {
+        res = resolve16;
         rej = reject;
       }).catch((err) => {
         Error.captureStackTrace(err);
@@ -22888,7 +22888,7 @@ var require_pg_pool = __commonJS({
         if (typeof Promise2.try === "function") {
           return Promise2.try(f);
         }
-        return new Promise2((resolve15) => resolve15(f()));
+        return new Promise2((resolve16) => resolve16(f()));
       }
       _isFull() {
         return this._clients.length >= this.options.max;
@@ -23281,8 +23281,8 @@ var require_query2 = __commonJS({
     NativeQuery.prototype._getPromise = function() {
       if (this._promise) return this._promise;
       this._promise = new Promise(
-        function(resolve15, reject) {
-          this._once("end", resolve15);
+        function(resolve16, reject) {
+          this._once("end", resolve16);
           this._once("error", reject);
         }.bind(this)
       );
@@ -23459,12 +23459,12 @@ var require_client2 = __commonJS({
         this._connect(callback);
         return;
       }
-      return new this._Promise((resolve15, reject) => {
+      return new this._Promise((resolve16, reject) => {
         this._connect((error2) => {
           if (error2) {
             reject(error2);
           } else {
-            resolve15(this);
+            resolve16(this);
           }
         });
       });
@@ -23488,8 +23488,8 @@ var require_client2 = __commonJS({
         query = new NativeQuery(config2, values, callback);
         if (!query.callback) {
           let resolveOut, rejectOut;
-          result = new this._Promise((resolve15, reject) => {
-            resolveOut = resolve15;
+          result = new this._Promise((resolve16, reject) => {
+            resolveOut = resolve16;
             rejectOut = reject;
           }).catch((err) => {
             Error.captureStackTrace(err);
@@ -23549,8 +23549,8 @@ var require_client2 = __commonJS({
       }
       let result;
       if (!cb) {
-        result = new this._Promise(function(resolve15, reject) {
-          cb = (err) => err ? reject(err) : resolve15();
+        result = new this._Promise(function(resolve16, reject) {
+          cb = (err) => err ? reject(err) : resolve16();
         });
       }
       this.native.end(function() {
@@ -24248,15 +24248,15 @@ var require_utils4 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var PromiseInspection_1 = require_PromiseInspection();
     function defer() {
-      let resolve15 = null;
+      let resolve16 = null;
       let reject = null;
       const promise2 = new Promise((resolver, rejecter) => {
-        resolve15 = resolver;
+        resolve16 = resolver;
         reject = rejecter;
       });
       return {
         promise: promise2,
-        resolve: resolve15,
+        resolve: resolve16,
         reject
       };
     }
@@ -24281,7 +24281,7 @@ var require_utils4 = __commonJS({
     }
     exports2.checkRequiredTime = checkRequiredTime;
     function delay(millis) {
-      return new Promise((resolve15) => setTimeout(resolve15, millis));
+      return new Promise((resolve16) => setTimeout(resolve16, millis));
     }
     exports2.delay = delay;
     function reflect(promise2) {
@@ -24341,11 +24341,11 @@ var require_PendingOperation = __commonJS({
     };
     exports2.PendingOperation = PendingOperation;
     function timeout(promise2, time3) {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         const timeoutHandle = setTimeout(() => reject(new TimeoutError_1.TimeoutError()), time3);
         promise2.then((result) => {
           clearTimeout(timeoutHandle);
-          resolve15(result);
+          resolve16(result);
         }).catch((err) => {
           clearTimeout(timeoutHandle);
           reject(err);
@@ -24553,15 +24553,15 @@ var require_Pool = __commonJS({
         this._stopReaping();
         this.destroyed = true;
         return utils_1.reflect(Promise.all(this.pendingCreates.map((create) => utils_1.reflect(create.promise))).then(() => {
-          return new Promise((resolve15, reject) => {
+          return new Promise((resolve16, reject) => {
             if (this.numPendingValidations() === 0) {
-              resolve15();
+              resolve16();
               return;
             }
             const interval = setInterval(() => {
               if (this.numPendingValidations() === 0) {
                 timers_1.clearInterval(interval);
-                resolve15();
+                resolve16();
               }
             }, 100);
           });
@@ -24785,17 +24785,17 @@ var require_Pool = __commonJS({
       }
     }
     function callbackOrPromise(func) {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         const callback = (err, resource) => {
           if (err) {
             reject(err);
           } else {
-            resolve15(resource);
+            resolve16(resource);
           }
         };
         utils_1.tryPromise(() => func(callback)).then((res) => {
           if (res) {
-            resolve15(res);
+            resolve16(res);
           }
         }).catch((err) => {
           reject(err);
@@ -25229,7 +25229,7 @@ var require_table = __commonJS({
       let cursor = -1;
       let buffer = "";
       let escaped = false;
-      const path18 = [];
+      const path19 = [];
       while (++cursor < length) {
         const char = name.charAt(cursor);
         if (char === "[") {
@@ -25248,7 +25248,7 @@ var require_table = __commonJS({
           if (escaped) {
             buffer += char;
           } else {
-            path18.push(buffer);
+            path19.push(buffer);
             buffer = "";
           }
         } else {
@@ -25256,26 +25256,26 @@ var require_table = __commonJS({
         }
       }
       if (buffer) {
-        path18.push(buffer);
+        path19.push(buffer);
       }
-      switch (path18.length) {
+      switch (path19.length) {
         case 1:
           return {
-            name: path18[0],
+            name: path19[0],
             schema: null,
             database: null
           };
         case 2:
           return {
-            name: path18[1],
-            schema: path18[0],
+            name: path19[1],
+            schema: path19[0],
             database: null
           };
         case 3:
           return {
-            name: path18[2],
-            schema: path18[1],
-            database: path18[0]
+            name: path19[2],
+            schema: path19[1],
+            database: path19[0]
           };
         default:
           throw new Error("Invalid table name.");
@@ -25861,10 +25861,10 @@ var require_connection_pool = __commonJS({
           this._connect(callback);
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           return this._connect((err) => {
             if (err) return reject(err);
-            resolve15(this);
+            resolve16(this);
           });
         });
       }
@@ -25945,10 +25945,10 @@ var require_connection_pool = __commonJS({
           this._close(callback);
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._close((err) => {
             if (err) return reject(err);
-            resolve15(this);
+            resolve16(this);
           });
         });
       }
@@ -26109,8 +26109,8 @@ var require_global_connection = __commonJS({
         setImmediate(callback);
         return null;
       }
-      return new shared.Promise((resolve15) => {
-        resolve15(globalConnection);
+      return new shared.Promise((resolve16) => {
+        resolve16(globalConnection);
       });
     }
     function on(event, handler) {
@@ -26321,10 +26321,10 @@ var require_prepared_statement = __commonJS({
           this._prepare(statement, callback);
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._prepare(statement, (err) => {
             if (err) return reject(err);
-            resolve15(this);
+            resolve16(this);
           });
         });
       }
@@ -26387,10 +26387,10 @@ var require_prepared_statement = __commonJS({
         if (this.stream || typeof callback === "function") {
           return this._execute(values, callback);
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._execute(values, (err, recordset) => {
             if (err) return reject(err);
-            resolve15(recordset);
+            resolve16(recordset);
           });
         });
       }
@@ -26436,10 +26436,10 @@ var require_prepared_statement = __commonJS({
           this._unprepare(callback);
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._unprepare((err) => {
             if (err) return reject(err);
-            resolve15();
+            resolve16();
           });
         });
       }
@@ -26683,7 +26683,7 @@ var require_request = __commonJS({
           const strings = values.shift();
           batch = this._template(strings, values);
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._batch(batch, (err, recordsets, output2, rowsAffected) => {
             if (this.stream) {
               if (err) this.emit("error", err);
@@ -26694,7 +26694,7 @@ var require_request = __commonJS({
               });
             }
             if (err) return reject(err);
-            resolve15({
+            resolve16({
               recordsets,
               recordset: recordsets && recordsets[0],
               output: output2,
@@ -26750,10 +26750,10 @@ var require_request = __commonJS({
           });
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._bulk(table, options, (err, rowsAffected) => {
             if (err) return reject(err);
-            resolve15({
+            resolve16({
               rowsAffected
             });
           });
@@ -26854,7 +26854,7 @@ var require_request = __commonJS({
           const strings = values.shift();
           command = this._template(strings, values);
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._query(command, (err, recordsets, output2, rowsAffected, columns) => {
             if (this.stream) {
               if (err) this.emit("error", err);
@@ -26872,7 +26872,7 @@ var require_request = __commonJS({
               rowsAffected
             };
             if (this.arrayRowMode) result.columns = columns;
-            resolve15(result);
+            resolve16(result);
           });
         });
       }
@@ -26926,7 +26926,7 @@ var require_request = __commonJS({
           });
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._execute(command, (err, recordsets, output2, returnValue, rowsAffected, columns) => {
             if (this.stream) {
               if (err) this.emit("error", err);
@@ -26946,7 +26946,7 @@ var require_request = __commonJS({
               returnValue
             };
             if (this.arrayRowMode) result.columns = columns;
-            resolve15(result);
+            resolve16(result);
           });
         });
       }
@@ -27110,11 +27110,11 @@ var require_transaction = __commonJS({
           });
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._begin(isolationLevel, (err) => {
             if (err) return reject(err);
             this.emit("begin");
-            resolve15(this);
+            resolve16(this);
           });
         });
       }
@@ -27157,11 +27157,11 @@ var require_transaction = __commonJS({
           });
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           this._commit((err) => {
             if (err) return reject(err);
             this.emit("commit");
-            resolve15();
+            resolve16();
           });
         });
       }
@@ -27206,11 +27206,11 @@ var require_transaction = __commonJS({
           });
           return this;
         }
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           return this._rollback((err) => {
             if (err) return reject(err);
             this.emit("rollback", this._aborted);
-            resolve15();
+            resolve16();
           });
         });
       }
@@ -28451,11 +28451,11 @@ function __metadata(metadataKey, metadataValue) {
 }
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve15) {
-      resolve15(value);
+    return value instanceof P ? value : new P(function(resolve16) {
+      resolve16(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve15, reject) {
+  return new (P || (P = Promise))(function(resolve16, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -28471,7 +28471,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve15(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve16(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -28662,14 +28662,14 @@ function __asyncValues(o) {
   }, i);
   function verb(n) {
     i[n] = o[n] && function(v) {
-      return new Promise(function(resolve15, reject) {
-        v = o[n](v), settle2(resolve15, reject, v.done, v.value);
+      return new Promise(function(resolve16, reject) {
+        v = o[n](v), settle2(resolve16, reject, v.done, v.value);
       });
     };
   }
-  function settle2(resolve15, reject, d, v) {
+  function settle2(resolve16, reject, d, v) {
     Promise.resolve(v).then(function(v2) {
-      resolve15({ value: v2, done: d });
+      resolve16({ value: v2, done: d });
     }, reject);
   }
 }
@@ -28761,13 +28761,13 @@ function __disposeResources(env3) {
   }
   return next();
 }
-function __rewriteRelativeImportExtension(path18, preserveJsx) {
-  if (typeof path18 === "string" && /^\.\.?\//.test(path18)) {
-    return path18.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
+function __rewriteRelativeImportExtension(path19, preserveJsx) {
+  if (typeof path19 === "string" && /^\.\.?\//.test(path19)) {
+    return path19.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
       return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
     });
   }
-  return path18;
+  return path19;
 }
 var extendStatics, __assign, __createBinding, __setModuleDefault, ownKeys, _SuppressedError, tslib_es6_default;
 var init_tslib_es6 = __esm({
@@ -28914,8 +28914,8 @@ var require_msalPlugins = __commonJS({
       }
     };
     exports2.msalNodeFlowVSCodeCredentialControl = {
-      setVSCodeAuthRecordPath(path18) {
-        exports2.vsCodeAuthRecordPath = path18;
+      setVSCodeAuthRecordPath(path19) {
+        exports2.vsCodeAuthRecordPath = path19;
       },
       setVSCodeBroker(broker) {
         exports2.vsCodeBrokerInfo = {
@@ -32264,7 +32264,7 @@ var require_index_node_BtzY9XyU = __commonJS({
       return cachedAtSec > nowSeconds();
     }
     function delay(t, value) {
-      return new Promise((resolve15) => setTimeout(() => resolve15(value), t));
+      return new Promise((resolve16) => setTimeout(() => resolve16(value), t));
     }
     var TimeUtils = /* @__PURE__ */ Object.freeze({
       __proto__: null,
@@ -41656,8 +41656,8 @@ var require_msal_node = __commonJS({
     var crypto8 = require("crypto");
     var msalCommon = require_lib4();
     var jwt2 = require_jsonwebtoken();
-    var fs21 = require("fs");
-    var path18 = require("path");
+    var fs20 = require("fs");
+    var path19 = require("path");
     var Serializer = class {
       /**
        * serialize the JSON blob
@@ -45450,7 +45450,7 @@ var require_msal_node = __commonJS({
       return cachedAtSec > nowSeconds();
     }
     function delay(t, value) {
-      return new Promise((resolve15) => setTimeout(() => resolve15(value), t));
+      return new Promise((resolve16) => setTimeout(() => resolve16(value), t));
     }
     function createIdTokenEntity(homeAccountId, environment, idToken, clientId, tenantId) {
       const idTokenEntity = {
@@ -48153,7 +48153,7 @@ ${body}`;
 Host: ${destinationUrl.host}\r
 Connection: close\r
 ` + postRequestStringContent + "\r\n";
-          return new Promise((resolve15, reject) => {
+          return new Promise((resolve16, reject) => {
             const request = http3.request(tunnelRequestOptions);
             if (timeout) {
               request.on("timeout", () => {
@@ -48202,7 +48202,7 @@ Connection: close\r
                 if (this.shouldDestroyRequest(httpStatusCode, networkResponse)) {
                   request.destroy();
                 }
-                resolve15(networkResponse);
+                resolve16(networkResponse);
               });
               socket.on("error", (chunk) => {
                 request.destroy();
@@ -48244,7 +48244,7 @@ Connection: close\r
               customOptions.timeout = timeout;
             }
           }
-          return new Promise((resolve15, reject) => {
+          return new Promise((resolve16, reject) => {
             let request;
             if (customOptions.protocol === "http:") {
               request = http3.request(customOptions);
@@ -48277,7 +48277,7 @@ Connection: close\r
                 if (this.shouldDestroyRequest(statusCode, networkResponse)) {
                   request.destroy();
                 }
-                resolve15(networkResponse);
+                resolve16(networkResponse);
               });
             });
             request.on("error", (chunk) => {
@@ -50047,7 +50047,7 @@ Headers: ${JSON.stringify(headers)}`
         if (this.server) {
           throw NodeAuthError.createLoopbackServerAlreadyExistsError();
         }
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           this.server = http3.createServer((req, res) => {
             const url3 = req.url;
             if (!url3) {
@@ -50070,7 +50070,7 @@ Headers: ${JSON.stringify(headers)}`
             if (authCodeResponse.error) {
               res.end(errorTemplate || `Error occurred: ${authCodeResponse.error}`);
             }
-            resolve15(authCodeResponse);
+            resolve16(authCodeResponse);
           });
           this.server.listen(0, "127.0.0.1");
         });
@@ -50483,7 +50483,7 @@ Headers: ${JSON.stringify(headers)}`
        * @returns
        */
       async waitForRedirectUri(loopbackClient) {
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           let ticks = 0;
           const id = setInterval(() => {
             if (LOOPBACK_SERVER_CONSTANTS.TIMEOUT_MS / LOOPBACK_SERVER_CONSTANTS.INTERVAL_MS < ticks) {
@@ -50494,7 +50494,7 @@ Headers: ${JSON.stringify(headers)}`
             try {
               const r = loopbackClient.getRedirectUri();
               clearInterval(id);
-              resolve15(r);
+              resolve16(r);
               return;
             } catch (e) {
               if (e instanceof AuthError && e.errorCode === NodeAuthErrorMessage.noLoopbackServerExists.code) {
@@ -51248,8 +51248,8 @@ Headers: ${JSON.stringify(headers)}`
         if (DEFAULT_MANAGED_IDENTITY_HTTP_STATUS_CODES_TO_RETRY_ON.includes(httpStatusCode) && currentRetry < DEFAULT_MANAGED_IDENTITY_MAX_RETRIES) {
           const retryAfterDelay = this.linearRetryStrategy.calculateDelay(retryAfterHeader, _DefaultManagedIdentityRetryPolicy.DEFAULT_MANAGED_IDENTITY_RETRY_DELAY_MS);
           logger.verbose(`Retrying request in ${retryAfterDelay}ms (retry attempt: ${currentRetry + 1})`);
-          await new Promise((resolve15) => {
-            return setTimeout(resolve15, retryAfterDelay);
+          await new Promise((resolve16) => {
+            return setTimeout(resolve16, retryAfterDelay);
           });
           return true;
         }
@@ -51405,7 +51405,7 @@ Headers: ${JSON.stringify(headers)}`
         if (!identityEndpoint || !imdsEndpoint) {
           const fileDetectionPath = AZURE_ARC_FILE_DETECTION[process.platform];
           try {
-            fs21.accessSync(fileDetectionPath, fs21.constants.F_OK | fs21.constants.R_OK);
+            fs20.accessSync(fileDetectionPath, fs20.constants.F_OK | fs20.constants.R_OK);
             identityEndpoint = DEFAULT_AZURE_ARC_IDENTITY_ENDPOINT;
             imdsEndpoint = HIMDS_EXECUTABLE_HELPER_STRING;
           } catch (err) {
@@ -51508,7 +51508,7 @@ Headers: ${JSON.stringify(headers)}`
             throw createManagedIdentityError(platformNotSupported);
           }
           const expectedSecretFilePath = SUPPORTED_AZURE_ARC_PLATFORMS[process.platform];
-          const fileName = path18.basename(secretFilePath);
+          const fileName = path19.basename(secretFilePath);
           if (!fileName.endsWith(".key")) {
             throw createManagedIdentityError(invalidFileExtension);
           }
@@ -51517,7 +51517,7 @@ Headers: ${JSON.stringify(headers)}`
           }
           let secretFileSize;
           try {
-            secretFileSize = await fs21.statSync(secretFilePath).size;
+            secretFileSize = await fs20.statSync(secretFilePath).size;
           } catch (e) {
             throw createManagedIdentityError(unableToReadSecretFile);
           }
@@ -51526,7 +51526,7 @@ Headers: ${JSON.stringify(headers)}`
           }
           let secret;
           try {
-            secret = fs21.readFileSync(secretFilePath, EncodingTypes.UTF8);
+            secret = fs20.readFileSync(secretFilePath, EncodingTypes.UTF8);
           } catch (e) {
             throw createManagedIdentityError(unableToReadSecretFile);
           }
@@ -51703,8 +51703,8 @@ Headers: ${JSON.stringify(headers)}`
         if ((HTTP_STATUS_400_CODES_FOR_EXPONENTIAL_STRATEGY.includes(httpStatusCode) || httpStatusCode >= msalCommon.HttpStatus.SERVER_ERROR_RANGE_START && httpStatusCode <= msalCommon.HttpStatus.SERVER_ERROR_RANGE_END && currentRetry < this.maxRetries) && currentRetry < this.maxRetries) {
           const retryAfterDelay = httpStatusCode === msalCommon.HttpStatus.GONE ? _ImdsRetryPolicy.HTTP_STATUS_GONE_RETRY_AFTER_MS : this.exponentialRetryStrategy.calculateDelay(currentRetry);
           logger.verbose(`Retrying request in ${retryAfterDelay}ms (retry attempt: ${currentRetry + 1})`);
-          await new Promise((resolve15) => {
-            return setTimeout(resolve15, retryAfterDelay);
+          await new Promise((resolve16) => {
+            return setTimeout(resolve16, retryAfterDelay);
           });
           return true;
         }
@@ -52770,7 +52770,7 @@ var require_createAbortablePromise = __commonJS({
     var abort_controller_1 = require_commonjs3();
     function createAbortablePromise(buildPromise, options) {
       const { cleanupBeforeAbort, abortSignal, abortErrorMsg } = options ?? {};
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         function rejectOnAbort() {
           reject(new abort_controller_1.AbortError(abortErrorMsg ?? "The operation was aborted."));
         }
@@ -52788,7 +52788,7 @@ var require_createAbortablePromise = __commonJS({
         try {
           buildPromise((x) => {
             removeListeners();
-            resolve15(x);
+            resolve16(x);
           }, (x) => {
             removeListeners();
             reject(x);
@@ -52815,8 +52815,8 @@ var require_delay2 = __commonJS({
     function delay(timeInMs, options) {
       let token;
       const { abortSignal, abortErrorMsg } = options ?? {};
-      return (0, createAbortablePromise_js_1.createAbortablePromise)((resolve15) => {
-        token = setTimeout(resolve15, timeInMs);
+      return (0, createAbortablePromise_js_1.createAbortablePromise)((resolve16) => {
+        token = setTimeout(resolve16, timeInMs);
       }, {
         cleanupBeforeAbort: () => clearTimeout(token),
         abortSignal,
@@ -54651,9 +54651,9 @@ var require_nodeHttpClient = __commonJS({
       if (stream4.readable === false) {
         return Promise.resolve();
       }
-      return new Promise((resolve15) => {
+      return new Promise((resolve16) => {
         const handler = () => {
-          resolve15();
+          resolve16();
           stream4.removeListener("close", handler);
           stream4.removeListener("end", handler);
           stream4.removeListener("error", handler);
@@ -54808,8 +54808,8 @@ var require_nodeHttpClient = __commonJS({
           headers: request.headers.toJSON({ preserveCase: true }),
           ...request.requestOverrides
         };
-        return new Promise((resolve15, reject) => {
-          const req = isInsecure ? import_node_http.default.request(options, resolve15) : import_node_https.default.request(options, resolve15);
+        return new Promise((resolve16, reject) => {
+          const req = isInsecure ? import_node_http.default.request(options, resolve16) : import_node_https.default.request(options, resolve16);
           req.once("error", (err) => {
             reject(
               new import_restError.RestError(err.message, { code: err.code ?? import_restError.RestError.REQUEST_SEND_ERROR, request })
@@ -54897,7 +54897,7 @@ var require_nodeHttpClient = __commonJS({
       return stream4;
     }
     function streamToText(stream4) {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         const buffer = [];
         stream4.on("data", (chunk) => {
           if (Buffer.isBuffer(chunk)) {
@@ -54907,7 +54907,7 @@ var require_nodeHttpClient = __commonJS({
           }
         });
         stream4.on("end", () => {
-          resolve15(Buffer.concat(buffer).toString("utf8"));
+          resolve16(Buffer.concat(buffer).toString("utf8"));
         });
         stream4.on("error", (e) => {
           if (e && e?.name === "AbortError") {
@@ -55347,7 +55347,7 @@ var require_helpers = __commonJS({
     var import_AbortError = require_AbortError2();
     var StandardAbortMessage = "The operation was aborted.";
     function delay(delayInMs, value, options) {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         let timer = void 0;
         let onAborted = void 0;
         const rejectOnAbort = () => {
@@ -55372,7 +55372,7 @@ var require_helpers = __commonJS({
         }
         timer = setTimeout(() => {
           removeListeners();
-          resolve15(value);
+          resolve16(value);
         }, delayInMs);
         if (options?.abortSignal) {
           options.abortSignal.addEventListener("abort", onAborted);
@@ -55867,8 +55867,8 @@ var require_helpers2 = __commonJS({
     function req(url3, opts = {}) {
       const href = typeof url3 === "string" ? url3 : url3.href;
       const req2 = (href.startsWith("https:") ? https3 : http3).request(url3, opts);
-      const promise2 = new Promise((resolve15, reject) => {
-        req2.once("response", resolve15).once("error", reject).end();
+      const promise2 = new Promise((resolve16, reject) => {
+        req2.once("response", resolve16).once("error", reject).end();
       });
       req2.then = promise2.then.bind(promise2);
       return req2;
@@ -56045,7 +56045,7 @@ var require_parse_proxy_response = __commonJS({
     var debug_1 = __importDefault2(require_src());
     var debug = (0, debug_1.default)("https-proxy-agent:parse-proxy-response");
     function parseProxyResponse(socket) {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         let buffersLength = 0;
         const buffers = [];
         function read() {
@@ -56111,7 +56111,7 @@ var require_parse_proxy_response = __commonJS({
           }
           debug("got proxy server response: %o %o", firstLine, headers);
           cleanup();
-          resolve15({
+          resolve16({
             connect: {
               statusCode,
               statusText,
@@ -57905,8 +57905,8 @@ var require_getClient = __commonJS({
       }
       const { allowInsecureConnection, httpClient } = clientOptions;
       const endpointUrl = clientOptions.endpoint ?? endpoint;
-      const client = (path18, ...args) => {
-        const getUrl = (requestOptions) => (0, import_urlHelpers.buildRequestUrl)(endpointUrl, path18, args, { allowInsecureConnection, ...requestOptions });
+      const client = (path19, ...args) => {
+        const getUrl = (requestOptions) => (0, import_urlHelpers.buildRequestUrl)(endpointUrl, path19, args, { allowInsecureConnection, ...requestOptions });
         return {
           get: (requestOptions = {}) => {
             return buildOperation(
@@ -60811,15 +60811,15 @@ var require_urlHelpers2 = __commonJS({
       let isAbsolutePath = false;
       let requestUrl = replaceAll(baseUri, urlReplacements);
       if (operationSpec.path) {
-        let path18 = replaceAll(operationSpec.path, urlReplacements);
-        if (operationSpec.path === "/{nextLink}" && path18.startsWith("/")) {
-          path18 = path18.substring(1);
+        let path19 = replaceAll(operationSpec.path, urlReplacements);
+        if (operationSpec.path === "/{nextLink}" && path19.startsWith("/")) {
+          path19 = path19.substring(1);
         }
-        if (isAbsoluteUrl(path18)) {
-          requestUrl = path18;
+        if (isAbsoluteUrl(path19)) {
+          requestUrl = path19;
           isAbsolutePath = true;
         } else {
-          requestUrl = appendPath(requestUrl, path18);
+          requestUrl = appendPath(requestUrl, path19);
         }
       }
       const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject);
@@ -60865,9 +60865,9 @@ var require_urlHelpers2 = __commonJS({
       }
       const searchStart = pathToAppend.indexOf("?");
       if (searchStart !== -1) {
-        const path18 = pathToAppend.substring(0, searchStart);
+        const path19 = pathToAppend.substring(0, searchStart);
         const search = pathToAppend.substring(searchStart + 1);
-        newPath = newPath + path18;
+        newPath = newPath + path19;
         if (search) {
           parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search;
         }
@@ -62342,14 +62342,14 @@ var init_open = __esm({
       }
       const subprocess = import_node_child_process5.default.spawn(command, cliArguments, childProcessOptions);
       if (options.wait) {
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           subprocess.once("error", reject);
           subprocess.once("close", (exitCode) => {
             if (!options.allowNonzeroExitCode && exitCode > 0) {
               reject(new Error(`Exited with code ${exitCode}`));
               return;
             }
-            resolve15(subprocess);
+            resolve16(subprocess);
           });
         });
       }
@@ -63841,7 +63841,7 @@ var require_azureDeveloperCliCredential = __commonJS({
           const encodedClaims = btoa(claims);
           claimsSections = ["--claims", encodedClaims];
         }
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           try {
             const args = [
               "auth",
@@ -63858,7 +63858,7 @@ var require_azureDeveloperCliCredential = __commonJS({
               cwd: exports2.developerCliCredentialInternals.getSafeWorkingDir(),
               timeout
             }, (error2, stdout, stderr) => {
-              resolve15({ stdout, stderr, error: error2 });
+              resolve16({ stdout, stderr, error: error2 });
             });
           } catch (err) {
             reject(err);
@@ -64027,7 +64027,7 @@ var require_azureCliCredential = __commonJS({
         if (subscription) {
           subscriptionSection = ["--subscription", `"${subscription}"`];
         }
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           try {
             const args = [
               "account",
@@ -64041,7 +64041,7 @@ var require_azureCliCredential = __commonJS({
             ];
             const command = ["az", ...args].join(" ");
             child_process_1.default.exec(command, { cwd: exports2.cliCredentialInternals.getSafeWorkingDir(), timeout }, (error2, stdout, stderr) => {
-              resolve15({ stdout, stderr, error: error2 });
+              resolve16({ stdout, stderr, error: error2 });
             });
           } catch (err) {
             reject(err);
@@ -64191,7 +64191,7 @@ var require_processUtils = __commonJS({
        * @internal
        */
       execFile(file2, params, options) {
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           node_child_process_1.default.execFile(file2, params, options, (error2, stdout, stderr) => {
             if (Buffer.isBuffer(stdout)) {
               stdout = stdout.toString("utf8");
@@ -64202,7 +64202,7 @@ var require_processUtils = __commonJS({
             if (stderr || error2) {
               reject(stderr ? new Error(stderr) : error2);
             } else {
-              resolve15(stdout);
+              resolve16(stdout);
             }
           });
         });
@@ -65880,7 +65880,7 @@ var require_sender = __commonJS({
     }
     async function sendInParallel(addresses, port, request, signal) {
       signal.throwIfAborted();
-      return await new Promise((resolve15, reject) => {
+      return await new Promise((resolve16, reject) => {
         const sockets = [];
         let errorCount = 0;
         const onError = (err) => {
@@ -65894,7 +65894,7 @@ var require_sender = __commonJS({
         const onMessage = (message) => {
           signal.removeEventListener("abort", onAbort);
           clearSockets();
-          resolve15(message);
+          resolve16(message);
         };
         const onAbort = () => {
           clearSockets();
@@ -65929,7 +65929,7 @@ var require_sender = __commonJS({
           family: _net.default.isIPv6(host) ? 6 : 4
         }];
       } else {
-        addresses = await new Promise((resolve15, reject) => {
+        addresses = await new Promise((resolve16, reject) => {
           const onAbort = () => {
             reject(signal.reason);
           };
@@ -65938,7 +65938,7 @@ var require_sender = __commonJS({
             all: true
           }, (err, addresses2) => {
             signal.removeEventListener("abort", onAbort);
-            err ? reject(err) : resolve15(addresses2);
+            err ? reject(err) : resolve16(addresses2);
           });
         });
       }
@@ -69413,25 +69413,25 @@ var require_util2 = __commonJS({
         };
       },
       createDeferredPromise: function() {
-        let resolve15;
+        let resolve16;
         let reject;
         const promise2 = new Promise((res, rej) => {
-          resolve15 = res;
+          resolve16 = res;
           reject = rej;
         });
         return {
           promise: promise2,
-          resolve: resolve15,
+          resolve: resolve16,
           reject
         };
       },
       promisify(fn) {
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           fn((err, ...args) => {
             if (err) {
               return reject(err);
             }
-            return resolve15(...args);
+            return resolve16(...args);
           });
         });
       },
@@ -70222,7 +70222,7 @@ var require_end_of_stream = __commonJS({
         validateBoolean(opts.cleanup, "cleanup");
         autoCleanup = opts.cleanup;
       }
-      return new Promise2((resolve15, reject) => {
+      return new Promise2((resolve16, reject) => {
         const cleanup = eos(stream4, opts, (err) => {
           if (autoCleanup) {
             cleanup();
@@ -70230,7 +70230,7 @@ var require_end_of_stream = __commonJS({
           if (err) {
             reject(err);
           } else {
-            resolve15();
+            resolve16();
           }
         });
       });
@@ -71396,7 +71396,7 @@ var require_readable = __commonJS({
         error2 = this.readableEnded ? null : new AbortError2();
         this.destroy(error2);
       }
-      return new Promise2((resolve15, reject) => eos(this, (err) => err && err !== error2 ? reject(err) : resolve15(null)));
+      return new Promise2((resolve16, reject) => eos(this, (err) => err && err !== error2 ? reject(err) : resolve16(null)));
     };
     Readable2.prototype.push = function(chunk, encoding) {
       return readableAddChunk(this, chunk, encoding, false);
@@ -71940,12 +71940,12 @@ var require_readable = __commonJS({
     }
     async function* createAsyncIterator(stream4, options) {
       let callback = nop;
-      function next(resolve15) {
+      function next(resolve16) {
         if (this === stream4) {
           callback();
           callback = nop;
         } else {
-          callback = resolve15;
+          callback = resolve16;
         }
       }
       stream4.on("readable", next);
@@ -72997,7 +72997,7 @@ var require_duplexify = __commonJS({
       );
     };
     function fromAsyncGen(fn) {
-      let { promise: promise2, resolve: resolve15 } = createDeferredPromise();
+      let { promise: promise2, resolve: resolve16 } = createDeferredPromise();
       const ac = new AbortController2();
       const signal = ac.signal;
       const value = fn(
@@ -73012,7 +73012,7 @@ var require_duplexify = __commonJS({
               throw new AbortError2(void 0, {
                 cause: signal.reason
               });
-            ({ promise: promise2, resolve: resolve15 } = createDeferredPromise());
+            ({ promise: promise2, resolve: resolve16 } = createDeferredPromise());
             yield chunk;
           }
         })(),
@@ -73023,8 +73023,8 @@ var require_duplexify = __commonJS({
       return {
         value,
         write(chunk, encoding, cb) {
-          const _resolve = resolve15;
-          resolve15 = null;
+          const _resolve = resolve16;
+          resolve16 = null;
           _resolve({
             chunk,
             done: false,
@@ -73032,8 +73032,8 @@ var require_duplexify = __commonJS({
           });
         },
         final(cb) {
-          const _resolve = resolve15;
-          resolve15 = null;
+          const _resolve = resolve16;
+          resolve16 = null;
           _resolve({
             done: true,
             cb
@@ -73484,7 +73484,7 @@ var require_pipeline4 = __commonJS({
           callback();
         }
       };
-      const wait = () => new Promise2((resolve15, reject) => {
+      const wait = () => new Promise2((resolve16, reject) => {
         if (error2) {
           reject(error2);
         } else {
@@ -73492,7 +73492,7 @@ var require_pipeline4 = __commonJS({
             if (error2) {
               reject(error2);
             } else {
-              resolve15();
+              resolve16();
             }
           };
         }
@@ -74136,8 +74136,8 @@ var require_operators = __commonJS({
                 next = null;
               }
               if (!done && (queue.length >= highWaterMark || cnt >= concurrency)) {
-                await new Promise2((resolve15) => {
-                  resume = resolve15;
+                await new Promise2((resolve16) => {
+                  resume = resolve16;
                 });
               }
             }
@@ -74171,8 +74171,8 @@ var require_operators = __commonJS({
               queue.shift();
               maybeResume();
             }
-            await new Promise2((resolve15) => {
-              next = resolve15;
+            await new Promise2((resolve16) => {
+              next = resolve16;
             });
           }
         } finally {
@@ -74430,7 +74430,7 @@ var require_promises = __commonJS({
     var { finished } = require_end_of_stream();
     require_stream2();
     function pipeline(...streams) {
-      return new Promise2((resolve15, reject) => {
+      return new Promise2((resolve16, reject) => {
         let signal;
         let end;
         const lastArg = streams[streams.length - 1];
@@ -74445,7 +74445,7 @@ var require_promises = __commonJS({
             if (err) {
               reject(err);
             } else {
-              resolve15(value);
+              resolve16(value);
             }
           },
           {
@@ -75312,7 +75312,7 @@ var require_message_io = __commonJS({
           credentialsDetails.maxVersion = "TLSv1.2";
         }
         const secureContext = tls.createSecureContext(credentialsDetails);
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           const duplexpair = new _nativeDuplexpair.default();
           const securePair = this.securePair = {
             cleartext: tls.connect({
@@ -75343,7 +75343,7 @@ var require_message_io = __commonJS({
             securePair.cleartext.pipe(this.incomingMessageStream);
             this.outgoingMessageStream.pipe(securePair.cleartext);
             this.tlsNegotiationComplete = true;
-            resolve15();
+            resolve16();
           };
           const onError = (err) => {
             securePair.encrypted.removeListener("readable", onReadable);
@@ -78838,7 +78838,7 @@ var require_js_joda = __commonJS({
           this.fieldValues.put(field, value);
           return this;
         };
-        _proto.resolve = function resolve15(resolverStyle, resolverFields) {
+        _proto.resolve = function resolve16(resolverStyle, resolverFields) {
           if (resolverFields != null) {
             this.fieldValues.retainAll(resolverFields);
           }
@@ -79442,7 +79442,7 @@ var require_js_joda = __commonJS({
         _proto.displayName = function displayName() {
           return this.toString();
         };
-        _proto.resolve = function resolve15() {
+        _proto.resolve = function resolve16() {
           return null;
         };
         _proto.name = function name() {
@@ -79500,7 +79500,7 @@ var require_js_joda = __commonJS({
           this.range().checkValidValue(newValue, this);
           return temporal.with(ChronoField.DAY_OF_YEAR, temporal.getLong(ChronoField.DAY_OF_YEAR) + (newValue - curValue));
         };
-        _proto2.resolve = function resolve15(fieldValues, partialTemporal, resolverStyle) {
+        _proto2.resolve = function resolve16(fieldValues, partialTemporal, resolverStyle) {
           var yearLong = fieldValues.get(ChronoField.YEAR);
           var qoyLong = fieldValues.get(QUARTER_OF_YEAR);
           if (yearLong == null || qoyLong == null) {
@@ -79611,7 +79611,7 @@ var require_js_joda = __commonJS({
           this.range().checkValidValue(newValue, this);
           return temporal.plus(MathUtil.safeSubtract(newValue, this.getFrom(temporal)), ChronoUnit.WEEKS);
         };
-        _proto4.resolve = function resolve15(fieldValues, partialTemporal, resolverStyle) {
+        _proto4.resolve = function resolve16(fieldValues, partialTemporal, resolverStyle) {
           var wbyLong = fieldValues.get(WEEK_BASED_YEAR);
           var dowLong = fieldValues.get(ChronoField.DAY_OF_WEEK);
           if (wbyLong == null || dowLong == null) {
@@ -95683,7 +95683,7 @@ var require_connector = __commonJS({
     async function connectInParallel(options, lookup, signal) {
       signal.throwIfAborted();
       const addresses = await lookupAllAddresses(options.host, lookup, signal);
-      return await new Promise((resolve15, reject) => {
+      return await new Promise((resolve16, reject) => {
         const sockets = new Array(addresses.length);
         const errors = [];
         function onError(err) {
@@ -95707,7 +95707,7 @@ var require_connector = __commonJS({
             socket.removeListener("connect", onConnect);
             socket.destroy();
           }
-          resolve15(this);
+          resolve16(this);
         }
         const onAbort = () => {
           for (let j = 0; j < sockets.length; j++) {
@@ -95738,7 +95738,7 @@ var require_connector = __commonJS({
       const addresses = await lookupAllAddresses(options.host, lookup, signal);
       for (const address of addresses) {
         try {
-          return await new Promise((resolve15, reject) => {
+          return await new Promise((resolve16, reject) => {
             const socket = _net.default.connect({
               ...options,
               host: address.address,
@@ -95761,7 +95761,7 @@ var require_connector = __commonJS({
               signal.removeEventListener("abort", onAbort);
               socket.removeListener("error", onError);
               socket.removeListener("connect", onConnect);
-              resolve15(socket);
+              resolve16(socket);
             };
             signal.addEventListener("abort", onAbort, {
               once: true
@@ -95790,7 +95790,7 @@ var require_connector = __commonJS({
           family: 4
         }];
       } else {
-        return await new Promise((resolve15, reject) => {
+        return await new Promise((resolve16, reject) => {
           const onAbort = () => {
             reject(signal.reason);
           };
@@ -95800,7 +95800,7 @@ var require_connector = __commonJS({
             all: true
           }, (err, addresses) => {
             signal.removeEventListener("abort", onAbort);
-            err ? reject(err) : resolve15(addresses);
+            err ? reject(err) : resolve16(addresses);
           });
         });
       }
@@ -96586,15 +96586,15 @@ var require_connection2 = __commonJS({
     var DEFAULT_LANGUAGE = "us_english";
     var DEFAULT_DATEFORMAT = "mdy";
     function withResolvers() {
-      let resolve15;
+      let resolve16;
       let reject;
       const promise2 = new Promise((res, rej) => {
-        resolve15 = res;
+        resolve16 = res;
         reject = rej;
       });
       return {
         promise: promise2,
-        resolve: resolve15,
+        resolve: resolve16,
         reject
       };
     }
@@ -97585,7 +97585,7 @@ var require_connection2 = __commonJS({
         };
         const {
           promise: promise2,
-          resolve: resolve15,
+          resolve: resolve16,
           reject
         } = withResolvers();
         const encryptsocket = tls.connect(encryptOptions);
@@ -97599,7 +97599,7 @@ var require_connection2 = __commonJS({
           try {
             const onError = reject;
             const onConnect = () => {
-              resolve15(encryptsocket);
+              resolve16(encryptsocket);
             };
             encryptsocket.once("error", onError);
             encryptsocket.once("secureConnect", onConnect);
@@ -98642,9 +98642,9 @@ var require_connection2 = __commonJS({
         this.debug.log("Retry after transient failure connecting to " + server + ":" + port);
         const {
           promise: promise2,
-          resolve: resolve15
+          resolve: resolve16
         } = withResolvers();
-        setTimeout(resolve15, this.config.options.connectionRetryInterval);
+        setTimeout(resolve16, this.config.options.connectionRetryInterval);
         await promise2;
         this.emit("retry");
         this.transitionTo(this.STATE.CONNECTING);
@@ -99154,15 +99154,15 @@ var require_connection_pool2 = __commonJS({
         return cfg;
       }
       _poolCreate() {
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           const resolveOnce = (v) => {
-            resolve15(v);
-            resolve15 = reject = () => {
+            resolve16(v);
+            resolve16 = reject = () => {
             };
           };
           const rejectOnce = (e) => {
             reject(e);
-            resolve15 = reject = () => {
+            resolve16 = reject = () => {
             };
           };
           let tedious;
@@ -99206,9 +99206,9 @@ var require_connection_pool2 = __commonJS({
       }
       _poolValidate(tedious) {
         if (tedious && !tedious.closed && !tedious.hasError) {
-          return !this.config.validateConnection || new shared.Promise((resolve15) => {
+          return !this.config.validateConnection || new shared.Promise((resolve16) => {
             const req = new tds.Request("SELECT 1;", (err) => {
-              resolve15(!err);
+              resolve16(!err);
             });
             tedious.execSql(req);
           });
@@ -99216,19 +99216,19 @@ var require_connection_pool2 = __commonJS({
         return false;
       }
       _poolDestroy(tedious) {
-        return new shared.Promise((resolve15, reject) => {
+        return new shared.Promise((resolve16, reject) => {
           if (!tedious) {
-            resolve15();
+            resolve16();
             return;
           }
           debug("connection(%d): destroying", IDS.get(tedious));
           if (tedious.closed) {
             debug("connection(%d): already closed", IDS.get(tedious));
-            resolve15();
+            resolve16();
           } else {
             tedious.once("end", () => {
               debug("connection(%d): destroyed", IDS.get(tedious));
-              resolve15();
+              resolve16();
             });
             tedious.close();
           }
@@ -100776,12 +100776,12 @@ var require_dist5 = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv2, list, fs21, exportName) {
+    function addFormats(ajv2, list, fs20, exportName) {
       var _a2;
       var _b;
       (_a2 = (_b = ajv2.opts.code).formats) !== null && _a2 !== void 0 ? _a2 : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv2.addFormat(f, fs21[f]);
+        ajv2.addFormat(f, fs20[f]);
     }
     module2.exports = exports2 = formatsPlugin;
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -100794,8 +100794,8 @@ var require_windows = __commonJS({
   "node_modules/isexe/windows.js"(exports2, module2) {
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs21 = require("fs");
-    function checkPathExt(path18, options) {
+    var fs20 = require("fs");
+    function checkPathExt(path19, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -100806,25 +100806,25 @@ var require_windows = __commonJS({
       }
       for (var i = 0; i < pathext.length; i++) {
         var p = pathext[i].toLowerCase();
-        if (p && path18.substr(-p.length).toLowerCase() === p) {
+        if (p && path19.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path18, options) {
+    function checkStat(stat, path19, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path18, options);
+      return checkPathExt(path19, options);
     }
-    function isexe(path18, options, cb) {
-      fs21.stat(path18, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path18, options));
+    function isexe(path19, options, cb) {
+      fs20.stat(path19, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path19, options));
       });
     }
-    function sync(path18, options) {
-      return checkStat(fs21.statSync(path18), path18, options);
+    function sync(path19, options) {
+      return checkStat(fs20.statSync(path19), path19, options);
     }
   }
 });
@@ -100834,14 +100834,14 @@ var require_mode = __commonJS({
   "node_modules/isexe/mode.js"(exports2, module2) {
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs21 = require("fs");
-    function isexe(path18, options, cb) {
-      fs21.stat(path18, function(er, stat) {
+    var fs20 = require("fs");
+    function isexe(path19, options, cb) {
+      fs20.stat(path19, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path18, options) {
-      return checkStat(fs21.statSync(path18), options);
+    function sync(path19, options) {
+      return checkStat(fs20.statSync(path19), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -100865,7 +100865,7 @@ var require_mode = __commonJS({
 // node_modules/isexe/index.js
 var require_isexe = __commonJS({
   "node_modules/isexe/index.js"(exports2, module2) {
-    var fs21 = require("fs");
+    var fs20 = require("fs");
     var core;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core = require_windows();
@@ -100874,7 +100874,7 @@ var require_isexe = __commonJS({
     }
     module2.exports = isexe;
     isexe.sync = sync;
-    function isexe(path18, options, cb) {
+    function isexe(path19, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -100883,17 +100883,17 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve15, reject) {
-          isexe(path18, options || {}, function(er, is) {
+        return new Promise(function(resolve16, reject) {
+          isexe(path19, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
-              resolve15(is);
+              resolve16(is);
             }
           });
         });
       }
-      core(path18, options || {}, function(er, is) {
+      core(path19, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -100903,9 +100903,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path18, options) {
+    function sync(path19, options) {
       try {
-        return core.sync(path18, options || {});
+        return core.sync(path19, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -100921,7 +100921,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "node_modules/which/which.js"(exports2, module2) {
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path18 = require("path");
+    var path19 = require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -100954,27 +100954,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i) => new Promise((resolve15, reject) => {
+      const step = (i) => new Promise((resolve16, reject) => {
         if (i === pathEnv.length)
-          return opt.all && found.length ? resolve15(found) : reject(getNotFoundError(cmd));
+          return opt.all && found.length ? resolve16(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path18.join(pathPart, cmd);
+        const pCmd = path19.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve15(subStep(p, i, 0));
+        resolve16(subStep(p, i, 0));
       });
-      const subStep = (p, i, ii) => new Promise((resolve15, reject) => {
+      const subStep = (p, i, ii) => new Promise((resolve16, reject) => {
         if (ii === pathExt.length)
-          return resolve15(step(i + 1));
+          return resolve16(step(i + 1));
         const ext = pathExt[ii];
         isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
           if (!er && is) {
             if (opt.all)
               found.push(p + ext);
             else
-              return resolve15(p + ext);
+              return resolve16(p + ext);
           }
-          return resolve15(subStep(p, i, ii + 1));
+          return resolve16(subStep(p, i, ii + 1));
         });
       });
       return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -100986,7 +100986,7 @@ var require_which = __commonJS({
       for (let i = 0; i < pathEnv.length; i++) {
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path18.join(pathPart, cmd);
+        const pCmd = path19.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j = 0; j < pathExt.length; j++) {
           const cur = p + pathExt[j];
@@ -101034,7 +101034,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
     "use strict";
-    var path18 = require("path");
+    var path19 = require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -101052,7 +101052,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env3[getPathKey({ env: env3 })],
-          pathExt: withoutPathExt ? path18.delimiter : void 0
+          pathExt: withoutPathExt ? path19.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -101061,7 +101061,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path18.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path19.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -101115,8 +101115,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path18, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path18.split("/").pop();
+      const [path19, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path19.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -101129,16 +101129,16 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "node_modules/cross-spawn/lib/util/readShebang.js"(exports2, module2) {
     "use strict";
-    var fs21 = require("fs");
+    var fs20 = require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs21.openSync(command, "r");
-        fs21.readSync(fd, buffer, 0, size, 0);
-        fs21.closeSync(fd);
+        fd = fs20.openSync(command, "r");
+        fs20.readSync(fd, buffer, 0, size, 0);
+        fs20.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -101151,7 +101151,7 @@ var require_readShebang = __commonJS({
 var require_parse2 = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
     "use strict";
-    var path18 = require("path");
+    var path19 = require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -101176,7 +101176,7 @@ var require_parse2 = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path18.normalize(parsed.command);
+        parsed.command = path19.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -101825,19 +101825,19 @@ var init_source = __esm({
 });
 
 // src/cli.ts
-var fs20 = __toESM(require("fs"));
+var fs19 = __toESM(require("fs"));
 var fsPromises = __toESM(require("fs/promises"));
-var path17 = __toESM(require("path"));
+var path18 = __toESM(require("path"));
 
 // src/parser.ts
 var path = __toESM(require("path"));
 
 // src/nornapiParser.ts
-function extractPathParameters(path18) {
+function extractPathParameters(path19) {
   const params = [];
   const regex = /(?<!\{)\{([a-zA-Z_][a-zA-Z0-9_]*)\}(?!\})/g;
   let match;
-  while ((match = regex.exec(path18)) !== null) {
+  while ((match = regex.exec(path19)) !== null) {
     params.push(match[1]);
   }
   return params;
@@ -101887,12 +101887,12 @@ function parseNornApiFile(content) {
     if (inEndpointsBlock) {
       const endpointMatch = trimmed.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*:\s*(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+(.+)$/i);
       if (endpointMatch) {
-        const path18 = endpointMatch[3].trim();
+        const path19 = endpointMatch[3].trim();
         endpoints.push({
           name: endpointMatch[1],
           method: endpointMatch[2].toUpperCase(),
-          path: path18,
-          parameters: extractPathParameters(path18)
+          path: path19,
+          parameters: extractPathParameters(path19)
         });
       }
       continue;
@@ -102340,8 +102340,8 @@ function parseNornSqlFile(text, sourcePath) {
 }
 
 // src/pathAccess.ts
-function getPathSegments(path18) {
-  return path18.replace(/\[(\d+)\]/g, ".$1").split(".").filter((part) => part !== "");
+function getPathSegments(path19) {
+  return path19.replace(/\[(\d+)\]/g, ".$1").split(".").filter((part) => part !== "");
 }
 function getPathPartValue(current, part) {
   if (Array.isArray(current) && part === "count") {
@@ -102349,12 +102349,12 @@ function getPathPartValue(current, part) {
   }
   return current[part];
 }
-function getNestedPathValue(obj, path18) {
-  if (!path18 || obj === null || obj === void 0) {
+function getNestedPathValue(obj, path19) {
+  if (!path19 || obj === null || obj === void 0) {
     return obj;
   }
   let current = obj;
-  for (const part of getPathSegments(path18)) {
+  for (const part of getPathSegments(path19)) {
     if (current === null || current === void 0) {
       return void 0;
     }
@@ -102500,8 +102500,8 @@ function extractFileLevelVariables(text) {
   }
   return variables;
 }
-function getNestedValue(obj, path18) {
-  return getNestedPathValue(obj, path18);
+function getNestedValue(obj, path19) {
+  return getNestedPathValue(obj, path19);
 }
 function valueToString(value) {
   if (value === null) {
@@ -102545,8 +102545,8 @@ function substituteVariables(text, variables) {
       const value = variables[varName];
       if (typeof value === "object" && value !== null) {
         if (pathPart) {
-          const path18 = pathPart.replace(/^\./, "");
-          const nestedValue = getNestedValue(value, path18);
+          const path19 = pathPart.replace(/^\./, "");
+          const nestedValue = getNestedValue(value, path19);
           if (nestedValue === void 0 && varName === ENV_SCOPE_KEY) {
             return match;
           }
@@ -102560,8 +102560,8 @@ function substituteVariables(text, variables) {
       if (pathPart && typeof value === "string") {
         try {
           const parsed = JSON.parse(value);
-          const path18 = pathPart.replace(/^\./, "");
-          const nestedValue = getNestedValue(parsed, path18);
+          const path19 = pathPart.replace(/^\./, "");
+          const nestedValue = getNestedValue(parsed, path19);
           if (nestedValue === void 0 && varName === ENV_SCOPE_KEY) {
             return match;
           }
@@ -103410,9 +103410,9 @@ function isVisitable(thing) {
 function removeBrackets(key) {
   return utils_default.endsWith(key, "[]") ? key.slice(0, -2) : key;
 }
-function renderKey(path18, key, dots) {
-  if (!path18) return key;
-  return path18.concat(key).map(function each(token, i) {
+function renderKey(path19, key, dots) {
+  if (!path19) return key;
+  return path19.concat(key).map(function each(token, i) {
     token = removeBrackets(token);
     return !dots && i ? "[" + token + "]" : token;
   }).join(dots ? "." : "");
@@ -103460,9 +103460,9 @@ function toFormData(obj, formData, options) {
     }
     return value;
   }
-  function defaultVisitor(value, key, path18) {
+  function defaultVisitor(value, key, path19) {
     let arr = value;
-    if (value && !path18 && typeof value === "object") {
+    if (value && !path19 && typeof value === "object") {
       if (utils_default.endsWith(key, "{}")) {
         key = metaTokens ? key : key.slice(0, -2);
         value = JSON.stringify(value);
@@ -103481,7 +103481,7 @@ function toFormData(obj, formData, options) {
     if (isVisitable(value)) {
       return true;
     }
-    formData.append(renderKey(path18, key, dots), convertValue(value));
+    formData.append(renderKey(path19, key, dots), convertValue(value));
     return false;
   }
   const stack = [];
@@ -103490,10 +103490,10 @@ function toFormData(obj, formData, options) {
     convertValue,
     isVisitable
   });
-  function build(value, path18) {
+  function build(value, path19) {
     if (utils_default.isUndefined(value)) return;
     if (stack.indexOf(value) !== -1) {
-      throw Error("Circular reference detected in " + path18.join("."));
+      throw Error("Circular reference detected in " + path19.join("."));
     }
     stack.push(value);
     utils_default.forEach(value, function each(el, key) {
@@ -103501,11 +103501,11 @@ function toFormData(obj, formData, options) {
         formData,
         el,
         utils_default.isString(key) ? key.trim() : key,
-        path18,
+        path19,
         exposedHelpers
       );
       if (result === true) {
-        build(el, path18 ? path18.concat(key) : [key]);
+        build(el, path19 ? path19.concat(key) : [key]);
       }
     });
     stack.pop();
@@ -103717,7 +103717,7 @@ var platform_default = {
 // node_modules/axios/lib/helpers/toURLEncodedForm.js
 function toURLEncodedForm(data, options) {
   return toFormData_default(data, new platform_default.classes.URLSearchParams(), {
-    visitor: function(value, key, path18, helpers) {
+    visitor: function(value, key, path19, helpers) {
       if (platform_default.isNode && utils_default.isBuffer(value)) {
         this.append(key, value.toString("base64"));
         return false;
@@ -103747,11 +103747,11 @@ function arrayToObject(arr) {
   return obj;
 }
 function formDataToJSON(formData) {
-  function buildPath(path18, value, target, index) {
-    let name = path18[index++];
+  function buildPath(path19, value, target, index) {
+    let name = path19[index++];
     if (name === "__proto__") return true;
     const isNumericKey = Number.isFinite(+name);
-    const isLast = index >= path18.length;
+    const isLast = index >= path19.length;
     name = !name && utils_default.isArray(target) ? target.length : name;
     if (isLast) {
       if (utils_default.hasOwnProp(target, name)) {
@@ -103764,7 +103764,7 @@ function formDataToJSON(formData) {
     if (!target[name] || !utils_default.isObject(target[name])) {
       target[name] = [];
     }
-    const result = buildPath(path18, value, target[name], index);
+    const result = buildPath(path19, value, target[name], index);
     if (result && utils_default.isArray(target[name])) {
       target[name] = arrayToObject(target[name]);
     }
@@ -104193,10 +104193,10 @@ utils_default.inherits(CanceledError, AxiosError_default, {
 var CanceledError_default = CanceledError;
 
 // node_modules/axios/lib/core/settle.js
-function settle(resolve15, reject, response) {
+function settle(resolve16, reject, response) {
   const validateStatus2 = response.config.validateStatus;
   if (!response.status || !validateStatus2 || validateStatus2(response.status)) {
-    resolve15(response);
+    resolve16(response);
   } else {
     reject(new AxiosError_default(
       "Request failed with status code " + response.status,
@@ -104819,7 +104819,7 @@ function setProxy(options, configProxy, location) {
 }
 var isHttpAdapterSupported = typeof process !== "undefined" && utils_default.kindOf(process) === "process";
 var wrapAsync = (asyncExecutor) => {
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve16, reject) => {
     let onDone;
     let isDone;
     const done = (value, isRejected) => {
@@ -104829,7 +104829,7 @@ var wrapAsync = (asyncExecutor) => {
     };
     const _resolve = (value) => {
       done(value);
-      resolve15(value);
+      resolve16(value);
     };
     const _reject = (reason) => {
       done(reason, true);
@@ -104881,7 +104881,7 @@ var http2Transport = {
   }
 };
 var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
-  return wrapAsync(async function dispatchHttpRequest(resolve15, reject, onDone) {
+  return wrapAsync(async function dispatchHttpRequest(resolve16, reject, onDone) {
     let { data, lookup, family, httpVersion = 1, http2Options } = config2;
     const { responseType, responseEncoding } = config2;
     const method = config2.method.toUpperCase();
@@ -104966,7 +104966,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
       }
       let convertedData;
       if (method !== "GET") {
-        return settle(resolve15, reject, {
+        return settle(resolve16, reject, {
           status: 405,
           statusText: "method not allowed",
           headers: {},
@@ -104988,7 +104988,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
       } else if (responseType === "stream") {
         convertedData = import_stream4.default.Readable.from(convertedData);
       }
-      return settle(resolve15, reject, {
+      return settle(resolve16, reject, {
         data: convertedData,
         status: 200,
         statusText: "OK",
@@ -105086,9 +105086,9 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
       auth2 = urlUsername + ":" + urlPassword;
     }
     auth2 && headers.delete("authorization");
-    let path18;
+    let path19;
     try {
-      path18 = buildURL(
+      path19 = buildURL(
         parsed.pathname + parsed.search,
         config2.params,
         config2.paramsSerializer
@@ -105106,7 +105106,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
       false
     );
     const options = {
-      path: path18,
+      path: path19,
       method,
       headers: headers.toJSON(),
       agents: { http: config2.httpAgent, https: config2.httpsAgent },
@@ -105207,7 +105207,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
       };
       if (responseType === "stream") {
         response.data = responseStream;
-        settle(resolve15, reject, response);
+        settle(resolve16, reject, response);
       } else {
         const responseBuffer = [];
         let totalResponseBytes = 0;
@@ -105255,7 +105255,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
           } catch (err) {
             return reject(AxiosError_default.from(err, null, config2, response.request, response));
           }
-          settle(resolve15, reject, response);
+          settle(resolve16, reject, response);
         });
       }
       abortEmitter.once("abort", (err) => {
@@ -105342,14 +105342,14 @@ var isURLSameOrigin_default = platform_default.hasStandardBrowserEnv ? /* @__PUR
 var cookies_default = platform_default.hasStandardBrowserEnv ? (
   // Standard browser envs support document.cookie
   {
-    write(name, value, expires, path18, domain2, secure, sameSite) {
+    write(name, value, expires, path19, domain2, secure, sameSite) {
       if (typeof document === "undefined") return;
       const cookie = [`${name}=${encodeURIComponent(value)}`];
       if (utils_default.isNumber(expires)) {
         cookie.push(`expires=${new Date(expires).toUTCString()}`);
       }
-      if (utils_default.isString(path18)) {
-        cookie.push(`path=${path18}`);
+      if (utils_default.isString(path19)) {
+        cookie.push(`path=${path19}`);
       }
       if (utils_default.isString(domain2)) {
         cookie.push(`domain=${domain2}`);
@@ -105504,7 +105504,7 @@ var resolveConfig_default = (config2) => {
 // node_modules/axios/lib/adapters/xhr.js
 var isXHRAdapterSupported = typeof XMLHttpRequest !== "undefined";
 var xhr_default = isXHRAdapterSupported && function(config2) {
-  return new Promise(function dispatchXhrRequest(resolve15, reject) {
+  return new Promise(function dispatchXhrRequest(resolve16, reject) {
     const _config = resolveConfig_default(config2);
     let requestData = _config.data;
     const requestHeaders = AxiosHeaders_default.from(_config.headers).normalize();
@@ -105538,7 +105538,7 @@ var xhr_default = isXHRAdapterSupported && function(config2) {
         request
       };
       settle(function _resolve(value) {
-        resolve15(value);
+        resolve16(value);
         done();
       }, function _reject(err) {
         reject(err);
@@ -105909,8 +105909,8 @@ var factory = (env3) => {
       responseType = responseType || "text";
       let responseData = await resolvers[utils_default.findKey(resolvers, responseType) || "text"](response, config2);
       !isStreamResponse && unsubscribe && unsubscribe();
-      return await new Promise((resolve15, reject) => {
-        settle(resolve15, reject, {
+      return await new Promise((resolve16, reject) => {
+        settle(resolve16, reject, {
           data: responseData,
           headers: AxiosHeaders_default.from(response.headers),
           status: response.status,
@@ -106306,8 +106306,8 @@ var CancelToken = class _CancelToken {
       throw new TypeError("executor must be a function.");
     }
     let resolvePromise;
-    this.promise = new Promise(function promiseExecutor(resolve15) {
-      resolvePromise = resolve15;
+    this.promise = new Promise(function promiseExecutor(resolve16) {
+      resolvePromise = resolve16;
     });
     const token = this;
     this.promise.then((cancel) => {
@@ -106320,9 +106320,9 @@ var CancelToken = class _CancelToken {
     });
     this.promise.then = (onfulfilled) => {
       let _resolve;
-      const promise2 = new Promise((resolve15) => {
-        token.subscribe(resolve15);
-        _resolve = resolve15;
+      const promise2 = new Promise((resolve16) => {
+        token.subscribe(resolve16);
+        _resolve = resolve16;
       }).then(onfulfilled);
       promise2.cancel = function reject() {
         token.unsubscribe(_resolve);
@@ -106696,10 +106696,10 @@ var safeToStringImpl = (val, seenArrays = /* @__PURE__ */ new WeakSet()) => {
 var safeToString = (val) => safeToStringImpl(val);
 function createPromiseCallback(cb) {
   let callback;
-  let resolve15;
+  let resolve16;
   let reject;
   const promise2 = new Promise((_resolve, _reject) => {
-    resolve15 = _resolve;
+    resolve16 = _resolve;
     reject = _reject;
   });
   if (typeof cb === "function") {
@@ -106715,7 +106715,7 @@ function createPromiseCallback(cb) {
     callback = (err, result) => {
       try {
         if (err) reject(err);
-        else resolve15(result);
+        else resolve16(result);
       } catch (e) {
         reject(e instanceof Error ? e : new Error());
       }
@@ -106749,18 +106749,18 @@ var MemoryCookieStore = class extends Store {
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  findCookie(domain2, path18, key, callback) {
+  findCookie(domain2, path19, key, callback) {
     const promiseCallback = createPromiseCallback(callback);
-    if (domain2 == null || path18 == null || key == null) {
+    if (domain2 == null || path19 == null || key == null) {
       return promiseCallback.resolve(void 0);
     }
-    const result = this.idx[domain2]?.[path18]?.[key];
+    const result = this.idx[domain2]?.[path19]?.[key];
     return promiseCallback.resolve(result);
   }
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  findCookies(domain2, path18, allowSpecialUseDomain = false, callback) {
+  findCookies(domain2, path19, allowSpecialUseDomain = false, callback) {
     if (typeof allowSpecialUseDomain === "function") {
       callback = allowSpecialUseDomain;
       allowSpecialUseDomain = true;
@@ -106771,7 +106771,7 @@ var MemoryCookieStore = class extends Store {
       return promiseCallback.resolve([]);
     }
     let pathMatcher;
-    if (!path18) {
+    if (!path19) {
       pathMatcher = function matchAll2(domainIndex) {
         for (const curPath in domainIndex) {
           const pathIndex = domainIndex[curPath];
@@ -106786,7 +106786,7 @@ var MemoryCookieStore = class extends Store {
     } else {
       pathMatcher = function matchRFC(domainIndex) {
         for (const cookiePath in domainIndex) {
-          if (pathMatch(path18, cookiePath)) {
+          if (pathMatch(path19, cookiePath)) {
             const pathIndex = domainIndex[cookiePath];
             for (const key in pathIndex) {
               const value = pathIndex[key];
@@ -106814,14 +106814,14 @@ var MemoryCookieStore = class extends Store {
    */
   putCookie(cookie, callback) {
     const promiseCallback = createPromiseCallback(callback);
-    const { domain: domain2, path: path18, key } = cookie;
-    if (domain2 == null || path18 == null || key == null) {
+    const { domain: domain2, path: path19, key } = cookie;
+    if (domain2 == null || path19 == null || key == null) {
       return promiseCallback.resolve(void 0);
     }
     const domainEntry = this.idx[domain2] ?? /* @__PURE__ */ Object.create(null);
     this.idx[domain2] = domainEntry;
-    const pathEntry = domainEntry[path18] ?? /* @__PURE__ */ Object.create(null);
-    domainEntry[path18] = pathEntry;
+    const pathEntry = domainEntry[path19] ?? /* @__PURE__ */ Object.create(null);
+    domainEntry[path19] = pathEntry;
     pathEntry[key] = cookie;
     return promiseCallback.resolve(void 0);
   }
@@ -106835,20 +106835,20 @@ var MemoryCookieStore = class extends Store {
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  removeCookie(domain2, path18, key, callback) {
+  removeCookie(domain2, path19, key, callback) {
     const promiseCallback = createPromiseCallback(callback);
-    delete this.idx[domain2]?.[path18]?.[key];
+    delete this.idx[domain2]?.[path19]?.[key];
     return promiseCallback.resolve(void 0);
   }
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  removeCookies(domain2, path18, callback) {
+  removeCookies(domain2, path19, callback) {
     const promiseCallback = createPromiseCallback(callback);
     const domainEntry = this.idx[domain2];
     if (domainEntry) {
-      if (path18) {
-        delete domainEntry[path18];
+      if (path19) {
+        delete domainEntry[path19];
       } else {
         delete this.idx[domain2];
       }
@@ -106874,8 +106874,8 @@ var MemoryCookieStore = class extends Store {
     domains.forEach((domain2) => {
       const domainEntry = idx[domain2] ?? {};
       const paths = Object.keys(domainEntry);
-      paths.forEach((path18) => {
-        const pathEntry = domainEntry[path18] ?? {};
+      paths.forEach((path19) => {
+        const pathEntry = domainEntry[path19] ?? {};
         const keys = Object.keys(pathEntry);
         keys.forEach((key) => {
           const keyEntry = pathEntry[key];
@@ -107759,18 +107759,18 @@ function cookieCompare(a, b) {
   cmp = (a.creationIndex || 0) - (b.creationIndex || 0);
   return cmp;
 }
-function defaultPath(path18) {
-  if (!path18 || path18.slice(0, 1) !== "/") {
+function defaultPath(path19) {
+  if (!path19 || path19.slice(0, 1) !== "/") {
     return "/";
   }
-  if (path18 === "/") {
-    return path18;
+  if (path19 === "/") {
+    return path19;
   }
-  const rightSlash = path18.lastIndexOf("/");
+  const rightSlash = path19.lastIndexOf("/");
   if (rightSlash === 0) {
     return "/";
   }
-  return path18.slice(0, rightSlash);
+  return path19.slice(0, rightSlash);
 }
 var IP_REGEX_LOWERCASE = /(?:^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$)|(?:^(?:(?:[a-f\d]{1,4}:){7}(?:[a-f\d]{1,4}|:)|(?:[a-f\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|:[a-f\d]{1,4}|:)|(?:[a-f\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-f\d]{1,4}){1,2}|:)|(?:[a-f\d]{1,4}:){4}(?:(?::[a-f\d]{1,4}){0,1}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-f\d]{1,4}){1,3}|:)|(?:[a-f\d]{1,4}:){3}(?:(?::[a-f\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-f\d]{1,4}){1,4}|:)|(?:[a-f\d]{1,4}:){2}(?:(?::[a-f\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-f\d]{1,4}){1,5}|:)|(?:[a-f\d]{1,4}:){1}(?:(?::[a-f\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-f\d]{1,4}){1,6}|:)|(?::(?:(?::[a-f\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-f\d]{1,4}){1,7}|:)))$)/;
 function domainMatch(domain2, cookieDomain, canonicalize) {
@@ -108172,7 +108172,7 @@ var CookieJar = class _CookieJar {
       return promiseCallback.reject(parameterError);
     }
     const host = canonicalDomain(context.hostname);
-    const path18 = context.pathname || "/";
+    const path19 = context.pathname || "/";
     const potentiallyTrustworthy = isPotentiallyTrustworthy(
       url3,
       this.allowSecureOnLocal
@@ -108203,7 +108203,7 @@ var CookieJar = class _CookieJar {
           return false;
         }
       }
-      if (!allPaths && typeof c.path === "string" && !pathMatch(path18, c.path)) {
+      if (!allPaths && typeof c.path === "string" && !pathMatch(path19, c.path)) {
         return false;
       }
       if (c.secure && !potentiallyTrustworthy) {
@@ -108235,7 +108235,7 @@ var CookieJar = class _CookieJar {
     }
     store.findCookies(
       host,
-      allPaths ? null : path18,
+      allPaths ? null : path19,
       this.allowSpecialUseDomain,
       (err, cookies) => {
         if (err) {
@@ -108829,7 +108829,7 @@ async function sendRequest(request, retryOptions) {
   return sendRequestWithJar(request, sharedCookieJar, retryOptions);
 }
 function sleep(ms) {
-  return new Promise((resolve15) => setTimeout(resolve15, ms));
+  return new Promise((resolve16) => setTimeout(resolve16, ms));
 }
 function shouldRetry(response, error2) {
   if (error2) {
@@ -109245,7 +109245,7 @@ async function runScript(type, scriptPath, args, workingDir, variables = {}, cap
         captureVar
       };
   }
-  return new Promise((resolve15) => {
+  return new Promise((resolve16) => {
     const env3 = {
       ...process.env,
       // Pass variables as environment variables with NORN_ prefix
@@ -109269,7 +109269,7 @@ async function runScript(type, scriptPath, args, workingDir, variables = {}, cap
       stderr += data.toString();
     });
     child.on("error", (err) => {
-      resolve15({
+      resolve16({
         success: false,
         output: cleanScriptOutput(stdout),
         error: `Failed to execute script: ${err.message}`,
@@ -109283,7 +109283,7 @@ async function runScript(type, scriptPath, args, workingDir, variables = {}, cap
     child.on("close", (code) => {
       const exitCode = code ?? 0;
       const cleanedOutput = cleanScriptOutput(stdout);
-      resolve15({
+      resolve16({
         success: exitCode === 0,
         output: cleanedOutput,
         error: stderr.trim(),
@@ -109462,8 +109462,8 @@ function validateAgainstSchemaDetailed(value, schemaPath, basePath, workspaceRoo
     if (!valid && validate3.errors) {
       const errors = validate3.errors.map((err) => convertAjvError(err, value));
       const errorStrings = validate3.errors.map((err) => {
-        const path18 = err.instancePath || "(root)";
-        return `${path18}: ${err.message}`;
+        const path19 = err.instancePath || "(root)";
+        return `${path19}: ${err.message}`;
       });
       return {
         valid: false,
@@ -109501,8 +109501,8 @@ function validateAgainstSchemaObjectDetailed(value, schema) {
     if (!valid && validate3.errors) {
       const errors = validate3.errors.map((err) => convertAjvError(err, value));
       const errorStrings = validate3.errors.map((err) => {
-        const path18 = err.instancePath || "(root)";
-        return `${path18}: ${err.message}`;
+        const path19 = err.instancePath || "(root)";
+        return `${path19}: ${err.message}`;
       });
       return {
         valid: false,
@@ -109648,7 +109648,7 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
   if (refMatch) {
     const responseIdx = parseInt(refMatch[1], 10);
     const responseIndex = responseIdx - 1;
-    const path18 = refMatch[2];
+    const path19 = refMatch[2];
     if (responseIndex < 0 || responseIndex >= responses.length) {
       return {
         value: void 0,
@@ -109656,12 +109656,12 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
       };
     }
     const response = responses[responseIndex];
-    const value = getValueByPath2(response, path18);
+    const value = getValueByPath2(response, path19);
     return {
       value,
       responseIndex: responseIdx,
       response,
-      jsonPath: path18,
+      jsonPath: path19,
       variableName: responseIndexToVariable?.get(responseIdx)
     };
   }
@@ -109678,22 +109678,22 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
     if (varName in variables) {
       const varValue = variables[varName];
       if (typeof varValue === "object" && varValue !== null) {
-        const path18 = pathPart.replace(/^\./, "");
-        const value = getNestedValue2(varValue, path18);
+        const path19 = pathPart.replace(/^\./, "");
+        const value = getNestedValue2(varValue, path19);
         const isHttpResponse = "status" in varValue && "body" in varValue;
         return {
           value,
           variableName: varName,
-          jsonPath: path18,
+          jsonPath: path19,
           response: isHttpResponse ? varValue : void 0
         };
       }
       if (typeof varValue === "string") {
         try {
           const parsed = JSON.parse(varValue);
-          const path18 = pathPart.replace(/^\./, "");
-          const value = getNestedValue2(parsed, path18);
-          return { value, variableName: varName, jsonPath: path18 };
+          const path19 = pathPart.replace(/^\./, "");
+          const value = getNestedValue2(parsed, path19);
+          return { value, variableName: varName, jsonPath: path19 };
         } catch {
           return { value: void 0, error: `Cannot access path on non-object variable: ${varName}` };
         }
@@ -109722,14 +109722,14 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
       const varValue = variables[varName];
       if (pathPart) {
         if (typeof varValue === "object" && varValue !== null) {
-          const path18 = pathPart.replace(/^\./, "");
-          return { value: getNestedValue2(varValue, path18) };
+          const path19 = pathPart.replace(/^\./, "");
+          return { value: getNestedValue2(varValue, path19) };
         }
         if (typeof varValue === "string") {
           try {
             const parsed = JSON.parse(varValue);
-            const path18 = pathPart.replace(/^\./, "");
-            return { value: getNestedValue2(parsed, path18) };
+            const path19 = pathPart.replace(/^\./, "");
+            return { value: getNestedValue2(parsed, path19) };
           } catch {
             return { value: void 0, error: `Cannot access path on non-object variable: ${varName}` };
           }
@@ -109766,8 +109766,8 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
   }
   return { value: void 0, error: `Cannot resolve expression: ${trimmed}` };
 }
-function getNestedValue2(obj, path18) {
-  return getNestedPathValue(obj, path18);
+function getNestedValue2(obj, path19) {
+  return getNestedPathValue(obj, path19);
 }
 function areValuesEqual(leftValue, rightValue) {
   if (leftValue === rightValue) {
@@ -110058,11 +110058,11 @@ function readJsonFile(filePath, workingDir) {
     };
   }
 }
-function setNestedValue(obj, path18, value) {
-  if (!path18 || obj === null || obj === void 0 || typeof obj !== "object") {
+function setNestedValue(obj, path19, value) {
+  if (!path19 || obj === null || obj === void 0 || typeof obj !== "object") {
     return false;
   }
-  const parts = path18.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
+  const parts = path19.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
   if (parts.length === 0) {
     return false;
   }
@@ -110333,12 +110333,99 @@ function validatePreparedRequest(parsed, context) {
 }
 
 // src/sqlConfig.ts
-var fs9 = __toESM(require("fs"));
-var path7 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
+
+// src/nornConfig.ts
+var fs3 = __toESM(require("fs"));
+var path5 = __toESM(require("path"));
+var NORN_CONFIG_FILENAME = "norn.config.json";
+function getSearchDirectory(startPath) {
+  if (!startPath) {
+    return process.cwd();
+  }
+  const absolute = path5.resolve(startPath);
+  try {
+    const stats = fs3.statSync(absolute);
+    return stats.isDirectory() ? absolute : path5.dirname(absolute);
+  } catch {
+    return path5.extname(absolute) ? path5.dirname(absolute) : absolute;
+  }
+}
+function findNearestConfigFile(startPath, fileName) {
+  let currentDir = getSearchDirectory(startPath);
+  while (true) {
+    const candidate = path5.join(currentDir, fileName);
+    if (fs3.existsSync(candidate)) {
+      return candidate;
+    }
+    const parentDir = path5.dirname(currentDir);
+    if (parentDir === currentDir) {
+      return void 0;
+    }
+    currentDir = parentDir;
+  }
+}
+function parseJsonFile(filePath, validator, label) {
+  let raw;
+  try {
+    raw = fs3.readFileSync(filePath, "utf-8");
+  } catch (error2) {
+    throw new Error(`Failed to read ${label}: ${error2 instanceof Error ? error2.message : String(error2)}`);
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error2) {
+    throw new Error(`Invalid JSON in ${label}: ${error2 instanceof Error ? error2.message : String(error2)}`);
+  }
+  if (!validator(parsed)) {
+    throw new Error(`Invalid ${label} structure`);
+  }
+  return parsed;
+}
+function isObjectRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isStringRecord(value) {
+  return isObjectRecord(value) && Object.values(value).every((entry) => typeof entry === "string");
+}
+function isKnownSection(value) {
+  return value === void 0 || isObjectRecord(value);
+}
+function isNornProjectConfig(value) {
+  if (!isObjectRecord(value)) {
+    return false;
+  }
+  if (value.version !== 1) {
+    return false;
+  }
+  return isKnownSection(value.sql) && isKnownSection(value.mcp);
+}
+function loadNornConfig(startPath) {
+  const filePath = findNearestConfigFile(startPath, NORN_CONFIG_FILENAME);
+  if (!filePath) {
+    throw new Error(`Could not find ${NORN_CONFIG_FILENAME}`);
+  }
+  return {
+    filePath,
+    config: parseJsonFile(filePath, isNornProjectConfig, NORN_CONFIG_FILENAME)
+  };
+}
+function loadNornConfigSection(startPath, sectionName, validator) {
+  const { filePath, config: config2 } = loadNornConfig(startPath);
+  const section = config2[sectionName];
+  if (section === void 0) {
+    throw new Error(`Could not find ${sectionName} section in ${NORN_CONFIG_FILENAME}`);
+  }
+  if (!validator(section)) {
+    throw new Error(`Invalid ${sectionName} section in ${NORN_CONFIG_FILENAME}`);
+  }
+  return { filePath, section };
+}
 
 // src/sqlBuiltInAdapters.ts
-var fs8 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
+var fs9 = __toESM(require("fs"));
+var path7 = __toESM(require("path"));
 var import_child_process2 = require("child_process");
 
 // node_modules/pg/esm/index.mjs
@@ -110406,12 +110493,12 @@ function buildMissingConnectionError(adapterLabel, profile) {
   return `Missing required ${adapterLabel} connection string. Expected 'connectionString ${profile} = ...' in .nornenv.`;
 }
 function getBundledSqlClientDirectory() {
-  return path6.resolve(__dirname, "..", "vendor", "microsoft.data.sqlclient", "windows-netfx");
+  return path7.resolve(__dirname, "..", "vendor", "microsoft.data.sqlclient", "windows-netfx");
 }
 function ensureBundledSqlClientDirectory() {
   const sqlClientDir = getBundledSqlClientDirectory();
-  const mainAssemblyPath = path6.join(sqlClientDir, "Microsoft.Data.SqlClient.dll");
-  if (!fs8.existsSync(mainAssemblyPath)) {
+  const mainAssemblyPath = path7.join(sqlClientDir, "Microsoft.Data.SqlClient.dll");
+  if (!fs9.existsSync(mainAssemblyPath)) {
     fail(`Missing bundled Microsoft.Data.SqlClient runtime at '${mainAssemblyPath}'.`);
   }
   return sqlClientDir;
@@ -110673,7 +110760,7 @@ finally {
   const payload = JSON.stringify(request);
   const command = getIntegratedPowerShellCommand();
   const commandArgs = ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-OutputFormat", "Text", "-EncodedCommand", encodePowerShellCommand(script)];
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve16, reject) => {
     const child = (0, import_child_process2.spawn)(command, commandArgs, {
       cwd: request.context?.workingDir || process.cwd(),
       shell: false,
@@ -110700,7 +110787,7 @@ finally {
       }
       try {
         const parsed = JSON.parse(stdout.trim());
-        resolve15(parsed);
+        resolve16(parsed);
       } catch (error2) {
         reject(new Error(`Invalid PowerShell SQL adapter response: ${error2 instanceof Error ? error2.message : String(error2)}`));
       }
@@ -110820,7 +110907,7 @@ async function runBuiltInSqlServerAdapter(request) {
     fail(buildMissingConnectionError("SQL Server", request.connection.profile));
   }
   if (usesWindowsIntegratedSqlServerAuth(connectionString)) {
-    fail("This SQL Server connection string uses Windows/Integrated authentication. Use adapter 'sqlserver-windows' in norn.sql.json.");
+    fail("This SQL Server connection string uses Windows/Integrated authentication. Use adapter 'sqlserver-windows' in norn.config.json sql.connections.");
   }
   const pool = new mssql.ConnectionPool(connectionString);
   try {
@@ -110894,122 +110981,70 @@ async function runBuiltInSqlAdapter(adapterId, request) {
 }
 
 // src/sqlConfig.ts
-var NORN_SQL_CONFIG_FILENAME = "norn.sql.json";
-var NORN_SQL_ADAPTERS_FILENAME = "norn.adapters.json";
-function getSearchDirectory(startPath) {
-  if (!startPath) {
-    return process.cwd();
-  }
-  const absolute = path7.resolve(startPath);
-  try {
-    const stats = fs9.statSync(absolute);
-    return stats.isDirectory() ? absolute : path7.dirname(absolute);
-  } catch {
-    return path7.extname(absolute) ? path7.dirname(absolute) : absolute;
-  }
-}
-function findNearestConfigFile(startPath, fileName) {
-  let currentDir = getSearchDirectory(startPath);
-  while (true) {
-    const candidate = path7.join(currentDir, fileName);
-    if (fs9.existsSync(candidate)) {
-      return candidate;
-    }
-    const parentDir = path7.dirname(currentDir);
-    if (parentDir === currentDir) {
-      return void 0;
-    }
-    currentDir = parentDir;
-  }
-}
-function parseJsonFile(filePath, validator, label) {
-  let raw;
-  try {
-    raw = fs9.readFileSync(filePath, "utf-8");
-  } catch (error2) {
-    throw new Error(`Failed to read ${label}: ${error2 instanceof Error ? error2.message : String(error2)}`);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (error2) {
-    throw new Error(`Invalid JSON in ${label}: ${error2 instanceof Error ? error2.message : String(error2)}`);
-  }
-  if (!validator(parsed)) {
-    throw new Error(`Invalid ${label} structure`);
-  }
-  return parsed;
-}
-function isStringRecord(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  return Object.values(value).every((entry) => typeof entry === "string");
+function isConnectionsConfig(value) {
+  return isObjectRecord(value) && Object.values(value).every(
+    (connection) => isStringRecord(connection) && typeof connection.adapter === "string" && typeof connection.profile === "string"
+  );
 }
-function isProjectConfig(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  const candidate = value;
-  if (candidate.version !== 1) {
-    return false;
-  }
-  const connections = candidate.connections;
-  if (!connections || typeof connections !== "object" || Array.isArray(connections)) {
-    return false;
-  }
-  return Object.values(connections).every((connection) => {
-    if (!connection || typeof connection !== "object" || Array.isArray(connection)) {
+function isAdaptersConfig(value) {
+  return isObjectRecord(value) && Object.values(value).every((adapter2) => {
+    if (!isObjectRecord(adapter2)) {
       return false;
     }
-    return isStringRecord(connection) && typeof connection.adapter === "string" && typeof connection.profile === "string";
+    const command = adapter2.command;
+    return Array.isArray(command) && command.length > 0 && command.every((part) => typeof part === "string" && part.length > 0);
   });
 }
-function isAdaptersConfig(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
+function isSqlConfigSection(value) {
+  if (!isObjectRecord(value)) {
     return false;
   }
-  const candidate = value;
-  if (candidate.version !== 1) {
+  if (value.connections !== void 0 && !isConnectionsConfig(value.connections)) {
     return false;
   }
-  const adapters = candidate.adapters;
-  if (!adapters || typeof adapters !== "object" || Array.isArray(adapters)) {
+  if (value.adapters !== void 0 && !isAdaptersConfig(value.adapters)) {
     return false;
   }
-  return Object.values(adapters).every((adapter2) => {
-    if (!adapter2 || typeof adapter2 !== "object" || Array.isArray(adapter2)) {
-      return false;
-    }
-    const command = adapter2.command;
-    return Array.isArray(command) && command.length > 0 && command.every((part) => typeof part === "string" && part.length > 0);
-  });
+  return true;
+}
+function loadSqlConfigSection(startPath) {
+  const { filePath, section } = loadNornConfigSection(startPath, "sql", isSqlConfigSection);
+  return {
+    filePath,
+    config: section
+  };
 }
 function loadNornSqlProjectConfig(startPath) {
-  const filePath = findNearestConfigFile(startPath, NORN_SQL_CONFIG_FILENAME);
-  if (!filePath) {
-    throw new Error(`Could not find ${NORN_SQL_CONFIG_FILENAME}`);
+  const { filePath, config: config2 } = loadSqlConfigSection(startPath);
+  if (!config2.connections) {
+    throw new Error(`Could not find sql.connections in ${NORN_CONFIG_FILENAME}`);
   }
   return {
     filePath,
-    config: parseJsonFile(filePath, isProjectConfig, NORN_SQL_CONFIG_FILENAME)
+    config: {
+      version: 1,
+      connections: config2.connections
+    }
   };
 }
 function loadNornSqlAdaptersConfig(startPath) {
-  const filePath = findNearestConfigFile(startPath, NORN_SQL_ADAPTERS_FILENAME);
-  if (!filePath) {
-    throw new Error(`Could not find ${NORN_SQL_ADAPTERS_FILENAME}`);
+  const { filePath, config: config2 } = loadSqlConfigSection(startPath);
+  if (!config2.adapters) {
+    throw new Error(`Could not find sql.adapters in ${NORN_CONFIG_FILENAME}`);
   }
   return {
     filePath,
-    config: parseJsonFile(filePath, isAdaptersConfig, NORN_SQL_ADAPTERS_FILENAME)
+    config: {
+      version: 1,
+      adapters: config2.adapters
+    }
   };
 }
 function resolveSqlConnection(startPath, alias) {
   const { filePath, config: config2 } = loadNornSqlProjectConfig(startPath);
   const connection = config2.connections[alias];
   if (!connection) {
-    throw new Error(`Connection alias '${alias}' was not found in ${NORN_SQL_CONFIG_FILENAME}`);
+    throw new Error(`Connection alias '${alias}' was not found in ${NORN_CONFIG_FILENAME} sql.connections`);
   }
   return {
     alias,
@@ -111019,19 +111054,19 @@ function resolveSqlConnection(startPath, alias) {
   };
 }
 function resolveCommandParts(configPath, command) {
-  const configDir = path7.dirname(configPath);
+  const configDir = path8.dirname(configPath);
   return command.map((part, index) => {
     if (!part) {
       return part;
     }
     if (index === 0) {
-      if (path7.isAbsolute(part) || !part.startsWith(".") && !part.includes(path7.sep) && !part.includes("/")) {
+      if (path8.isAbsolute(part) || !part.startsWith(".") && !part.includes(path8.sep) && !part.includes("/")) {
         return part;
       }
-      return path7.resolve(configDir, part);
+      return path8.resolve(configDir, part);
     }
     if (part.startsWith(".")) {
-      return path7.resolve(configDir, part);
+      return path8.resolve(configDir, part);
     }
     return part;
   });
@@ -111040,7 +111075,7 @@ function resolveSqlAdapterCommand(startPath, adapterId) {
   const { filePath, config: config2 } = loadNornSqlAdaptersConfig(startPath);
   const adapter2 = config2.adapters[adapterId];
   if (!adapter2) {
-    throw new Error(`Adapter '${adapterId}' was not found in ${NORN_SQL_ADAPTERS_FILENAME}`);
+    throw new Error(`Adapter '${adapterId}' was not found in ${NORN_CONFIG_FILENAME} sql.adapters`);
   }
   return {
     adapterId,
@@ -111104,7 +111139,7 @@ async function runExternalSqlAdapter(command, request, workingDir) {
   if (!command.length) {
     throw new Error("SQL adapter command is empty");
   }
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve16, reject) => {
     const child = (0, import_child_process3.spawn)(command[0], command.slice(1), {
       cwd: workingDir,
       env: process.env,
@@ -111125,7 +111160,7 @@ async function runExternalSqlAdapter(command, request, workingDir) {
         return;
       }
       settled = true;
-      resolve15(response);
+      resolve16(response);
     };
     child.stdout.on("data", (chunk) => {
       stdout += chunk.toString();
@@ -111190,8 +111225,8 @@ async function runSqlAdapter(target, request, workingDir) {
 }
 
 // src/mcpClient.ts
-var fs12 = __toESM(require("fs"));
-var path11 = __toESM(require("path"));
+var fs11 = __toESM(require("fs"));
+var path12 = __toESM(require("path"));
 
 // node_modules/zod/v3/helpers/util.js
 var util3;
@@ -111552,8 +111587,8 @@ function getErrorMap() {
 
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path18, errorMaps, issueData } = params;
-  const fullPath = [...path18, ...issueData.path || []];
+  const { data, path: path19, errorMaps, issueData } = params;
+  const fullPath = [...path19, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -111668,11 +111703,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path18, key) {
+  constructor(parent, value, path19, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path18;
+    this._path = path19;
     this._key = key;
   }
   get path() {
@@ -115316,10 +115351,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path18) {
-  if (!path18)
+function getElementAtPath(obj, path19) {
+  if (!path19)
     return obj;
-  return path18.reduce((acc, key) => acc?.[key], obj);
+  return path19.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -115702,11 +115737,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path18, issues) {
+function prefixIssues(path19, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path18);
+    iss.path.unshift(path19);
     return iss;
   });
 }
@@ -124059,7 +124094,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve15) => setTimeout(resolve15, pollInterval));
+        await new Promise((resolve16) => setTimeout(resolve16, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error2) {
@@ -124076,7 +124111,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       const earlyReject = (error2) => {
         reject(error2);
       };
@@ -124154,7 +124189,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve15(parseResult.data);
+            resolve16(parseResult.data);
           }
         } catch (error2) {
           reject(error2);
@@ -124415,12 +124450,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve15, interval);
+      const timeoutId = setTimeout(resolve16, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -125371,7 +125406,7 @@ var StdioClientTransport = class {
     if (this._process) {
       throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
     }
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       this._process = (0, import_cross_spawn.default)(this._serverParams.command, this._serverParams.args ?? [], {
         // merge default env with server env because mcp server needs some env vars
         env: {
@@ -125388,7 +125423,7 @@ var StdioClientTransport = class {
         this.onerror?.(error2);
       });
       this._process.on("spawn", () => {
-        resolve15();
+        resolve16();
       });
       this._process.on("close", (_code) => {
         this._process = void 0;
@@ -125447,22 +125482,22 @@ var StdioClientTransport = class {
     if (this._process) {
       const processToClose = this._process;
       this._process = void 0;
-      const closePromise = new Promise((resolve15) => {
+      const closePromise = new Promise((resolve16) => {
         processToClose.once("close", () => {
-          resolve15();
+          resolve16();
         });
       });
       try {
         processToClose.stdin?.end();
       } catch {
       }
-      await Promise.race([closePromise, new Promise((resolve15) => setTimeout(resolve15, 2e3).unref())]);
+      await Promise.race([closePromise, new Promise((resolve16) => setTimeout(resolve16, 2e3).unref())]);
       if (processToClose.exitCode === null) {
         try {
           processToClose.kill("SIGTERM");
         } catch {
         }
-        await Promise.race([closePromise, new Promise((resolve15) => setTimeout(resolve15, 2e3).unref())]);
+        await Promise.race([closePromise, new Promise((resolve16) => setTimeout(resolve16, 2e3).unref())]);
       }
       if (processToClose.exitCode === null) {
         try {
@@ -125474,15 +125509,15 @@ var StdioClientTransport = class {
     this._readBuffer.clear();
   }
   send(message) {
-    return new Promise((resolve15) => {
+    return new Promise((resolve16) => {
       if (!this._process?.stdin) {
         throw new Error("Not connected");
       }
       const json2 = serializeMessage(message);
       if (this._process.stdin.write(json2)) {
-        resolve15();
+        resolve16();
       } else {
-        this._process.stdin.once("drain", resolve15);
+        this._process.stdin.once("drain", resolve16);
       }
     });
   }
@@ -126936,80 +126971,48 @@ var StreamableHTTPClientTransport = class {
 };
 
 // src/mcpConfig.ts
-var fs10 = __toESM(require("fs"));
-var path8 = __toESM(require("path"));
-var NORN_MCP_CONFIG_FILENAME = "norn.mcp.json";
-function parseJsonFile2(filePath, validator, label) {
-  let raw;
-  try {
-    raw = fs10.readFileSync(filePath, "utf-8");
-  } catch (error2) {
-    throw new Error(`Failed to read ${label}: ${error2 instanceof Error ? error2.message : String(error2)}`);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (error2) {
-    throw new Error(`Invalid JSON in ${label}: ${error2 instanceof Error ? error2.message : String(error2)}`);
-  }
-  if (!validator(parsed)) {
-    throw new Error(`Invalid ${label} structure`);
-  }
-  return parsed;
-}
-function isStringRecord2(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  return Object.values(value).every((entry) => typeof entry === "string");
-}
+var path9 = __toESM(require("path"));
 function isRawMcpStdioServerConfig(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
+  if (!isObjectRecord(value)) {
     return false;
   }
-  const candidate = value;
-  if (candidate.transport !== "stdio") {
+  if (value.transport !== "stdio") {
     return false;
   }
-  if (!Array.isArray(candidate.command) || candidate.command.length === 0) {
+  if (!Array.isArray(value.command) || value.command.length === 0) {
     return false;
   }
-  if (!candidate.command.every((part) => typeof part === "string" && part.length > 0)) {
+  if (!value.command.every((part) => typeof part === "string" && part.length > 0)) {
     return false;
   }
-  if (candidate.cwd !== void 0 && typeof candidate.cwd !== "string") {
+  if (value.cwd !== void 0 && typeof value.cwd !== "string") {
     return false;
   }
   return true;
 }
 function isRawMcpHttpServerConfig(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
+  if (!isObjectRecord(value)) {
     return false;
   }
-  const candidate = value;
-  if (candidate.transport !== "http") {
+  if (value.transport !== "http") {
     return false;
   }
-  if (typeof candidate.url !== "string" || candidate.url.length === 0) {
+  if (typeof value.url !== "string" || value.url.length === 0) {
     return false;
   }
-  if (candidate.headers !== void 0 && !isStringRecord2(candidate.headers)) {
+  if (value.headers !== void 0 && !isStringRecord(value.headers)) {
     return false;
   }
-  if (candidate.timeoutMs !== void 0 && (typeof candidate.timeoutMs !== "number" || !Number.isFinite(candidate.timeoutMs) || candidate.timeoutMs <= 0)) {
+  if (value.timeoutMs !== void 0 && (typeof value.timeoutMs !== "number" || !Number.isFinite(value.timeoutMs) || value.timeoutMs <= 0)) {
     return false;
   }
   return true;
 }
 function isNornMcpProjectConfig(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  const candidate = value;
-  if (candidate.version !== 1) {
+  if (!isObjectRecord(value)) {
     return false;
   }
-  const servers = candidate.servers;
+  const servers = value.servers;
   if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
     return false;
   }
@@ -127023,20 +127026,20 @@ function resolveTemplateString(value, envVariables) {
   return substituteVariables(value, scopedVariables);
 }
 function resolveCommandParts2(configPath, command, envVariables) {
-  const configDir = path8.dirname(configPath);
+  const configDir = path9.dirname(configPath);
   return command.map((part, index) => {
     const resolvedPart = resolveTemplateString(part, envVariables);
     if (!resolvedPart) {
       return resolvedPart;
     }
     if (index === 0) {
-      if (path8.isAbsolute(resolvedPart) || !resolvedPart.startsWith(".") && !resolvedPart.includes(path8.sep) && !resolvedPart.includes("/")) {
+      if (path9.isAbsolute(resolvedPart) || !resolvedPart.startsWith(".") && !resolvedPart.includes(path9.sep) && !resolvedPart.includes("/")) {
         return resolvedPart;
       }
-      return path8.resolve(configDir, resolvedPart);
+      return path9.resolve(configDir, resolvedPart);
     }
     if (resolvedPart.startsWith(".")) {
-      return path8.resolve(configDir, resolvedPart);
+      return path9.resolve(configDir, resolvedPart);
     }
     return resolvedPart;
   });
@@ -127049,10 +127052,10 @@ function resolveRelativeDirectory(configPath, value, envVariables) {
   if (!resolvedValue) {
     return resolvedValue;
   }
-  if (path8.isAbsolute(resolvedValue)) {
+  if (path9.isAbsolute(resolvedValue)) {
     return resolvedValue;
   }
-  return path8.resolve(path8.dirname(configPath), resolvedValue);
+  return path9.resolve(path9.dirname(configPath), resolvedValue);
 }
 function resolveHeaders(headers, envVariables) {
   if (!headers) {
@@ -127080,13 +127083,13 @@ function resolveServerConfig(filePath, config2, envVariables) {
   };
 }
 function loadNornMcpProjectConfig(startPath) {
-  const filePath = findNearestConfigFile(startPath, NORN_MCP_CONFIG_FILENAME);
-  if (!filePath) {
-    throw new Error(`Could not find ${NORN_MCP_CONFIG_FILENAME}`);
-  }
+  const { filePath, section } = loadNornConfigSection(startPath, "mcp", isNornMcpProjectConfig);
   return {
     filePath,
-    config: parseJsonFile2(filePath, isNornMcpProjectConfig, NORN_MCP_CONFIG_FILENAME)
+    config: {
+      ...section,
+      version: 1
+    }
   };
 }
 function loadResolvedNornMcpProjectConfig(startPath, envVariables) {
@@ -127107,38 +127110,38 @@ function resolveMcpServer(startPath, alias, envVariables) {
   const { filePath, config: config2 } = loadResolvedNornMcpProjectConfig(startPath, envVariables);
   const server = config2.servers[alias];
   if (!server) {
-    throw new Error(`Server alias '${alias}' was not found in ${NORN_MCP_CONFIG_FILENAME}`);
+    throw new Error(`Server alias '${alias}' was not found in ${NORN_CONFIG_FILENAME} mcp.servers`);
   }
   return { filePath, server };
 }
 
 // src/mcpToolIntellisenseCache.ts
-var path10 = __toESM(require("path"));
+var path11 = __toESM(require("path"));
 
 // src/cacheDir.ts
-var fs11 = __toESM(require("fs"));
-var path9 = __toESM(require("path"));
+var fs10 = __toESM(require("fs"));
+var path10 = __toESM(require("path"));
 var NORN_CACHE_DIR = ".norn-cache";
 var CACHE_GITIGNORE_FILE = ".gitignore";
 var CACHE_GITIGNORE_CONTENT = "*\n";
 var PROJECT_ROOT_MARKERS = [".git", "package.json", "pnpm-workspace.yaml", "package-lock.json", "yarn.lock", ".nornenv"];
 function getSearchStartDirectory(targetPath) {
-  const resolvedPath = path9.resolve(targetPath);
+  const resolvedPath = path10.resolve(targetPath);
   try {
-    const stats = fs11.statSync(resolvedPath);
-    return stats.isDirectory() ? resolvedPath : path9.dirname(resolvedPath);
+    const stats = fs10.statSync(resolvedPath);
+    return stats.isDirectory() ? resolvedPath : path10.dirname(resolvedPath);
   } catch {
-    return path9.dirname(resolvedPath);
+    return path10.dirname(resolvedPath);
   }
 }
 function findProjectRoot(targetPath) {
   let dir = getSearchStartDirectory(targetPath);
   let projectRoot;
   while (true) {
-    if (PROJECT_ROOT_MARKERS.some((marker) => fs11.existsSync(path9.join(dir, marker)))) {
+    if (PROJECT_ROOT_MARKERS.some((marker) => fs10.existsSync(path10.join(dir, marker)))) {
       projectRoot = dir;
     }
-    const parent = path9.dirname(dir);
+    const parent = path10.dirname(dir);
     if (parent === dir) {
       break;
     }
@@ -127147,21 +127150,21 @@ function findProjectRoot(targetPath) {
   return projectRoot ?? getSearchStartDirectory(targetPath);
 }
 function ensureNornCacheGitignore(cacheDir) {
-  const gitignorePath = path9.join(cacheDir, CACHE_GITIGNORE_FILE);
+  const gitignorePath = path10.join(cacheDir, CACHE_GITIGNORE_FILE);
   try {
-    const hasDesiredContent = fs11.existsSync(gitignorePath) && fs11.readFileSync(gitignorePath, "utf8") === CACHE_GITIGNORE_CONTENT;
+    const hasDesiredContent = fs10.existsSync(gitignorePath) && fs10.readFileSync(gitignorePath, "utf8") === CACHE_GITIGNORE_CONTENT;
     if (hasDesiredContent) {
       return;
     }
-    fs11.writeFileSync(gitignorePath, CACHE_GITIGNORE_CONTENT, "utf8");
+    fs10.writeFileSync(gitignorePath, CACHE_GITIGNORE_CONTENT, "utf8");
   } catch {
   }
 }
 function ensureNornCacheDir(rootPath) {
-  const cacheDir = path9.join(rootPath, NORN_CACHE_DIR);
+  const cacheDir = path10.join(rootPath, NORN_CACHE_DIR);
   try {
-    if (!fs11.existsSync(cacheDir)) {
-      fs11.mkdirSync(cacheDir, { recursive: true });
+    if (!fs10.existsSync(cacheDir)) {
+      fs10.mkdirSync(cacheDir, { recursive: true });
     }
     ensureNornCacheGitignore(cacheDir);
     return cacheDir;
@@ -127170,14 +127173,14 @@ function ensureNornCacheDir(rootPath) {
   }
 }
 function getNornCacheFilePath(rootPath, fileName) {
-  return path9.join(rootPath, NORN_CACHE_DIR, fileName);
+  return path10.join(rootPath, NORN_CACHE_DIR, fileName);
 }
 function loadVersionedJsonCache(options) {
-  if (!options.cachePath || !fs11.existsSync(options.cachePath)) {
+  if (!options.cachePath || !fs10.existsSync(options.cachePath)) {
     return options.createDefault();
   }
   try {
-    const content = fs11.readFileSync(options.cachePath, "utf-8");
+    const content = fs10.readFileSync(options.cachePath, "utf-8");
     const parsed = JSON.parse(content);
     if (parsed.version !== options.version) {
       return options.createDefault();
@@ -127195,7 +127198,7 @@ function saveVersionedJsonCache(cachePath, cache, ensureDirectory) {
     return false;
   }
   try {
-    fs11.writeFileSync(cachePath, JSON.stringify(cache, null, 2), "utf-8");
+    fs10.writeFileSync(cachePath, JSON.stringify(cache, null, 2), "utf-8");
     return true;
   } catch {
     return false;
@@ -127222,10 +127225,10 @@ function cloneSerializableValue(value) {
 var CACHE_VERSION = 1;
 var CACHE_FILE = "mcp-tool-intellisense.json";
 function getCachePathForConfig(configPath) {
-  return getNornCacheFilePath(path10.dirname(configPath), CACHE_FILE);
+  return getNornCacheFilePath(path11.dirname(configPath), CACHE_FILE);
 }
 function ensureCacheDirForConfig(configPath) {
-  return !!ensureNornCacheDir(path10.dirname(configPath));
+  return !!ensureNornCacheDir(path11.dirname(configPath));
 }
 function loadCacheForConfig(configPath) {
   return loadVersionedJsonCache({
@@ -127277,8 +127280,8 @@ var NornJsonSchemaValidator = class {
 };
 function getNornClientVersion() {
   try {
-    const packageJsonPath = path11.resolve(__dirname, "..", "package.json");
-    const packageJson = JSON.parse(fs12.readFileSync(packageJsonPath, "utf-8"));
+    const packageJsonPath = path12.resolve(__dirname, "..", "package.json");
+    const packageJson = JSON.parse(fs11.readFileSync(packageJsonPath, "utf-8"));
     return typeof packageJson.version === "string" ? packageJson.version : "0.0.0";
   } catch {
     return "0.0.0";
@@ -127572,6 +127575,144 @@ function prepareRequestFromContent(requestContent, variables, apiDefinitions) {
   };
 }
 
+// src/environmentTemplates.ts
+var TEMPLATE_TOKEN_REGEX = /\{\{([^{}]+)\}\}/g;
+var ENV_REFERENCE_REGEX = /^(?:\$env\.)?([a-zA-Z_][a-zA-Z0-9_]*)$/;
+var ENV_TEMPLATE_SCOPES_KEY = "$nornEnvTemplateScopes";
+function attachEnvironmentTemplateScopes(variables, commonVariables, environmentVariables) {
+  Object.defineProperty(variables, ENV_TEMPLATE_SCOPES_KEY, {
+    value: {
+      commonNames: new Set(Object.keys(commonVariables)),
+      environmentNames: new Set(Object.keys(environmentVariables ?? {}))
+    },
+    enumerable: false,
+    configurable: true,
+    writable: false
+  });
+  return variables;
+}
+function getEnvironmentTemplateScopes(variables) {
+  const value = variables[ENV_TEMPLATE_SCOPES_KEY];
+  if (!value || typeof value !== "object") {
+    return void 0;
+  }
+  const candidate = value;
+  if (!(candidate.commonNames instanceof Set) || !(candidate.environmentNames instanceof Set)) {
+    return void 0;
+  }
+  return candidate;
+}
+function valueToTemplateString(value) {
+  if (value === void 0 || value === null) {
+    return "";
+  }
+  if (typeof value === "object") {
+    return JSON.stringify(value);
+  }
+  return String(value);
+}
+function parseTemplateReference(rawReference) {
+  const trimmed = rawReference.trim();
+  const match = trimmed.match(ENV_REFERENCE_REGEX);
+  return match?.[1];
+}
+function resolveEnvironmentTemplateValue(variableName, variables, secretNames = /* @__PURE__ */ new Set()) {
+  const resolving = /* @__PURE__ */ new Set();
+  const cache = /* @__PURE__ */ new Map();
+  const scopes = getEnvironmentTemplateScopes(variables);
+  const resolveVariable = (name) => {
+    const cached2 = cache.get(name);
+    if (cached2) {
+      return cached2;
+    }
+    if (resolving.has(name)) {
+      const cycle = [...resolving, name].join(" -> ");
+      return {
+        value: `{{${name}}}`,
+        secret: secretNames.has(name),
+        dependencies: /* @__PURE__ */ new Set([name]),
+        errors: [{
+          kind: "cycle",
+          variableName: name,
+          reference: name,
+          message: `Circular .nornenv template reference detected: ${cycle}`
+        }]
+      };
+    }
+    if (!Object.prototype.hasOwnProperty.call(variables, name)) {
+      return {
+        value: `{{${name}}}`,
+        secret: false,
+        dependencies: /* @__PURE__ */ new Set([name]),
+        errors: [{
+          kind: "unresolved",
+          variableName: name,
+          reference: name,
+          message: `.nornenv template reference '${name}' was not found in the active environment.`
+        }]
+      };
+    }
+    resolving.add(name);
+    const rawValue = valueToTemplateString(variables[name]);
+    const dependencies = /* @__PURE__ */ new Set();
+    const errors = [];
+    let secret = secretNames.has(name);
+    const value = rawValue.replace(TEMPLATE_TOKEN_REGEX, (token, rawReference) => {
+      const referenceName = parseTemplateReference(rawReference);
+      if (!referenceName) {
+        errors.push({
+          kind: "unsupported",
+          variableName: name,
+          reference: rawReference.trim(),
+          message: `.nornenv template reference '${rawReference.trim()}' is not supported. Use {{name}} or {{$env.name}}.`
+        });
+        return token;
+      }
+      const resolved = resolveVariable(referenceName);
+      dependencies.add(referenceName);
+      for (const dependency of resolved.dependencies) {
+        dependencies.add(dependency);
+      }
+      if (scopes?.environmentNames.has(name) && scopes.environmentNames.has(referenceName)) {
+        errors.push({
+          kind: "scope",
+          variableName: name,
+          reference: referenceName,
+          message: `.nornenv template reference '${referenceName}' is environment-specific. Values inside [env:...] sections can only reference common variables.`
+        });
+      }
+      if (resolved.secret) {
+        secret = true;
+      }
+      errors.push(...resolved.errors);
+      return resolved.value;
+    });
+    resolving.delete(name);
+    const resolution = {
+      value,
+      secret,
+      dependencies,
+      errors
+    };
+    cache.set(name, resolution);
+    return resolution;
+  };
+  return resolveVariable(variableName);
+}
+function collectResolvedEnvironmentSecretValues(variables, secretNames) {
+  const values = /* @__PURE__ */ new Map();
+  for (const name of secretNames) {
+    if (!Object.prototype.hasOwnProperty.call(variables, name)) {
+      continue;
+    }
+    const resolved = resolveEnvironmentTemplateValue(name, variables, secretNames);
+    if (resolved.errors.length === 0) {
+      values.set(name, resolved.value);
+    }
+  }
+  return values;
+}
+
 // src/mcpToolSchema.ts
 function getInputSchemaObject(source) {
   if (!source.inputSchema || typeof source.inputSchema !== "object" || Array.isArray(source.inputSchema)) {
@@ -128136,8 +128277,8 @@ function parseJsonBackedValue(value) {
     return value;
   }
 }
-function getVariableValueByPath(path18, variables) {
-  const parts = getPathSegments(path18);
+function getVariableValueByPath(path19, variables) {
+  const parts = getPathSegments(path19);
   let current = variables;
   for (const part of parts) {
     if (current === null || current === void 0) {
@@ -128511,8 +128652,8 @@ function evaluateValueExpression(expr, runtimeVariables) {
     if (typeof dataToNavigate !== "object" || dataToNavigate === null) {
       return { value: String(varValue), error: `Cannot access path on non-object value` };
     }
-    const path18 = pathPart.replace(/^\./, "");
-    const parts = getPathSegments(path18);
+    const path19 = pathPart.replace(/^\./, "");
+    const parts = getPathSegments(path19);
     let current = dataToNavigate;
     for (const part of parts) {
       if (current === null || current === void 0) {
@@ -128558,7 +128699,10 @@ function evaluateSqlArgumentExpression(expr, runtimeVariables) {
 }
 function getSqlConnectionValues(profile, runtimeVariables) {
   const values = {};
-  const envScope = runtimeVariables.$env && typeof runtimeVariables.$env === "object" ? runtimeVariables.$env : runtimeVariables;
+  const envScope = runtimeVariables.$env && typeof runtimeVariables.$env === "object" ? runtimeVariables.$env : void 0;
+  if (!envScope) {
+    return values;
+  }
   const prefix = `${profile}_`;
   for (const [key, value] of Object.entries(envScope)) {
     if (!key.startsWith(prefix) || value === void 0 || value === null) {
@@ -128568,7 +128712,12 @@ function getSqlConnectionValues(profile, runtimeVariables) {
     if (!propertyName) {
       continue;
     }
-    values[propertyName] = typeof value === "string" ? value : JSON.stringify(value);
+    const resolved = resolveEnvironmentTemplateValue(key, envScope);
+    if (resolved.errors.length > 0) {
+      const message = resolved.errors.map((error2) => error2.message).join("; ");
+      throw new Error(`Failed to resolve SQL connection value '${key}': ${message}`);
+    }
+    values[propertyName] = resolved.value;
   }
   return values;
 }
@@ -128628,8 +128777,8 @@ function resolveBareVariables(text, variables) {
     if (varName in variables) {
       const value = variables[varName];
       if (pathPart) {
-        const path18 = pathPart.replace(/^\./, "");
-        const nestedValue = getNestedPathValue(value, path18);
+        const path19 = pathPart.replace(/^\./, "");
+        const nestedValue = getNestedPathValue(value, path19);
         return valueToString2(nestedValue);
       }
       return valueToString2(value);
@@ -128649,8 +128798,8 @@ function resolveBareVariables(text, variables) {
         if (varName in variables) {
           const value = variables[varName];
           if (pathPart) {
-            const path18 = pathPart.replace(/^\./, "");
-            return valueToString2(getNestedPathValue(value, path18));
+            const path19 = pathPart.replace(/^\./, "");
+            return valueToString2(getNestedPathValue(value, path19));
           }
           return valueToString2(value);
         }
@@ -128711,7 +128860,7 @@ function valueToString2(value) {
   return String(value);
 }
 function sleep2(ms) {
-  return new Promise((resolve15) => setTimeout(resolve15, ms));
+  return new Promise((resolve16) => setTimeout(resolve16, ms));
 }
 function isIfCommand(line2) {
   return /^if\s+.+$/i.test(line2.trim());
@@ -129086,24 +129235,24 @@ function extractCaptureDirectives(content) {
   for (const line2 of content.split("\n")) {
     const match = line2.trim().match(captureRegex);
     if (match) {
-      let path18 = match[3] || "";
-      if (path18.startsWith(".")) {
-        path18 = path18.substring(1);
+      let path19 = match[3] || "";
+      if (path19.startsWith(".")) {
+        path19 = path19.substring(1);
       }
       captures.push({
         varName: match[1],
         afterRequest: parseInt(match[2], 10),
-        path: path18
+        path: path19
       });
     }
   }
   return captures;
 }
-function getValueByPath(response, path18) {
-  if (!path18) {
+function getValueByPath(response, path19) {
+  if (!path19) {
     return void 0;
   }
-  const parts = getPathSegments(path18);
+  const parts = getPathSegments(path19);
   if (parts.length === 0) {
     return void 0;
   }
@@ -129472,8 +129621,8 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
               }
             }
             if (pathPart) {
-              const path18 = pathPart.replace(/^\./, "");
-              newValue = getNestedPathValue(value, path18);
+              const path19 = pathPart.replace(/^\./, "");
+              newValue = getNestedPathValue(value, path19);
             } else {
               newValue = value;
             }
@@ -130108,8 +130257,8 @@ ${indentMultiline(userMessage)}`;
             if (sequenceSources) {
               const sourceFile = sequenceSources.get(targetName.toLowerCase());
               if (sourceFile) {
-                const path18 = await import("path");
-                subWorkingDir = path18.dirname(sourceFile);
+                const path19 = await import("path");
+                subWorkingDir = path19.dirname(sourceFile);
               }
             }
             const targetLocation = executionContext?.sequenceLocationIndex?.get(targetName.toLowerCase());
@@ -130417,8 +130566,8 @@ ${indentMultiline(userMessage)}`;
           if (sequenceSources) {
             const sourceFile = sequenceSources.get(sequenceName.toLowerCase());
             if (sourceFile) {
-              const path18 = await import("path");
-              subWorkingDir = path18.dirname(sourceFile);
+              const path19 = await import("path");
+              subWorkingDir = path19.dirname(sourceFile);
             }
           }
           const targetLocation = executionContext?.sequenceLocationIndex?.get(sequenceName.toLowerCase());
@@ -131179,7 +131328,7 @@ function formatRunSummary(results, totalDuration, colors) {
 }
 
 // src/cli/reporters/junit.ts
-var fs13 = __toESM(require("fs"));
+var fs12 = __toESM(require("fs"));
 function escapeXml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 }
@@ -131199,7 +131348,7 @@ function generateJUnitReport(results, options) {
     xml += generateTestSuite(result, redaction);
   }
   xml += "</testsuites>\n";
-  fs13.writeFileSync(outputPath, xml, "utf-8");
+  fs12.writeFileSync(outputPath, xml, "utf-8");
 }
 function generateTestSuite(result, redaction) {
   const assertions = result.assertionResults || [];
@@ -131325,11 +131474,11 @@ Response: ${bodyStr}`;
   xml += "    </testcase>\n";
   xml += "  </testsuite>\n";
   xml += "</testsuites>\n";
-  fs13.writeFileSync(outputPath, xml, "utf-8");
+  fs12.writeFileSync(outputPath, xml, "utf-8");
 }
 
 // src/cli/reporters/html.ts
-var fs14 = __toESM(require("fs"));
+var fs13 = __toESM(require("fs"));
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
@@ -131443,7 +131592,7 @@ function generateHtmlReport(results, options) {
     </script>
 </body>
 </html>`;
-  fs14.writeFileSync(outputPath, html, "utf-8");
+  fs13.writeFileSync(outputPath, html, "utf-8");
 }
 function generateSequenceHtml(result, index, redaction) {
   const statusClass = result.success ? "passed" : "failed";
@@ -131897,8 +132046,8 @@ function generateHtmlReportFromResponse(response, testName, options) {
 }
 
 // src/environmentParser.ts
-var fs16 = __toESM(require("fs"));
-var path13 = __toESM(require("path"));
+var fs15 = __toESM(require("fs"));
+var path14 = __toESM(require("path"));
 
 // src/secrets/crypto.ts
 var crypto7 = __toESM(require("crypto"));
@@ -131966,20 +132115,20 @@ function decryptSecretValue(encryptedValue, sharedKey) {
 }
 
 // src/secrets/keyStore.ts
-var fs15 = __toESM(require("fs"));
-var path12 = __toESM(require("path"));
+var fs14 = __toESM(require("fs"));
+var path13 = __toESM(require("path"));
 var CACHE_FILE2 = "secret-keys.json";
 var CACHE_VERSION2 = 1;
 var CACHE_SCAN_IGNORED_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "out"]);
 var sessionKeys = /* @__PURE__ */ new Map();
 var projectSecretKeyCacheDirs = /* @__PURE__ */ new Map();
 function getCacheFilePath(cacheDir) {
-  return path12.join(cacheDir, CACHE_FILE2);
+  return path13.join(cacheDir, CACHE_FILE2);
 }
 function cacheFileExists(cacheDir) {
   const cacheFilePath = getCacheFilePath(cacheDir);
   try {
-    return fs15.existsSync(cacheFilePath) && fs15.statSync(cacheFilePath).isFile();
+    return fs14.existsSync(cacheFilePath) && fs14.statSync(cacheFilePath).isFile();
   } catch {
     return false;
   }
@@ -131996,13 +132145,13 @@ function getProjectSecretKeyCacheDirs(projectRoot) {
     if (!dir) {
       continue;
     }
-    const cacheDir = path12.join(dir, NORN_CACHE_DIR);
+    const cacheDir = path13.join(dir, NORN_CACHE_DIR);
     if (cacheFileExists(cacheDir)) {
       results.push(cacheDir);
     }
     let entries;
     try {
-      entries = fs15.readdirSync(dir, { withFileTypes: true });
+      entries = fs14.readdirSync(dir, { withFileTypes: true });
     } catch {
       continue;
     }
@@ -132013,7 +132162,7 @@ function getProjectSecretKeyCacheDirs(projectRoot) {
       if (entry.name === NORN_CACHE_DIR || CACHE_SCAN_IGNORED_DIRS.has(entry.name)) {
         continue;
       }
-      queue.push(path12.join(dir, entry.name));
+      queue.push(path13.join(dir, entry.name));
     }
   }
   results.sort();
@@ -132021,11 +132170,11 @@ function getProjectSecretKeyCacheDirs(projectRoot) {
   return results;
 }
 function getCacheDistance(targetPath, cacheDir) {
-  const relative5 = path12.relative(getSearchStartDirectory(targetPath), cacheDir);
+  const relative5 = path13.relative(getSearchStartDirectory(targetPath), cacheDir);
   if (!relative5 || relative5 === ".") {
     return 0;
   }
-  return relative5.split(path12.sep).filter((segment) => segment !== "").length;
+  return relative5.split(path13.sep).filter((segment) => segment !== "").length;
 }
 function findExistingSecretKeyCacheDir(targetPath) {
   const projectRoot = findProjectRoot(targetPath);
@@ -132052,9 +132201,9 @@ function rememberSecretKeyCacheDir(targetPath, cacheDir) {
 function ensureCacheDir(targetPath) {
   const existing = findExistingSecretKeyCacheDir(targetPath);
   const projectRoot = findProjectRoot(targetPath);
-  const cacheDir = existing ?? path12.join(projectRoot, NORN_CACHE_DIR);
-  if (!fs15.existsSync(cacheDir)) {
-    fs15.mkdirSync(cacheDir, { recursive: true });
+  const cacheDir = existing ?? path13.join(projectRoot, NORN_CACHE_DIR);
+  if (!fs14.existsSync(cacheDir)) {
+    fs14.mkdirSync(cacheDir, { recursive: true });
   }
   ensureNornCacheGitignore(cacheDir);
   rememberSecretKeyCacheDir(targetPath, cacheDir);
@@ -132066,8 +132215,8 @@ function getReadCachePath(targetPath) {
     return getCacheFilePath(existing);
   }
   const projectRoot = findProjectRoot(targetPath);
-  const projectCacheDir = path12.join(projectRoot, NORN_CACHE_DIR);
-  if (fs15.existsSync(projectCacheDir) && fs15.statSync(projectCacheDir).isDirectory()) {
+  const projectCacheDir = path13.join(projectRoot, NORN_CACHE_DIR);
+  if (fs14.existsSync(projectCacheDir) && fs14.statSync(projectCacheDir).isDirectory()) {
     return getCacheFilePath(projectCacheDir);
   }
   return void 0;
@@ -132077,11 +132226,11 @@ function getWriteCachePath(targetPath) {
 }
 function readCache(targetPath) {
   const cachePath = getReadCachePath(targetPath);
-  if (!cachePath || !fs15.existsSync(cachePath)) {
+  if (!cachePath || !fs14.existsSync(cachePath)) {
     return { version: CACHE_VERSION2, keys: {} };
   }
   try {
-    const parsed = JSON.parse(fs15.readFileSync(cachePath, "utf8"));
+    const parsed = JSON.parse(fs14.readFileSync(cachePath, "utf8"));
     if (parsed.version !== CACHE_VERSION2 || typeof parsed.keys !== "object" || parsed.keys === null) {
       return { version: CACHE_VERSION2, keys: {} };
     }
@@ -132092,9 +132241,9 @@ function readCache(targetPath) {
 }
 function writeCache(targetPath, cache) {
   const cachePath = getWriteCachePath(targetPath);
-  fs15.writeFileSync(cachePath, JSON.stringify(cache, null, 2), { encoding: "utf8", mode: 384 });
+  fs14.writeFileSync(cachePath, JSON.stringify(cache, null, 2), { encoding: "utf8", mode: 384 });
   try {
-    fs15.chmodSync(cachePath, 384);
+    fs14.chmodSync(cachePath, 384);
   } catch {
   }
 }
@@ -132285,22 +132434,22 @@ function parseEnvFile(content, sourceFilePath) {
   return config2;
 }
 function getEnvSearchStartDirectory(targetPath) {
-  const resolvedPath = path13.resolve(targetPath);
+  const resolvedPath = path14.resolve(targetPath);
   try {
-    const stats = fs16.statSync(resolvedPath);
-    return stats.isDirectory() ? resolvedPath : path13.dirname(resolvedPath);
+    const stats = fs15.statSync(resolvedPath);
+    return stats.isDirectory() ? resolvedPath : path14.dirname(resolvedPath);
   } catch {
-    return path13.dirname(resolvedPath);
+    return path14.dirname(resolvedPath);
   }
 }
 function findEnvFileFromPath(filePath) {
   let dir = getEnvSearchStartDirectory(filePath);
   while (true) {
-    const envPath = path13.join(dir, ENV_FILENAME);
-    if (fs16.existsSync(envPath)) {
+    const envPath = path14.join(dir, ENV_FILENAME);
+    if (fs15.existsSync(envPath)) {
       return envPath;
     }
-    const parentDir = path13.dirname(dir);
+    const parentDir = path14.dirname(dir);
     if (parentDir === dir) {
       break;
     }
@@ -132309,9 +132458,9 @@ function findEnvFileFromPath(filePath) {
   return void 0;
 }
 function formatNornenvErrorLocation(rootEnvFilePath, errorFilePath, line2) {
-  const baseDir = path13.dirname(rootEnvFilePath);
-  const relativePath = path13.relative(baseDir, errorFilePath);
-  const fileLabel = relativePath && relativePath !== "" ? relativePath : path13.basename(errorFilePath);
+  const baseDir = path14.dirname(rootEnvFilePath);
+  const relativePath = path14.relative(baseDir, errorFilePath);
+  const fileLabel = relativePath && relativePath !== "" ? relativePath : path14.basename(errorFilePath);
   return line2 >= 0 ? `${fileLabel}:${line2 + 1}` : fileLabel;
 }
 function resolveNornenvImports(config2, baseDir, entryFilePath, readFile3, importStack, alreadyImported) {
@@ -132331,7 +132480,7 @@ function resolveNornenvImports(config2, baseDir, entryFilePath, readFile3, impor
   }
   for (const imp of config2.imports) {
     const resolvedImportPath = resolveImportPath(imp.path, baseDir);
-    if (!resolvedImportPath || !fs16.existsSync(resolvedImportPath)) {
+    if (!resolvedImportPath || !fs15.existsSync(resolvedImportPath)) {
       errors.push({
         message: `Imported file not found: '${imp.path}'`,
         filePath: entryFilePath,
@@ -132347,10 +132496,10 @@ function resolveNornenvImports(config2, baseDir, entryFilePath, readFile3, impor
       });
       continue;
     }
-    const normalizedPath = path13.resolve(resolvedImportPath);
+    const normalizedPath = path14.resolve(resolvedImportPath);
     if (stack.includes(normalizedPath)) {
-      const entryDir = path13.dirname(stack[0]);
-      const cycle = [...stack, normalizedPath].map((p) => path13.relative(entryDir, p) || path13.basename(p)).join(" \u2192 ");
+      const entryDir = path14.dirname(stack[0]);
+      const cycle = [...stack, normalizedPath].map((p) => path14.relative(entryDir, p) || path14.basename(p)).join(" \u2192 ");
       errors.push({
         message: `Circular import detected: ${cycle}`,
         filePath: entryFilePath,
@@ -132379,7 +132528,7 @@ function resolveNornenvImports(config2, baseDir, entryFilePath, readFile3, impor
     if (importedConfig.imports.length > 0) {
       const childResult = resolveNornenvImports(
         importedConfig,
-        path13.dirname(normalizedPath),
+        path14.dirname(normalizedPath),
         normalizedPath,
         readFile3,
         [...stack, normalizedPath],
@@ -132397,7 +132546,7 @@ function resolveNornenvImports(config2, baseDir, entryFilePath, readFile3, impor
 }
 function resolveImportPath(importPath, baseDir) {
   const cleaned = importPath.replace(/^["']|["']$/g, "");
-  return path13.resolve(baseDir, cleaned);
+  return path14.resolve(baseDir, cleaned);
 }
 function registerVariableOrigins(config2, filePath, origins) {
   for (const varName of Object.keys(config2.common)) {
@@ -132461,12 +132610,12 @@ function mergeConfigs(target, source, targetFilePath, sourceFilePath, variableOr
   }
 }
 function toDisplayPath(filePath, entryFilePath) {
-  const entryDir = path13.dirname(entryFilePath);
-  const relative5 = path13.relative(entryDir, filePath);
-  return relative5 && relative5 !== "" ? relative5 : path13.basename(filePath);
+  const entryDir = path14.dirname(entryFilePath);
+  const relative5 = path14.relative(entryDir, filePath);
+  return relative5 && relative5 !== "" ? relative5 : path14.basename(filePath);
 }
 function loadAndResolveEnvFile(filePath) {
-  const content = fs16.readFileSync(filePath, "utf-8");
+  const content = fs15.readFileSync(filePath, "utf-8");
   const config2 = parseEnvFile(content, filePath);
   if (config2.imports.length === 0) {
     const secretErrors = resolveEncryptedSecretValues(config2, filePath);
@@ -132474,9 +132623,9 @@ function loadAndResolveEnvFile(filePath) {
   }
   const result = resolveNornenvImports(
     config2,
-    path13.dirname(filePath),
+    path14.dirname(filePath),
     filePath,
-    (p) => fs16.readFileSync(p, "utf-8")
+    (p) => fs15.readFileSync(p, "utf-8")
   );
   result.secretErrors.push(...resolveEncryptedSecretValues(result.config, filePath));
   return result;
@@ -132542,14 +132691,14 @@ function resolveEncryptedSecretValues(config2, entryFilePath) {
 }
 
 // src/secrets/cliSecrets.ts
-var fs18 = __toESM(require("fs"));
-var path15 = __toESM(require("path"));
+var fs17 = __toESM(require("fs"));
+var path16 = __toESM(require("path"));
 var readline = __toESM(require("readline"));
 var import_process = require("process");
 
 // src/secrets/envFileSecrets.ts
-var fs17 = __toESM(require("fs"));
-var path14 = __toESM(require("path"));
+var fs16 = __toESM(require("fs"));
+var path15 = __toESM(require("path"));
 var envRegex2 = /^\s*\[env:([a-zA-Z_][a-zA-Z0-9_-]*)\]\s*$/;
 var secretConnectionStringRegex2 = /^(\s*secret\s+connectionString\s+)([a-zA-Z_][a-zA-Z0-9_]*)(\s*=\s*)(.+)$/;
 var secretRegex2 = /^(\s*secret\s+)([a-zA-Z_][a-zA-Z0-9_]*)(\s*=\s*)(.+)$/;
@@ -132560,7 +132709,7 @@ function detectEol(content) {
   return content.includes("\r\n") ? "\r\n" : "\n";
 }
 function isNornenvFilePath(filePath) {
-  return path14.basename(filePath).toLowerCase() === ".nornenv";
+  return path15.basename(filePath).toLowerCase() === ".nornenv";
 }
 function extractSecretLines(content, filePath) {
   const lines = splitContentLines(content);
@@ -132634,7 +132783,7 @@ function findSecretLine(content, variableName, envName) {
   return secretLines.find((secret) => secret.name === variableName);
 }
 function loadSecretLine(filePath, variableName, envName) {
-  const content = fs17.readFileSync(filePath, "utf8");
+  const content = fs16.readFileSync(filePath, "utf8");
   const secret = findSecretLine(content, variableName, envName);
   if (!secret) {
     const envLabel = envName ? ` in [env:${envName}]` : "";
@@ -132643,22 +132792,22 @@ function loadSecretLine(filePath, variableName, envName) {
   return { content, secret };
 }
 function writeSecretLine(filePath, content) {
-  fs17.writeFileSync(filePath, content, "utf8");
+  fs16.writeFileSync(filePath, content, "utf8");
 }
 function discoverNornenvFiles(targetPath) {
-  const resolved = path14.resolve(targetPath);
-  if (!fs17.existsSync(resolved)) {
+  const resolved = path15.resolve(targetPath);
+  if (!fs16.existsSync(resolved)) {
     return [];
   }
-  const stats = fs17.statSync(resolved);
+  const stats = fs16.statSync(resolved);
   if (stats.isFile()) {
     return isNornenvFilePath(resolved) ? [resolved] : [];
   }
   const results = [];
   const walk = (dir) => {
-    const entries = fs17.readdirSync(dir, { withFileTypes: true });
+    const entries = fs16.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path14.join(dir, entry.name);
+      const fullPath = path15.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name === ".git" || entry.name === "dist" || entry.name === "out") {
           continue;
@@ -132695,8 +132844,8 @@ async function promptLine(question) {
   }
   const rl = readline.createInterface({ input: import_process.stdin, output: import_process.stdout });
   try {
-    const answer = await new Promise((resolve15) => {
-      rl.question(question, resolve15);
+    const answer = await new Promise((resolve16) => {
+      rl.question(question, resolve16);
     });
     const trimmed = answer.trim();
     return trimmed === "" ? void 0 : trimmed;
@@ -132717,8 +132866,8 @@ function formatSecretError(err, envFilePath) {
   if (!envFilePath) {
     return `${err.message}`;
   }
-  const relative5 = path15.relative(path15.dirname(envFilePath), err.filePath);
-  const fileLabel = relative5 && relative5 !== "" ? relative5 : path15.basename(err.filePath);
+  const relative5 = path16.relative(path16.dirname(envFilePath), err.filePath);
+  const fileLabel = relative5 && relative5 !== "" ? relative5 : path16.basename(err.filePath);
   const lineLabel = err.line >= 0 ? `${fileLabel}:${err.line + 1}` : fileLabel;
   return `${lineLabel} - ${err.message}`;
 }
@@ -132814,7 +132963,7 @@ async function handleEncrypt(args) {
     console.error(`Error: encrypt requires --file and --var.`);
     return 1;
   }
-  const absoluteFilePath = path15.resolve(filePath);
+  const absoluteFilePath = path16.resolve(filePath);
   const { content, secret } = loadSecretLine(absoluteFilePath, variableName, envName);
   if (secret.encrypted) {
     console.error(`Error: Secret '${variableName}' is already encrypted. Use rotate instead.`);
@@ -132846,7 +132995,7 @@ async function handleRotate(args) {
     console.error(`Error: rotate requires --file and --var.`);
     return 1;
   }
-  const absoluteFilePath = path15.resolve(filePath);
+  const absoluteFilePath = path16.resolve(filePath);
   const { content, secret } = loadSecretLine(absoluteFilePath, variableName, envName);
   let kid = explicitKid;
   if (!kid && secret.encrypted) {
@@ -132877,7 +133026,7 @@ async function handleRotate(args) {
 }
 async function handleRekey(args) {
   const positional = args.filter((arg) => !arg.startsWith("-"));
-  const targetPath = positional[0] ? path15.resolve(positional[0]) : process.cwd();
+  const targetPath = positional[0] ? path16.resolve(positional[0]) : process.cwd();
   const targetKid = getFlagValue(args, "--kid");
   const files = discoverNornenvFiles(targetPath);
   if (files.length === 0) {
@@ -132887,7 +133036,7 @@ async function handleRekey(args) {
   let updatedFiles = 0;
   let updatedSecrets = 0;
   for (const filePath of files) {
-    const original = fs18.readFileSync(filePath, "utf8");
+    const original = fs17.readFileSync(filePath, "utf8");
     const secretLines = extractSecretLines(original, filePath);
     if (secretLines.length === 0) {
       continue;
@@ -132938,7 +133087,7 @@ async function handleRekey(args) {
       updatedSecrets += 1;
     }
     if (updated !== original) {
-      fs18.writeFileSync(filePath, updated, "utf8");
+      fs17.writeFileSync(filePath, updated, "utf8");
       updatedFiles += 1;
     }
   }
@@ -132947,7 +133096,7 @@ async function handleRekey(args) {
 }
 async function handleAudit(args) {
   const positional = args.filter((arg) => !arg.startsWith("-"));
-  const targetPath = positional[0] ? path15.resolve(positional[0]) : process.cwd();
+  const targetPath = positional[0] ? path16.resolve(positional[0]) : process.cwd();
   const files = discoverNornenvFiles(targetPath);
   if (files.length === 0) {
     console.log(`No .nornenv files found under ${targetPath}`);
@@ -132955,7 +133104,7 @@ async function handleAudit(args) {
   }
   const issues = [];
   for (const filePath of files) {
-    const content = fs18.readFileSync(filePath, "utf8");
+    const content = fs17.readFileSync(filePath, "utf8");
     const secrets = extractSecretLines(content, filePath);
     for (const secret of secrets) {
       if (!secret.encrypted) {
@@ -133041,8 +133190,8 @@ function printSecretResolutionErrors(errors, envFilePath) {
 }
 
 // src/theoryCaseLoader.ts
-var fs19 = __toESM(require("fs/promises"));
-var path16 = __toESM(require("path"));
+var fs18 = __toESM(require("fs/promises"));
+var path17 = __toESM(require("path"));
 function formatTheoryCaseLabel(params, index) {
   const entries = Object.entries(params);
   if (entries.length === 0) {
@@ -133066,8 +133215,8 @@ function normalizeTheoryCase(caseValue, sequenceParamNames) {
   return void 0;
 }
 async function loadTheoryCasesFromSource(sourcePath, workingDir, sequenceParamNames) {
-  const resolvedPath = path16.resolve(workingDir, sourcePath);
-  const content = await fs19.readFile(resolvedPath, "utf-8");
+  const resolvedPath = path17.resolve(workingDir, sourcePath);
+  const content = await fs18.readFile(resolvedPath, "utf-8");
   const parsed = JSON.parse(content);
   if (!Array.isArray(parsed)) {
     throw new Error(`Theory file "${sourcePath}" must contain a JSON array of test cases`);
@@ -133155,6 +133304,7 @@ function resolveEnvironmentForPath(targetPath, selectedEnv) {
   const secretNames = new Set(envConfig.secretNames);
   const secretValues = new Map(envConfig.secretValues);
   const availableEnvironments = envConfig.environments.map((e) => e.name);
+  let targetEnvVariables;
   if (selectedEnv) {
     const targetEnv = envConfig.environments.find((e) => e.name === selectedEnv);
     if (!targetEnv) {
@@ -133168,13 +133318,18 @@ function resolveEnvironmentForPath(targetPath, selectedEnv) {
         envNotFound: selectedEnv
       };
     }
-    Object.assign(variables, targetEnv.variables);
-    for (const [name, value] of Object.entries(targetEnv.variables)) {
+    targetEnvVariables = targetEnv.variables;
+    Object.assign(variables, targetEnvVariables);
+    for (const [name, value] of Object.entries(targetEnvVariables)) {
       if (secretNames.has(name)) {
         secretValues.set(name, value);
       }
     }
   }
+  attachEnvironmentTemplateScopes(variables, envConfig.common, targetEnvVariables);
+  for (const [name, value] of collectResolvedEnvironmentSecretValues(variables, secretNames)) {
+    secretValues.set(name, value);
+  }
   return {
     envFilePath,
     variables,
@@ -133210,10 +133365,10 @@ function generateTimestamp() {
   return `${year}-${month}-${day}-${hours}${minutes}${seconds}`;
 }
 function generateReportPaths(outputDir, inputFile, timestamp) {
-  const baseName = path17.basename(inputFile, path17.extname(inputFile));
+  const baseName = path18.basename(inputFile, path18.extname(inputFile));
   return {
-    junitPath: path17.join(outputDir, `${baseName}-${timestamp}-results.xml`),
-    htmlPath: path17.join(outputDir, `${baseName}-${timestamp}-report.html`)
+    junitPath: path18.join(outputDir, `${baseName}-${timestamp}-results.xml`),
+    htmlPath: path18.join(outputDir, `${baseName}-${timestamp}-report.html`)
   };
 }
 function parseArgs(args) {
@@ -133378,9 +133533,9 @@ async function runSingleRequest(fileContent, variables, cookieJar, apiDefinition
 function discoverNornFiles(dirPath) {
   const files = [];
   function walkDir(currentPath) {
-    const entries = fs20.readdirSync(currentPath, { withFileTypes: true });
+    const entries = fs19.readdirSync(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path17.join(currentPath, entry.name);
+      const fullPath = path18.join(currentPath, entry.name);
       if (entry.isDirectory()) {
         if (!entry.name.startsWith(".") && entry.name !== "node_modules") {
           walkDir(fullPath);
@@ -133504,12 +133659,12 @@ async function main() {
   if (options.insecure) {
     console.error(colors.warning("Warning: TLS certificate verification is disabled (--insecure). Use this only for local development."));
   }
-  const inputPath = path17.resolve(options.file);
-  if (!fs20.existsSync(inputPath)) {
+  const inputPath = path18.resolve(options.file);
+  if (!fs19.existsSync(inputPath)) {
     console.error(`Error: Path not found: ${inputPath}`);
     process.exit(1);
   }
-  const isDirectory = fs20.statSync(inputPath).isDirectory();
+  const isDirectory = fs19.statSync(inputPath).isDirectory();
   let filesToRun;
   if (isDirectory) {
     filesToRun = discoverNornFiles(inputPath);
@@ -133576,11 +133731,11 @@ async function main() {
     }
     mergeSecrets(combinedSecretNames, combinedSecretValues, resolvedEnv.secretNames, resolvedEnv.secretValues);
     const redaction2 = createRedactionOptions(combinedSecretNames, combinedSecretValues, !options.noRedact);
-    const fileContent = fs20.readFileSync(filePath, "utf-8");
+    const fileContent = fs19.readFileSync(filePath, "utf-8");
     const fileVariables = extractFileLevelVariables(fileContent);
     const variables = attachEnvironmentScope({ ...resolvedEnv.variables, ...fileVariables }, resolvedEnv.variables);
     const cookieJar = createCookieJar();
-    const workingDir = path17.dirname(filePath);
+    const workingDir = path18.dirname(filePath);
     const importResult = await resolveImports(
       fileContent,
       workingDir,
@@ -133732,7 +133887,7 @@ ${fileContent}` : fileContent;
   let totalTestCount = 0;
   let filteredTestCount = 0;
   for (const filePath of filesToRun) {
-    const fileContent = fs20.readFileSync(filePath, "utf-8");
+    const fileContent = fs19.readFileSync(filePath, "utf-8");
     const counts = countTestSequences(fileContent, tagFilterOptions);
     totalTestCount += counts.total;
     filteredTestCount += counts.filtered;
@@ -133774,16 +133929,16 @@ ${fileContent}` : fileContent;
       process.exit(1);
     }
     if (!resolvedEnv.envFilePath && options.env) {
-      const relPath = isDirectory ? path17.relative(inputPath, filePath) : path17.basename(filePath);
+      const relPath = isDirectory ? path18.relative(inputPath, filePath) : path18.basename(filePath);
       console.error(colors.warning(`Warning: --env specified but no .nornenv file found for ${relPath}`));
     }
     mergeSecrets(combinedSecretNames, combinedSecretValues, resolvedEnv.secretNames, resolvedEnv.secretValues);
     const redaction2 = createRedactionOptions(combinedSecretNames, combinedSecretValues, !options.noRedact);
-    const fileContent = fs20.readFileSync(filePath, "utf-8");
+    const fileContent = fs19.readFileSync(filePath, "utf-8");
     const fileVariables = extractFileLevelVariables(fileContent);
     const variables = attachEnvironmentScope({ ...resolvedEnv.variables, ...fileVariables }, resolvedEnv.variables);
     const cookieJar = createCookieJar();
-    const workingDir = path17.dirname(filePath);
+    const workingDir = path18.dirname(filePath);
     const importResult = await resolveImports(
       fileContent,
       workingDir,
@@ -133803,7 +133958,7 @@ ${fileContent}` : fileContent;
       continue;
     }
     if (isDirectory && options.output !== "json") {
-      const relPath = path17.relative(inputPath, filePath);
+      const relPath = path18.relative(inputPath, filePath);
       console.log(colors.info(`
 \u2501\u2501\u2501 ${relPath} \u2501\u2501\u2501`));
     }
@@ -133848,7 +134003,7 @@ ${fileContent}` : fileContent;
   let htmlOutputPath = options.htmlOutput;
   if (options.outputDir) {
     const timestamp = generateTimestamp();
-    const baseName = isDirectory ? path17.basename(inputPath) : path17.basename(inputPath, path17.extname(inputPath));
+    const baseName = isDirectory ? path18.basename(inputPath) : path18.basename(inputPath, path18.extname(inputPath));
     const generatedPaths = generateReportPaths(options.outputDir, baseName + ".norn", timestamp);
     if (!junitOutputPath) {
       junitOutputPath = generatedPaths.junitPath;
@@ -133856,12 +134011,12 @@ ${fileContent}` : fileContent;
     if (!htmlOutputPath) {
       htmlOutputPath = generatedPaths.htmlPath;
     }
-    if (!fs20.existsSync(options.outputDir)) {
-      fs20.mkdirSync(options.outputDir, { recursive: true });
+    if (!fs19.existsSync(options.outputDir)) {
+      fs19.mkdirSync(options.outputDir, { recursive: true });
     }
   }
   if (junitOutputPath) {
-    const suiteName = isDirectory ? path17.basename(inputPath) : path17.basename(inputPath, path17.extname(inputPath));
+    const suiteName = isDirectory ? path18.basename(inputPath) : path18.basename(inputPath, path18.extname(inputPath));
     if (result.type === "request") {
       generateJUnitReportFromResponse(
         result.results[0],
@@ -133877,11 +134032,11 @@ ${fileContent}` : fileContent;
     console.log(colors.info(`JUnit report written to: ${junitOutputPath}`));
   }
   if (htmlOutputPath) {
-    const title = `Norn Test Report - ${path17.basename(inputPath)}`;
+    const title = `Norn Test Report - ${path18.basename(inputPath)}`;
     if (result.type === "request") {
       generateHtmlReportFromResponse(
         result.results[0],
-        options.request || path17.basename(inputPath),
+        options.request || path18.basename(inputPath),
         { outputPath: htmlOutputPath, redaction, title }
       );
     } else {