norn-cli 1.5.0 → 1.5.1

package/dist/cli.js

@@ -8881,11 +8881,11 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path5) {
-      if (!path5 || typeof path5 !== "string") {
+    function lookup(path6) {
+      if (!path6 || typeof path6 !== "string") {
         return false;
       }
-      var extension2 = extname2("x." + path5).toLowerCase().substr(1);
+      var extension2 = extname2("x." + path6).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -9990,11 +9990,11 @@ var require_form_data = __commonJS({
     "use strict";
     var CombinedStream = require_combined_stream();
     var util3 = require("util");
-    var path5 = require("path");
+    var path6 = require("path");
     var http3 = require("http");
     var https2 = require("https");
     var parseUrl = require("url").parse;
-    var fs6 = require("fs");
+    var fs7 = require("fs");
     var Stream = require("stream").Stream;
     var crypto2 = 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 {
-          fs6.stat(value.path, function(err, stat) {
+          fs7.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 = path5.normalize(options.filepath).replace(/\\/g, "/");
+        filename = path6.normalize(options.filepath).replace(/\\/g, "/");
       } else if (options.filename || value && (value.name || value.path)) {
-        filename = path5.basename(options.filename || value && (value.name || value.path));
+        filename = path6.basename(options.filename || value && (value.name || value.path));
       } else if (value && value.readable && hasOwn(value, "httpVersion")) {
-        filename = path5.basename(value.client._httpMessage.path || "");
+        filename = path6.basename(value.client._httpMessage.path || "");
       }
       if (filename) {
         return 'filename="' + filename + '"';
@@ -11599,8 +11599,8 @@ var require_follow_redirects = __commonJS({
       }
       return parsed;
     }
-    function resolveUrl(relative2, base) {
-      return useNativeURL ? new URL2(relative2, base) : parseUrl(url2.resolve(base, relative2));
+    function resolveUrl(relative3, base) {
+      return useNativeURL ? new URL2(relative3, base) : parseUrl(url2.resolve(base, relative3));
     }
     function validateUrl(input) {
       if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -15089,7 +15089,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve5.call(this, root, ref);
+      let _sch = resolve6.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a = root.localRefs) === null || _a === void 0 ? void 0 : _a[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 resolve5(root, ref) {
+    function resolve6(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(path5) {
-      let input = path5;
+    function removeDotSegments(path6) {
+      let input = path6;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -15531,8 +15531,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path5, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path5 && path5 !== "/" ? path5 : void 0;
+        const [path6, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path6 && path6 !== "/" ? path6 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -15691,55 +15691,55 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve5(baseURI, relativeURI, options) {
+    function resolve6(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse2(baseURI, schemelessOptions), parse2(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
-    function resolveComponent(base, relative2, options, skipNormalization) {
+    function resolveComponent(base, relative3, options, skipNormalization) {
       const target = {};
       if (!skipNormalization) {
         base = parse2(serialize(base, options), options);
-        relative2 = parse2(serialize(relative2, options), options);
+        relative3 = parse2(serialize(relative3, options), options);
       }
       options = options || {};
-      if (!options.tolerant && relative2.scheme) {
-        target.scheme = relative2.scheme;
-        target.userinfo = relative2.userinfo;
-        target.host = relative2.host;
-        target.port = relative2.port;
-        target.path = removeDotSegments(relative2.path || "");
-        target.query = relative2.query;
+      if (!options.tolerant && relative3.scheme) {
+        target.scheme = relative3.scheme;
+        target.userinfo = relative3.userinfo;
+        target.host = relative3.host;
+        target.port = relative3.port;
+        target.path = removeDotSegments(relative3.path || "");
+        target.query = relative3.query;
       } else {
-        if (relative2.userinfo !== void 0 || relative2.host !== void 0 || relative2.port !== void 0) {
-          target.userinfo = relative2.userinfo;
-          target.host = relative2.host;
-          target.port = relative2.port;
-          target.path = removeDotSegments(relative2.path || "");
-          target.query = relative2.query;
+        if (relative3.userinfo !== void 0 || relative3.host !== void 0 || relative3.port !== void 0) {
+          target.userinfo = relative3.userinfo;
+          target.host = relative3.host;
+          target.port = relative3.port;
+          target.path = removeDotSegments(relative3.path || "");
+          target.query = relative3.query;
         } else {
-          if (!relative2.path) {
+          if (!relative3.path) {
             target.path = base.path;
-            if (relative2.query !== void 0) {
-              target.query = relative2.query;
+            if (relative3.query !== void 0) {
+              target.query = relative3.query;
             } else {
               target.query = base.query;
             }
           } else {
-            if (relative2.path[0] === "/") {
-              target.path = removeDotSegments(relative2.path);
+            if (relative3.path[0] === "/") {
+              target.path = removeDotSegments(relative3.path);
             } else {
               if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) {
-                target.path = "/" + relative2.path;
+                target.path = "/" + relative3.path;
               } else if (!base.path) {
-                target.path = relative2.path;
+                target.path = relative3.path;
               } else {
-                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative2.path;
+                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative3.path;
               }
               target.path = removeDotSegments(target.path);
             }
-            target.query = relative2.query;
+            target.query = relative3.query;
           }
           target.userinfo = base.userinfo;
           target.host = base.host;
@@ -15747,7 +15747,7 @@ var require_fast_uri = __commonJS({
         }
         target.scheme = base.scheme;
       }
-      target.fragment = relative2.fragment;
+      target.fragment = relative3.fragment;
       return target;
     }
     function equal(uriA, uriB, options) {
@@ -15918,7 +15918,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve5,
+      resolve: resolve6,
       resolveComponent,
       equal,
       serialize,
@@ -18738,8 +18738,8 @@ function validateAgainstSchemaDetailed(value, schemaPath, basePath, workspaceRoo
     if (!valid && validate2.errors) {
       const errors = validate2.errors.map((err) => convertAjvError(err, value));
       const errorStrings = validate2.errors.map((err) => {
-        const path5 = err.instancePath || "(root)";
-        return `${path5}: ${err.message}`;
+        const path6 = err.instancePath || "(root)";
+        return `${path6}: ${err.message}`;
       });
       return {
         valid: false,
@@ -18868,7 +18868,7 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
   if (refMatch) {
     const responseIdx = parseInt(refMatch[1], 10);
     const responseIndex = responseIdx - 1;
-    const path5 = refMatch[2];
+    const path6 = refMatch[2];
     if (responseIndex < 0 || responseIndex >= responses.length) {
       return {
         value: void 0,
@@ -18876,12 +18876,12 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
       };
     }
     const response = responses[responseIndex];
-    const value = getValueByPath2(response, path5);
+    const value = getValueByPath2(response, path6);
     return {
       value,
       responseIndex: responseIdx,
       response,
-      jsonPath: path5,
+      jsonPath: path6,
       variableName: responseIndexToVariable?.get(responseIdx)
     };
   }
@@ -18898,22 +18898,22 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
     if (varName in variables) {
       const varValue = variables[varName];
       if (typeof varValue === "object" && varValue !== null) {
-        const path5 = pathPart.replace(/^\./, "");
-        const value = getNestedValue2(varValue, path5);
+        const path6 = pathPart.replace(/^\./, "");
+        const value = getNestedValue2(varValue, path6);
         const isHttpResponse = "status" in varValue && "body" in varValue;
         return {
           value,
           variableName: varName,
-          jsonPath: path5,
+          jsonPath: path6,
           response: isHttpResponse ? varValue : void 0
         };
       }
       if (typeof varValue === "string") {
         try {
           const parsed = JSON.parse(varValue);
-          const path5 = pathPart.replace(/^\./, "");
-          const value = getNestedValue2(parsed, path5);
-          return { value, variableName: varName, jsonPath: path5 };
+          const path6 = pathPart.replace(/^\./, "");
+          const value = getNestedValue2(parsed, path6);
+          return { value, variableName: varName, jsonPath: path6 };
         } catch {
           return { value: void 0, error: `Cannot access path on non-object variable: ${varName}` };
         }
@@ -18969,11 +18969,11 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
   }
   return { value: void 0, error: `Cannot resolve expression: ${trimmed}` };
 }
-function getNestedValue2(obj, path5) {
-  if (!path5 || obj === null || obj === void 0) {
+function getNestedValue2(obj, path6) {
+  if (!path6 || obj === null || obj === void 0) {
     return obj;
   }
-  const parts = path5.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
+  const parts = path6.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
   let current = obj;
   for (const part of parts) {
     if (current === null || current === void 0) {
@@ -19769,16 +19769,16 @@ var init_source = __esm({
 });
 
 // src/cli.ts
-var fs5 = __toESM(require("fs"));
+var fs6 = __toESM(require("fs"));
 var fsPromises = __toESM(require("fs/promises"));
-var path4 = __toESM(require("path"));
+var path5 = __toESM(require("path"));
 
 // src/nornapiParser.ts
-function extractPathParameters(path5) {
+function extractPathParameters(path6) {
   const params = [];
   const regex = /(?<!\{)\{([a-zA-Z_][a-zA-Z0-9_]*)\}(?!\})/g;
   let match;
-  while ((match = regex.exec(path5)) !== null) {
+  while ((match = regex.exec(path6)) !== null) {
     params.push(match[1]);
   }
   return params;
@@ -19828,12 +19828,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 path5 = endpointMatch[3].trim();
+        const path6 = endpointMatch[3].trim();
         endpoints.push({
           name: endpointMatch[1],
           method: endpointMatch[2].toUpperCase(),
-          path: path5,
-          parameters: extractPathParameters(path5)
+          path: path6,
+          parameters: extractPathParameters(path6)
         });
       }
       continue;
@@ -20123,11 +20123,11 @@ function extractFileLevelVariables(text) {
   }
   return variables;
 }
-function getNestedValue(obj, path5) {
-  if (!path5 || obj === null || obj === void 0) {
+function getNestedValue(obj, path6) {
+  if (!path6 || obj === null || obj === void 0) {
     return obj;
   }
-  const parts = path5.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
+  const parts = path6.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
   let current = obj;
   for (const part of parts) {
     if (current === null || current === void 0) {
@@ -20159,8 +20159,8 @@ function substituteVariables(text, variables) {
       const value = variables[varName];
       if (typeof value === "object" && value !== null) {
         if (pathPart) {
-          const path5 = pathPart.replace(/^\./, "");
-          const nestedValue = getNestedValue(value, path5);
+          const path6 = pathPart.replace(/^\./, "");
+          const nestedValue = getNestedValue(value, path6);
           return valueToString(nestedValue);
         }
         return valueToString(value);
@@ -20168,8 +20168,8 @@ function substituteVariables(text, variables) {
       if (pathPart && typeof value === "string") {
         try {
           const parsed = JSON.parse(value);
-          const path5 = pathPart.replace(/^\./, "");
-          const nestedValue = getNestedValue(parsed, path5);
+          const path6 = pathPart.replace(/^\./, "");
+          const nestedValue = getNestedValue(parsed, path6);
           return valueToString(nestedValue);
         } catch {
           return value;
@@ -20285,8 +20285,8 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
   const namedRequestSources = /* @__PURE__ */ new Map();
   const sequenceSources = /* @__PURE__ */ new Map();
   for (const imp of imports) {
-    const path5 = await import("path");
-    const absolutePath = path5.resolve(baseDir, imp.path);
+    const path6 = await import("path");
+    const absolutePath = path6.resolve(baseDir, imp.path);
     if (importStack.has(absolutePath)) {
       errors.push({
         path: imp.path,
@@ -20333,7 +20333,7 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
         }
         continue;
       }
-      const importDir = path5.dirname(absolutePath);
+      const importDir = path6.dirname(absolutePath);
       const nestedResult = await resolveImports(content, importDir, readFile2, alreadyImported, importStack);
       errors.push(...nestedResult.errors);
       resolvedPaths.push(...nestedResult.resolvedPaths);
@@ -20932,9 +20932,9 @@ function isVisitable(thing) {
 function removeBrackets(key) {
   return utils_default.endsWith(key, "[]") ? key.slice(0, -2) : key;
 }
-function renderKey(path5, key, dots) {
-  if (!path5) return key;
-  return path5.concat(key).map(function each(token, i) {
+function renderKey(path6, key, dots) {
+  if (!path6) return key;
+  return path6.concat(key).map(function each(token, i) {
     token = removeBrackets(token);
     return !dots && i ? "[" + token + "]" : token;
   }).join(dots ? "." : "");
@@ -20982,9 +20982,9 @@ function toFormData(obj, formData, options) {
     }
     return value;
   }
-  function defaultVisitor(value, key, path5) {
+  function defaultVisitor(value, key, path6) {
     let arr = value;
-    if (value && !path5 && typeof value === "object") {
+    if (value && !path6 && typeof value === "object") {
       if (utils_default.endsWith(key, "{}")) {
         key = metaTokens ? key : key.slice(0, -2);
         value = JSON.stringify(value);
@@ -21003,7 +21003,7 @@ function toFormData(obj, formData, options) {
     if (isVisitable(value)) {
       return true;
     }
-    formData.append(renderKey(path5, key, dots), convertValue(value));
+    formData.append(renderKey(path6, key, dots), convertValue(value));
     return false;
   }
   const stack = [];
@@ -21012,10 +21012,10 @@ function toFormData(obj, formData, options) {
     convertValue,
     isVisitable
   });
-  function build(value, path5) {
+  function build(value, path6) {
     if (utils_default.isUndefined(value)) return;
     if (stack.indexOf(value) !== -1) {
-      throw Error("Circular reference detected in " + path5.join("."));
+      throw Error("Circular reference detected in " + path6.join("."));
     }
     stack.push(value);
     utils_default.forEach(value, function each(el, key) {
@@ -21023,11 +21023,11 @@ function toFormData(obj, formData, options) {
         formData,
         el,
         utils_default.isString(key) ? key.trim() : key,
-        path5,
+        path6,
         exposedHelpers
       );
       if (result === true) {
-        build(el, path5 ? path5.concat(key) : [key]);
+        build(el, path6 ? path6.concat(key) : [key]);
       }
     });
     stack.pop();
@@ -21239,7 +21239,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, path5, helpers) {
+    visitor: function(value, key, path6, helpers) {
       if (platform_default.isNode && utils_default.isBuffer(value)) {
         this.append(key, value.toString("base64"));
         return false;
@@ -21269,11 +21269,11 @@ function arrayToObject(arr) {
   return obj;
 }
 function formDataToJSON(formData) {
-  function buildPath(path5, value, target, index) {
-    let name = path5[index++];
+  function buildPath(path6, value, target, index) {
+    let name = path6[index++];
     if (name === "__proto__") return true;
     const isNumericKey = Number.isFinite(+name);
-    const isLast = index >= path5.length;
+    const isLast = index >= path6.length;
     name = !name && utils_default.isArray(target) ? target.length : name;
     if (isLast) {
       if (utils_default.hasOwnProp(target, name)) {
@@ -21286,7 +21286,7 @@ function formDataToJSON(formData) {
     if (!target[name] || !utils_default.isObject(target[name])) {
       target[name] = [];
     }
-    const result = buildPath(path5, value, target[name], index);
+    const result = buildPath(path6, value, target[name], index);
     if (result && utils_default.isArray(target[name])) {
       target[name] = arrayToObject(target[name]);
     }
@@ -21715,10 +21715,10 @@ utils_default.inherits(CanceledError, AxiosError_default, {
 var CanceledError_default = CanceledError;
 
 // node_modules/axios/lib/core/settle.js
-function settle(resolve5, reject, response) {
+function settle(resolve6, reject, response) {
   const validateStatus2 = response.config.validateStatus;
   if (!response.status || !validateStatus2 || validateStatus2(response.status)) {
-    resolve5(response);
+    resolve6(response);
   } else {
     reject(new AxiosError_default(
       "Request failed with status code " + response.status,
@@ -22341,7 +22341,7 @@ function setProxy(options, configProxy, location) {
 }
 var isHttpAdapterSupported = typeof process !== "undefined" && utils_default.kindOf(process) === "process";
 var wrapAsync = (asyncExecutor) => {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     let onDone;
     let isDone;
     const done = (value, isRejected) => {
@@ -22351,7 +22351,7 @@ var wrapAsync = (asyncExecutor) => {
     };
     const _resolve = (value) => {
       done(value);
-      resolve5(value);
+      resolve6(value);
     };
     const _reject = (reason) => {
       done(reason, true);
@@ -22403,7 +22403,7 @@ var http2Transport = {
   }
 };
 var http_default = isHttpAdapterSupported && function httpAdapter(config) {
-  return wrapAsync(async function dispatchHttpRequest(resolve5, reject, onDone) {
+  return wrapAsync(async function dispatchHttpRequest(resolve6, reject, onDone) {
     let { data, lookup, family, httpVersion = 1, http2Options } = config;
     const { responseType, responseEncoding } = config;
     const method = config.method.toUpperCase();
@@ -22488,7 +22488,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
       }
       let convertedData;
       if (method !== "GET") {
-        return settle(resolve5, reject, {
+        return settle(resolve6, reject, {
           status: 405,
           statusText: "method not allowed",
           headers: {},
@@ -22510,7 +22510,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
       } else if (responseType === "stream") {
         convertedData = import_stream4.default.Readable.from(convertedData);
       }
-      return settle(resolve5, reject, {
+      return settle(resolve6, reject, {
         data: convertedData,
         status: 200,
         statusText: "OK",
@@ -22608,9 +22608,9 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
       auth = urlUsername + ":" + urlPassword;
     }
     auth && headers.delete("authorization");
-    let path5;
+    let path6;
     try {
-      path5 = buildURL(
+      path6 = buildURL(
         parsed.pathname + parsed.search,
         config.params,
         config.paramsSerializer
@@ -22628,7 +22628,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
       false
     );
     const options = {
-      path: path5,
+      path: path6,
       method,
       headers: headers.toJSON(),
       agents: { http: config.httpAgent, https: config.httpsAgent },
@@ -22729,7 +22729,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
       };
       if (responseType === "stream") {
         response.data = responseStream;
-        settle(resolve5, reject, response);
+        settle(resolve6, reject, response);
       } else {
         const responseBuffer = [];
         let totalResponseBytes = 0;
@@ -22777,7 +22777,7 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
           } catch (err) {
             return reject(AxiosError_default.from(err, null, config, response.request, response));
           }
-          settle(resolve5, reject, response);
+          settle(resolve6, reject, response);
         });
       }
       abortEmitter.once("abort", (err) => {
@@ -22864,14 +22864,14 @@ var isURLSameOrigin_default = platform_default.hasStandardBrowserEnv ? /* @__PUR
 var cookies_default = platform_default.hasStandardBrowserEnv ? (
   // Standard browser envs support document.cookie
   {
-    write(name, value, expires, path5, domain, secure, sameSite) {
+    write(name, value, expires, path6, domain, 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(path5)) {
-        cookie.push(`path=${path5}`);
+      if (utils_default.isString(path6)) {
+        cookie.push(`path=${path6}`);
       }
       if (utils_default.isString(domain)) {
         cookie.push(`domain=${domain}`);
@@ -23026,7 +23026,7 @@ var resolveConfig_default = (config) => {
 // node_modules/axios/lib/adapters/xhr.js
 var isXHRAdapterSupported = typeof XMLHttpRequest !== "undefined";
 var xhr_default = isXHRAdapterSupported && function(config) {
-  return new Promise(function dispatchXhrRequest(resolve5, reject) {
+  return new Promise(function dispatchXhrRequest(resolve6, reject) {
     const _config = resolveConfig_default(config);
     let requestData = _config.data;
     const requestHeaders = AxiosHeaders_default.from(_config.headers).normalize();
@@ -23060,7 +23060,7 @@ var xhr_default = isXHRAdapterSupported && function(config) {
         request
       };
       settle(function _resolve(value) {
-        resolve5(value);
+        resolve6(value);
         done();
       }, function _reject(err) {
         reject(err);
@@ -23431,8 +23431,8 @@ var factory = (env3) => {
       responseType = responseType || "text";
       let responseData = await resolvers[utils_default.findKey(resolvers, responseType) || "text"](response, config);
       !isStreamResponse && unsubscribe && unsubscribe();
-      return await new Promise((resolve5, reject) => {
-        settle(resolve5, reject, {
+      return await new Promise((resolve6, reject) => {
+        settle(resolve6, reject, {
           data: responseData,
           headers: AxiosHeaders_default.from(response.headers),
           status: response.status,
@@ -23828,8 +23828,8 @@ var CancelToken = class _CancelToken {
       throw new TypeError("executor must be a function.");
     }
     let resolvePromise;
-    this.promise = new Promise(function promiseExecutor(resolve5) {
-      resolvePromise = resolve5;
+    this.promise = new Promise(function promiseExecutor(resolve6) {
+      resolvePromise = resolve6;
     });
     const token = this;
     this.promise.then((cancel) => {
@@ -23842,9 +23842,9 @@ var CancelToken = class _CancelToken {
     });
     this.promise.then = (onfulfilled) => {
       let _resolve;
-      const promise = new Promise((resolve5) => {
-        token.subscribe(resolve5);
-        _resolve = resolve5;
+      const promise = new Promise((resolve6) => {
+        token.subscribe(resolve6);
+        _resolve = resolve6;
       }).then(onfulfilled);
       promise.cancel = function reject() {
         token.unsubscribe(_resolve);
@@ -24215,10 +24215,10 @@ var safeToStringImpl = (val, seenArrays = /* @__PURE__ */ new WeakSet()) => {
 var safeToString = (val) => safeToStringImpl(val);
 function createPromiseCallback(cb) {
   let callback;
-  let resolve5;
+  let resolve6;
   let reject;
   const promise = new Promise((_resolve, _reject) => {
-    resolve5 = _resolve;
+    resolve6 = _resolve;
     reject = _reject;
   });
   if (typeof cb === "function") {
@@ -24234,7 +24234,7 @@ function createPromiseCallback(cb) {
     callback = (err, result) => {
       try {
         if (err) reject(err);
-        else resolve5(result);
+        else resolve6(result);
       } catch (e) {
         reject(e instanceof Error ? e : new Error());
       }
@@ -24268,18 +24268,18 @@ var MemoryCookieStore = class extends Store {
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  findCookie(domain, path5, key, callback) {
+  findCookie(domain, path6, key, callback) {
     const promiseCallback = createPromiseCallback(callback);
-    if (domain == null || path5 == null || key == null) {
+    if (domain == null || path6 == null || key == null) {
       return promiseCallback.resolve(void 0);
     }
-    const result = this.idx[domain]?.[path5]?.[key];
+    const result = this.idx[domain]?.[path6]?.[key];
     return promiseCallback.resolve(result);
   }
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  findCookies(domain, path5, allowSpecialUseDomain = false, callback) {
+  findCookies(domain, path6, allowSpecialUseDomain = false, callback) {
     if (typeof allowSpecialUseDomain === "function") {
       callback = allowSpecialUseDomain;
       allowSpecialUseDomain = true;
@@ -24290,7 +24290,7 @@ var MemoryCookieStore = class extends Store {
       return promiseCallback.resolve([]);
     }
     let pathMatcher;
-    if (!path5) {
+    if (!path6) {
       pathMatcher = function matchAll2(domainIndex) {
         for (const curPath in domainIndex) {
           const pathIndex = domainIndex[curPath];
@@ -24305,7 +24305,7 @@ var MemoryCookieStore = class extends Store {
     } else {
       pathMatcher = function matchRFC(domainIndex) {
         for (const cookiePath in domainIndex) {
-          if (pathMatch(path5, cookiePath)) {
+          if (pathMatch(path6, cookiePath)) {
             const pathIndex = domainIndex[cookiePath];
             for (const key in pathIndex) {
               const value = pathIndex[key];
@@ -24333,14 +24333,14 @@ var MemoryCookieStore = class extends Store {
    */
   putCookie(cookie, callback) {
     const promiseCallback = createPromiseCallback(callback);
-    const { domain, path: path5, key } = cookie;
-    if (domain == null || path5 == null || key == null) {
+    const { domain, path: path6, key } = cookie;
+    if (domain == null || path6 == null || key == null) {
       return promiseCallback.resolve(void 0);
     }
     const domainEntry = this.idx[domain] ?? /* @__PURE__ */ Object.create(null);
     this.idx[domain] = domainEntry;
-    const pathEntry = domainEntry[path5] ?? /* @__PURE__ */ Object.create(null);
-    domainEntry[path5] = pathEntry;
+    const pathEntry = domainEntry[path6] ?? /* @__PURE__ */ Object.create(null);
+    domainEntry[path6] = pathEntry;
     pathEntry[key] = cookie;
     return promiseCallback.resolve(void 0);
   }
@@ -24354,20 +24354,20 @@ var MemoryCookieStore = class extends Store {
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  removeCookie(domain, path5, key, callback) {
+  removeCookie(domain, path6, key, callback) {
     const promiseCallback = createPromiseCallback(callback);
-    delete this.idx[domain]?.[path5]?.[key];
+    delete this.idx[domain]?.[path6]?.[key];
     return promiseCallback.resolve(void 0);
   }
   /**
    * @internal No doc because this is an overload that supports the implementation
    */
-  removeCookies(domain, path5, callback) {
+  removeCookies(domain, path6, callback) {
     const promiseCallback = createPromiseCallback(callback);
     const domainEntry = this.idx[domain];
     if (domainEntry) {
-      if (path5) {
-        delete domainEntry[path5];
+      if (path6) {
+        delete domainEntry[path6];
       } else {
         delete this.idx[domain];
       }
@@ -24393,8 +24393,8 @@ var MemoryCookieStore = class extends Store {
     domains.forEach((domain) => {
       const domainEntry = idx[domain] ?? {};
       const paths = Object.keys(domainEntry);
-      paths.forEach((path5) => {
-        const pathEntry = domainEntry[path5] ?? {};
+      paths.forEach((path6) => {
+        const pathEntry = domainEntry[path6] ?? {};
         const keys = Object.keys(pathEntry);
         keys.forEach((key) => {
           const keyEntry = pathEntry[key];
@@ -25278,18 +25278,18 @@ function cookieCompare(a, b) {
   cmp = (a.creationIndex || 0) - (b.creationIndex || 0);
   return cmp;
 }
-function defaultPath(path5) {
-  if (!path5 || path5.slice(0, 1) !== "/") {
+function defaultPath(path6) {
+  if (!path6 || path6.slice(0, 1) !== "/") {
     return "/";
   }
-  if (path5 === "/") {
-    return path5;
+  if (path6 === "/") {
+    return path6;
   }
-  const rightSlash = path5.lastIndexOf("/");
+  const rightSlash = path6.lastIndexOf("/");
   if (rightSlash === 0) {
     return "/";
   }
-  return path5.slice(0, rightSlash);
+  return path6.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(domain, cookieDomain, canonicalize) {
@@ -25691,7 +25691,7 @@ var CookieJar = class _CookieJar {
       return promiseCallback.reject(parameterError);
     }
     const host = canonicalDomain(context.hostname);
-    const path5 = context.pathname || "/";
+    const path6 = context.pathname || "/";
     const potentiallyTrustworthy = isPotentiallyTrustworthy(
       url2,
       this.allowSecureOnLocal
@@ -25722,7 +25722,7 @@ var CookieJar = class _CookieJar {
           return false;
         }
       }
-      if (!allPaths && typeof c.path === "string" && !pathMatch(path5, c.path)) {
+      if (!allPaths && typeof c.path === "string" && !pathMatch(path6, c.path)) {
         return false;
       }
       if (c.secure && !potentiallyTrustworthy) {
@@ -25754,7 +25754,7 @@ var CookieJar = class _CookieJar {
     }
     store.findCookies(
       host,
-      allPaths ? null : path5,
+      allPaths ? null : path6,
       this.allowSpecialUseDomain,
       (err, cookies) => {
         if (err) {
@@ -26253,7 +26253,7 @@ async function sendRequest(request, retryOptions) {
   return sendRequestWithJar(request, sharedCookieJar, retryOptions);
 }
 function sleep(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 function shouldRetry(response, error) {
   if (error) return true;
@@ -26664,7 +26664,7 @@ async function runScript(type, scriptPath, args, workingDir, variables = {}, cap
         captureVar
       };
   }
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     const env3 = {
       ...process.env,
       // Pass variables as environment variables with NORN_ prefix
@@ -26688,7 +26688,7 @@ async function runScript(type, scriptPath, args, workingDir, variables = {}, cap
       stderr += data.toString();
     });
     child.on("error", (err) => {
-      resolve5({
+      resolve6({
         success: false,
         output: cleanScriptOutput(stdout),
         error: `Failed to execute script: ${err.message}`,
@@ -26702,7 +26702,7 @@ async function runScript(type, scriptPath, args, workingDir, variables = {}, cap
     child.on("close", (code) => {
       const exitCode = code ?? 0;
       const cleanedOutput = cleanScriptOutput(stdout);
-      resolve5({
+      resolve6({
         success: exitCode === 0,
         output: cleanedOutput,
         error: stderr.trim(),
@@ -26767,11 +26767,11 @@ function readJsonFile(filePath, workingDir) {
     };
   }
 }
-function setNestedValue(obj, path5, value) {
-  if (!path5 || obj === null || obj === void 0 || typeof obj !== "object") {
+function setNestedValue(obj, path6, value) {
+  if (!path6 || obj === null || obj === void 0 || typeof obj !== "object") {
     return false;
   }
-  const parts = path5.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
+  const parts = path6.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
   if (parts.length === 0) {
     return false;
   }
@@ -27273,8 +27273,8 @@ function bindSequenceArguments(params, args, runtimeVariables) {
   }
   return { variables: result };
 }
-function getVariableValueByPath(path5, variables) {
-  const parts = path5.split(".");
+function getVariableValueByPath(path6, variables) {
+  const parts = path6.split(".");
   let current = variables;
   for (const part of parts) {
     if (current === null || current === void 0) {
@@ -27639,8 +27639,8 @@ function evaluateValueExpression(expr, runtimeVariables) {
     } else {
       return { value: String(varValue), error: `Cannot access path on non-object value` };
     }
-    const path5 = pathPart.replace(/^\./, "").replace(/\[(\d+)\]/g, ".$1");
-    const parts = path5.split(".").filter((p) => p !== "");
+    const path6 = pathPart.replace(/^\./, "").replace(/\[(\d+)\]/g, ".$1");
+    const parts = path6.split(".").filter((p) => p !== "");
     let current = dataToNavigate;
     for (const part of parts) {
       if (current === null || current === void 0) {
@@ -27719,8 +27719,8 @@ function resolveBareVariables(text, variables) {
     if (varName in variables) {
       const value = variables[varName];
       if (pathPart) {
-        const path5 = pathPart.replace(/^\./, "");
-        const nestedValue = getNestedValueFromObject(value, path5);
+        const path6 = pathPart.replace(/^\./, "");
+        const nestedValue = getNestedValueFromObject(value, path6);
         return valueToString2(nestedValue);
       }
       return valueToString2(value);
@@ -27740,8 +27740,8 @@ function resolveBareVariables(text, variables) {
         if (varName in variables) {
           const value = variables[varName];
           if (pathPart) {
-            const path5 = pathPart.replace(/^\./, "");
-            return valueToString2(getNestedValueFromObject(value, path5));
+            const path6 = pathPart.replace(/^\./, "");
+            return valueToString2(getNestedValueFromObject(value, path6));
           }
           return valueToString2(value);
         }
@@ -27778,11 +27778,11 @@ function splitExpressionParts(expr) {
   }
   return parts;
 }
-function getNestedValueFromObject(obj, path5) {
-  if (!path5) {
+function getNestedValueFromObject(obj, path6) {
+  if (!path6) {
     return obj;
   }
-  const parts = path5.split(/\.|\[(\d+)\]/).filter((p) => p !== "" && p !== void 0);
+  const parts = path6.split(/\.|\[(\d+)\]/).filter((p) => p !== "" && p !== void 0);
   let current = obj;
   for (const part of parts) {
     if (current === null || current === void 0) {
@@ -27805,7 +27805,7 @@ function valueToString2(value) {
   return String(value);
 }
 function sleep2(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 function isIfCommand(line2) {
   return /^if\s+.+$/i.test(line2.trim());
@@ -28127,24 +28127,24 @@ function extractCaptureDirectives(content) {
   for (const line2 of content.split("\n")) {
     const match = line2.trim().match(captureRegex);
     if (match) {
-      let path5 = match[3] || "";
-      if (path5.startsWith(".")) {
-        path5 = path5.substring(1);
+      let path6 = match[3] || "";
+      if (path6.startsWith(".")) {
+        path6 = path6.substring(1);
       }
       captures.push({
         varName: match[1],
         afterRequest: parseInt(match[2], 10),
-        path: path5
+        path: path6
       });
     }
   }
   return captures;
 }
-function getValueByPath(response, path5) {
-  if (!path5) {
+function getValueByPath(response, path6) {
+  if (!path6) {
     return void 0;
   }
-  const parts = path5.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
+  const parts = path6.replace(/\[(\d+)\]/g, ".$1").split(".").filter((p) => p !== "");
   if (parts.length === 0) {
     return void 0;
   }
@@ -28448,8 +28448,8 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
           }
         }
         if (pathPart) {
-          const path5 = pathPart.replace(/^\./, "");
-          newValue = getNestedValueFromObject(value, path5);
+          const path6 = pathPart.replace(/^\./, "");
+          newValue = getNestedValueFromObject(value, path6);
         } else {
           newValue = value;
         }
@@ -28811,8 +28811,8 @@ ${indentMultiline(userMessage)}`;
         if (sequenceSources) {
           const sourceFile = sequenceSources.get(targetName.toLowerCase());
           if (sourceFile) {
-            const path5 = await import("path");
-            subWorkingDir = path5.dirname(sourceFile);
+            const path6 = await import("path");
+            subWorkingDir = path6.dirname(sourceFile);
           }
         }
         const subResult = await runSequenceWithJar(
@@ -29165,8 +29165,8 @@ ${indentMultiline(userMessage)}`;
       if (sequenceSources) {
         const sourceFile = sequenceSources.get(sequenceName.toLowerCase());
         if (sourceFile) {
-          const path5 = await import("path");
-          subWorkingDir = path5.dirname(sourceFile);
+          const path6 = await import("path");
+          subWorkingDir = path6.dirname(sourceFile);
         }
       }
       const subResult = await runSequenceWithJar(
@@ -30570,49 +30570,44 @@ function generateHtmlReportFromResponse(response, testName, options) {
   generateHtmlReport([mockResult], options);
 }
 
-// src/cli.ts
+// src/environmentParser.ts
+var fs5 = __toESM(require("fs"));
+var path4 = __toESM(require("path"));
 var ENV_FILENAME = ".nornenv";
-function getEnvSearchStartDirectory(targetPath) {
-  const resolvedPath = path4.resolve(targetPath);
-  try {
-    const stats = fs5.statSync(resolvedPath);
-    return stats.isDirectory() ? resolvedPath : path4.dirname(resolvedPath);
-  } catch {
-    return path4.dirname(resolvedPath);
-  }
-}
-function findEnvFileFromPath(filePath) {
-  let dir = getEnvSearchStartDirectory(filePath);
-  while (true) {
-    const envPath = path4.join(dir, ENV_FILENAME);
-    if (fs5.existsSync(envPath)) {
-      return envPath;
-    }
-    const parentDir = path4.dirname(dir);
-    if (parentDir === dir) {
-      break;
-    }
-    dir = parentDir;
-  }
-  return void 0;
-}
+var importRegex = /^import\s+["']?(.+?)["']?\s*$/;
+var envRegex = /^\[env:([a-zA-Z_][a-zA-Z0-9_-]*)\]$/;
+var varRegex = /^var\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/;
+var secretRegex = /^secret\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/;
 function parseEnvFile(content) {
   const lines = content.split("\n");
   const config = {
     common: {},
     environments: [],
     secretNames: /* @__PURE__ */ new Set(),
-    secretValues: /* @__PURE__ */ new Map()
+    secretValues: /* @__PURE__ */ new Map(),
+    imports: [],
+    misplacedImports: []
   };
   let currentEnv = null;
-  const envRegex = /^\[env:([a-zA-Z_][a-zA-Z0-9_-]*)\]$/;
-  const varRegex = /^var\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/;
-  const secretRegex = /^secret\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/;
-  for (const line2 of lines) {
-    const trimmed = line2.trim();
+  let seenContent = false;
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
     if (!trimmed || trimmed.startsWith("#")) {
       continue;
     }
+    const importMatch = trimmed.match(importRegex);
+    if (importMatch) {
+      const importStatement = {
+        path: importMatch[1],
+        lineNumber: i
+      };
+      config.imports.push(importStatement);
+      if (seenContent) {
+        config.misplacedImports.push(importStatement);
+      }
+      continue;
+    }
+    seenContent = true;
     const envMatch = trimmed.match(envRegex);
     if (envMatch) {
       currentEnv = {
@@ -30648,6 +30643,197 @@ function parseEnvFile(content) {
   }
   return config;
 }
+function getEnvSearchStartDirectory(targetPath) {
+  const resolvedPath = path4.resolve(targetPath);
+  try {
+    const stats = fs5.statSync(resolvedPath);
+    return stats.isDirectory() ? resolvedPath : path4.dirname(resolvedPath);
+  } catch {
+    return path4.dirname(resolvedPath);
+  }
+}
+function findEnvFileFromPath(filePath) {
+  let dir = getEnvSearchStartDirectory(filePath);
+  while (true) {
+    const envPath = path4.join(dir, ENV_FILENAME);
+    if (fs5.existsSync(envPath)) {
+      return envPath;
+    }
+    const parentDir = path4.dirname(dir);
+    if (parentDir === dir) {
+      break;
+    }
+    dir = parentDir;
+  }
+  return void 0;
+}
+function resolveNornenvImports(config, baseDir, entryFilePath, readFile2, importStack, alreadyImported) {
+  const errors = [];
+  const resolvedPaths = [];
+  const stack = importStack ?? [entryFilePath];
+  const visited = alreadyImported ?? /* @__PURE__ */ new Set([entryFilePath]);
+  const variableOrigins = /* @__PURE__ */ new Map();
+  registerVariableOrigins(config, entryFilePath, variableOrigins);
+  for (const imp of config.misplacedImports) {
+    errors.push({
+      message: `Import statements must appear at the top of the file (before any variable declarations or environment sections).`,
+      filePath: entryFilePath,
+      line: imp.lineNumber
+    });
+  }
+  for (const imp of config.imports) {
+    const resolvedImportPath = resolveImportPath(imp.path, baseDir);
+    if (!resolvedImportPath || !fs5.existsSync(resolvedImportPath)) {
+      errors.push({
+        message: `Imported file not found: '${imp.path}'`,
+        filePath: entryFilePath,
+        line: imp.lineNumber
+      });
+      continue;
+    }
+    if (!resolvedImportPath.endsWith(".nornenv")) {
+      errors.push({
+        message: `Import must reference a .nornenv file: '${imp.path}'`,
+        filePath: entryFilePath,
+        line: imp.lineNumber
+      });
+      continue;
+    }
+    const normalizedPath = path4.resolve(resolvedImportPath);
+    if (stack.includes(normalizedPath)) {
+      const entryDir = path4.dirname(stack[0]);
+      const cycle = [...stack, normalizedPath].map((p) => path4.relative(entryDir, p) || path4.basename(p)).join(" \u2192 ");
+      errors.push({
+        message: `Circular import detected: ${cycle}`,
+        filePath: entryFilePath,
+        line: imp.lineNumber
+      });
+      continue;
+    }
+    if (visited.has(normalizedPath)) {
+      resolvedPaths.push(normalizedPath);
+      continue;
+    }
+    visited.add(normalizedPath);
+    let importedContent;
+    try {
+      importedContent = readFile2(normalizedPath);
+    } catch {
+      errors.push({
+        message: `Failed to read imported file: '${imp.path}'`,
+        filePath: entryFilePath,
+        line: imp.lineNumber
+      });
+      continue;
+    }
+    const importedConfig = parseEnvFile(importedContent);
+    resolvedPaths.push(normalizedPath);
+    if (importedConfig.imports.length > 0) {
+      const childResult = resolveNornenvImports(
+        importedConfig,
+        path4.dirname(normalizedPath),
+        normalizedPath,
+        readFile2,
+        [...stack, normalizedPath],
+        visited
+      );
+      errors.push(...childResult.errors);
+      resolvedPaths.push(...childResult.resolvedPaths);
+      mergeConfigs(config, childResult.config, entryFilePath, normalizedPath, variableOrigins, errors);
+    } else {
+      mergeConfigs(config, importedConfig, entryFilePath, normalizedPath, variableOrigins, errors);
+    }
+  }
+  return { config, errors, resolvedPaths };
+}
+function resolveImportPath(importPath, baseDir) {
+  const cleaned = importPath.replace(/^["']|["']$/g, "");
+  return path4.resolve(baseDir, cleaned);
+}
+function registerVariableOrigins(config, filePath, origins) {
+  for (const varName of Object.keys(config.common)) {
+    origins.set(`common:${varName}`, { filePath, line: -1, varName });
+  }
+  for (const env3 of config.environments) {
+    for (const varName of Object.keys(env3.variables)) {
+      origins.set(`env:${env3.name}:${varName}`, { filePath, line: -1, varName });
+    }
+  }
+}
+function mergeConfigs(target, source, targetFilePath, sourceFilePath, variableOrigins, errors) {
+  for (const [varName, varValue] of Object.entries(source.common)) {
+    const key = `common:${varName}`;
+    const existing = variableOrigins.get(key);
+    if (existing) {
+      const sourceLabel = toDisplayPath(sourceFilePath, targetFilePath);
+      const existingLabel = toDisplayPath(existing.filePath, targetFilePath);
+      errors.push({
+        message: `Duplicate variable '${varName}' in common section. Found in '${existingLabel}' and '${sourceLabel}'.`,
+        filePath: sourceFilePath,
+        line: -1
+        // Line resolved by diagnostics provider
+      });
+    } else {
+      target.common[varName] = varValue;
+      variableOrigins.set(key, { filePath: sourceFilePath, line: -1, varName });
+    }
+  }
+  for (const sourceEnv of source.environments) {
+    let targetEnv = target.environments.find((e) => e.name === sourceEnv.name);
+    if (!targetEnv) {
+      targetEnv = { name: sourceEnv.name, variables: {} };
+      target.environments.push(targetEnv);
+    }
+    for (const [varName, varValue] of Object.entries(sourceEnv.variables)) {
+      const key = `env:${sourceEnv.name}:${varName}`;
+      const existing = variableOrigins.get(key);
+      if (existing) {
+        const sourceLabel = toDisplayPath(sourceFilePath, targetFilePath);
+        const existingLabel = toDisplayPath(existing.filePath, targetFilePath);
+        errors.push({
+          message: `Duplicate variable '${varName}' in [env:${sourceEnv.name}] section. Found in '${existingLabel}' and '${sourceLabel}'.`,
+          filePath: sourceFilePath,
+          line: -1
+        });
+      } else {
+        targetEnv.variables[varName] = varValue;
+        variableOrigins.set(key, { filePath: sourceFilePath, line: -1, varName });
+      }
+    }
+  }
+  for (const name of source.secretNames) {
+    target.secretNames.add(name);
+  }
+  for (const [name, value] of source.secretValues) {
+    target.secretValues.set(name, value);
+  }
+}
+function toDisplayPath(filePath, entryFilePath) {
+  const entryDir = path4.dirname(entryFilePath);
+  const relative3 = path4.relative(entryDir, filePath);
+  return relative3 && relative3 !== "" ? relative3 : path4.basename(filePath);
+}
+function loadAndResolveEnvFile(filePath) {
+  const content = fs5.readFileSync(filePath, "utf-8");
+  const config = parseEnvFile(content);
+  if (config.imports.length === 0) {
+    return { config, errors: [], resolvedPaths: [] };
+  }
+  return resolveNornenvImports(
+    config,
+    path4.dirname(filePath),
+    filePath,
+    (p) => fs5.readFileSync(p, "utf-8")
+  );
+}
+
+// src/cli.ts
+function formatNornenvErrorLocation(rootEnvFilePath, errorFilePath, line2) {
+  const baseDir = path5.dirname(rootEnvFilePath);
+  const relativePath = path5.relative(baseDir, errorFilePath);
+  const fileLabel = relativePath && relativePath !== "" ? relativePath : path5.basename(errorFilePath);
+  return line2 >= 0 ? `${fileLabel}:${line2 + 1}` : fileLabel;
+}
 function resolveEnvironmentForPath(targetPath, selectedEnv) {
   const envFilePath = findEnvFileFromPath(targetPath);
   if (!envFilePath) {
@@ -30658,8 +30844,15 @@ function resolveEnvironmentForPath(targetPath, selectedEnv) {
       availableEnvironments: []
     };
   }
-  const envContent = fs5.readFileSync(envFilePath, "utf-8");
-  const envConfig = parseEnvFile(envContent);
+  const { config: envConfig, errors: importErrors } = loadAndResolveEnvFile(envFilePath);
+  for (const err of importErrors) {
+    const location = formatNornenvErrorLocation(envFilePath, err.filePath, err.line);
+    console.error(`Error in ${location}: ${err.message}`);
+  }
+  if (importErrors.length > 0) {
+    console.error(`Fix .nornenv import errors before running tests.`);
+    process.exit(1);
+  }
   const variables = { ...envConfig.common };
   const secretNames = new Set(envConfig.secretNames);
   const secretValues = new Map(envConfig.secretValues);
@@ -30717,10 +30910,10 @@ function generateTimestamp() {
   return `${year}-${month}-${day}-${hours}${minutes}${seconds}`;
 }
 function generateReportPaths(outputDir, inputFile, timestamp) {
-  const baseName = path4.basename(inputFile, path4.extname(inputFile));
+  const baseName = path5.basename(inputFile, path5.extname(inputFile));
   return {
-    junitPath: path4.join(outputDir, `${baseName}-${timestamp}-results.xml`),
-    htmlPath: path4.join(outputDir, `${baseName}-${timestamp}-report.html`)
+    junitPath: path5.join(outputDir, `${baseName}-${timestamp}-results.xml`),
+    htmlPath: path5.join(outputDir, `${baseName}-${timestamp}-report.html`)
   };
 }
 function parseArgs(args) {
@@ -30979,9 +31172,9 @@ async function runSingleRequest(fileContent, variables, cookieJar, apiDefinition
 function discoverNornFiles(dirPath) {
   const files = [];
   function walkDir(currentPath) {
-    const entries = fs5.readdirSync(currentPath, { withFileTypes: true });
+    const entries = fs6.readdirSync(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path4.join(currentPath, entry.name);
+      const fullPath = path5.join(currentPath, entry.name);
       if (entry.isDirectory()) {
         if (!entry.name.startsWith(".") && entry.name !== "node_modules") {
           walkDir(fullPath);
@@ -31001,7 +31194,7 @@ function countTestSequences(fileContent, tagFilterOptions) {
   return { total: testSequences.length, filtered };
 }
 async function loadTheoryFile(theoryPath, workingDir) {
-  const absolutePath = path4.resolve(workingDir, theoryPath);
+  const absolutePath = path5.resolve(workingDir, theoryPath);
   const content = await fsPromises.readFile(absolutePath, "utf-8");
   return JSON.parse(content);
 }
@@ -31106,12 +31299,12 @@ async function main() {
     process.exit(1);
   }
   const colors = await initColors();
-  const inputPath = path4.resolve(options.file);
-  if (!fs5.existsSync(inputPath)) {
+  const inputPath = path5.resolve(options.file);
+  if (!fs6.existsSync(inputPath)) {
     console.error(`Error: Path not found: ${inputPath}`);
     process.exit(1);
   }
-  const isDirectory = fs5.statSync(inputPath).isDirectory();
+  const isDirectory = fs6.statSync(inputPath).isDirectory();
   let filesToRun;
   if (isDirectory) {
     filesToRun = discoverNornFiles(inputPath);
@@ -31163,11 +31356,11 @@ async function main() {
     }
     mergeSecrets(combinedSecretNames, combinedSecretValues, resolvedEnv.secretNames, resolvedEnv.secretValues);
     const redaction2 = createRedactionOptions(combinedSecretNames, combinedSecretValues, !options.noRedact);
-    const fileContent = fs5.readFileSync(filePath, "utf-8");
+    const fileContent = fs6.readFileSync(filePath, "utf-8");
     const fileVariables = extractFileLevelVariables(fileContent);
     const variables = { ...resolvedEnv.variables, ...fileVariables };
     const cookieJar = createCookieJar();
-    const workingDir = path4.dirname(filePath);
+    const workingDir = path5.dirname(filePath);
     const importResult = await resolveImports(
       fileContent,
       workingDir,
@@ -31268,7 +31461,7 @@ ${fileContent}` : fileContent;
   let totalTestCount = 0;
   let filteredTestCount = 0;
   for (const filePath of filesToRun) {
-    const fileContent = fs5.readFileSync(filePath, "utf-8");
+    const fileContent = fs6.readFileSync(filePath, "utf-8");
     const counts = countTestSequences(fileContent, tagFilterOptions);
     totalTestCount += counts.total;
     filteredTestCount += counts.filtered;
@@ -31295,16 +31488,16 @@ ${fileContent}` : fileContent;
       process.exit(1);
     }
     if (!resolvedEnv.envFilePath && options.env) {
-      const relPath = isDirectory ? path4.relative(inputPath, filePath) : path4.basename(filePath);
+      const relPath = isDirectory ? path5.relative(inputPath, filePath) : path5.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 = fs5.readFileSync(filePath, "utf-8");
+    const fileContent = fs6.readFileSync(filePath, "utf-8");
     const fileVariables = extractFileLevelVariables(fileContent);
     const variables = { ...resolvedEnv.variables, ...fileVariables };
     const cookieJar = createCookieJar();
-    const workingDir = path4.dirname(filePath);
+    const workingDir = path5.dirname(filePath);
     const importResult = await resolveImports(
       fileContent,
       workingDir,
@@ -31336,7 +31529,7 @@ ${fileContent}` : fileContent;
       continue;
     }
     if (isDirectory && options.output !== "json") {
-      const relPath = path4.relative(inputPath, filePath);
+      const relPath = path5.relative(inputPath, filePath);
       console.log(colors.info(`
 \u2501\u2501\u2501 ${relPath} \u2501\u2501\u2501`));
     }
@@ -31380,7 +31573,7 @@ ${fileContent}` : fileContent;
   let htmlOutputPath = options.htmlOutput;
   if (options.outputDir) {
     const timestamp = generateTimestamp();
-    const baseName = isDirectory ? path4.basename(inputPath) : path4.basename(inputPath, path4.extname(inputPath));
+    const baseName = isDirectory ? path5.basename(inputPath) : path5.basename(inputPath, path5.extname(inputPath));
     const generatedPaths = generateReportPaths(options.outputDir, baseName + ".norn", timestamp);
     if (!junitOutputPath) {
       junitOutputPath = generatedPaths.junitPath;
@@ -31388,12 +31581,12 @@ ${fileContent}` : fileContent;
     if (!htmlOutputPath) {
       htmlOutputPath = generatedPaths.htmlPath;
     }
-    if (!fs5.existsSync(options.outputDir)) {
-      fs5.mkdirSync(options.outputDir, { recursive: true });
+    if (!fs6.existsSync(options.outputDir)) {
+      fs6.mkdirSync(options.outputDir, { recursive: true });
     }
   }
   if (junitOutputPath) {
-    const suiteName = isDirectory ? path4.basename(inputPath) : path4.basename(inputPath, path4.extname(inputPath));
+    const suiteName = isDirectory ? path5.basename(inputPath) : path5.basename(inputPath, path5.extname(inputPath));
     if (result.type === "request") {
       generateJUnitReportFromResponse(
         result.results[0],
@@ -31409,11 +31602,11 @@ ${fileContent}` : fileContent;
     console.log(colors.info(`JUnit report written to: ${junitOutputPath}`));
   }
   if (htmlOutputPath) {
-    const title = `Norn Test Report - ${path4.basename(inputPath)}`;
+    const title = `Norn Test Report - ${path5.basename(inputPath)}`;
     if (result.type === "request") {
       generateHtmlReportFromResponse(
         result.results[0],
-        options.request || path4.basename(inputPath),
+        options.request || path5.basename(inputPath),
         { outputPath: htmlOutputPath, redaction, title }
       );
     } else {