From 065bcbb49bb8efcd5bbb4052f268fa272f93d2f3 Mon Sep 17 00:00:00 2001
From: dyoganan_ford <dyoganan@ford.com>
Date: Mon, 8 Sep 2025 20:42:55 +0530
Subject: [PATCH 1/4] Sync devenbap and forked version - Commit includes ford
 specific changes, allow redirect, auto supression, graphql interceptor issue
 fix

---
 packages/hoppscotch-cli/package.json          |   4 +-
 .../collections/digest-auth-success-coll.json |   2 +-
 .../e2e/fixtures/collections/sample-coll.json |   4 +-
 .../hoppscotch-cli/src/utils/collections.ts   |  11 +-
 packages/hoppscotch-cli/src/utils/mutators.ts |  19 +-
 .../hoppscotch-cli/src/utils/pre-request.ts   |  10 +-
 packages/hoppscotch-cli/src/utils/request.ts  |  10 +-
 packages/hoppscotch-common/locales/en.json    |   1 +
 .../src/components/app/Footer.vue             |   4 +-
 .../src/components/app/Header.vue             |   5 +-
 .../src/components/app/KernelInterceptor.vue  |   1 +
 .../src/components/collections/Request.vue    |  20 +-
 .../src/components/http/Request.vue           |   2 +-
 .../src/components/http/Sidebar.vue           |   2 +-
 .../src/components/http/TabHead.vue           |   3 +-
 .../interceptors/ErrorPlaceholder.vue         |  96 +++--
 .../src/components/settings/Native.vue        |  15 +
 .../src/components/settings/Proxy.vue         |   4 +-
 .../src/helpers/RequestRunner.ts              |   2 +
 .../src/helpers/functional/domain-settings.ts |   2 +-
 .../src/helpers/functional/process-request.ts |  25 +-
 .../src/helpers/graphql/connection.ts         |   4 +
 .../src/helpers/kernel/gql/request.ts         |   4 +
 .../src/helpers/kernel/rest/request.ts        |   8 +-
 .../src/helpers/terndoc/pw-test.json          |   9 +-
 .../src/helpers/testSnippets.ts               |   7 +
 .../hoppscotch-common/src/kernel/relay.ts     |   9 +-
 .../src/newstore/settings.ts                  |   2 +
 .../hoppscotch-common/src/pages/settings.vue  |  11 +-
 .../src/platform/std/interceptors/proxy.ts    |   4 +-
 .../std/kernel-interceptors/browser/index.ts  |   4 +-
 .../kernel-interceptors/extension/index.ts    |  19 +-
 .../std/kernel-interceptors/native/index.ts   |   2 +
 .../std/kernel-interceptors/native/store.ts   |  33 +-
 .../std/kernel-interceptors/proxy/index.ts    |  10 +-
 .../services/kernel-interceptor.service.ts    |   4 +-
 .../spotlight/searchers/request.searcher.ts   |   2 +-
 .../src/types/post-request.d.ts               |   4 +
 .../plugin-workspace/relay/src/interop.rs     |   1 +
 .../plugin-workspace/relay/src/request.rs     |  56 +--
 .../tauri-plugin-relay/Cargo.toml             |   2 +-
 .../tauri-plugin-relay/dist-js/index.d.ts     |   2 +
 .../tauri-plugin-relay/dist-js/index.d.ts.map |   2 +-
 .../tauri-plugin-relay/guest-js/index.ts      |   3 +
 .../hoppscotch-desktop/src-tauri/Cargo.lock   |   4 +-
 .../hoppscotch-desktop/src-tauri/Cargo.toml   |   4 +-
 .../hoppscotch-desktop/src-tauri/src/lib.rs   |   3 -
 .../src-tauri/tauri.conf.json                 |   4 +-
 .../hoppscotch-desktop/src/utils/updater.ts   |  20 +
 .../src/bootstrap-code/post-request.js        |  16 +
 .../src/cage-modules/pw.ts                    |  76 ++++
 .../src/node/test-runner/legacy.ts            |  12 +-
 .../hoppscotch-js-sandbox/src/shared-utils.ts | 382 +++++++-----------
 .../hoppscotch-js-sandbox/src/types/index.ts  |   4 +
 .../src/relay/impl/desktop/v/1.ts             |  37 +-
 .../src/relay/impl/web/v/1.ts                 |  74 +---
 packages/hoppscotch-kernel/src/relay/v/1.ts   |  14 +
 packages/hoppscotch-relay/src/interop.rs      |   3 +
 packages/hoppscotch-relay/src/relay.rs        |  53 ++-
 .../src-tauri/Cargo.toml                      |   4 +
 .../src-tauri/tauri.conf.json                 |   3 +-
 .../components/settings/NativeInterceptor.vue |  16 +
 .../src/platform/interceptors/native/index.ts | 211 +++++++---
 63 files changed, 833 insertions(+), 551 deletions(-)

diff --git a/packages/hoppscotch-cli/package.json b/packages/hoppscotch-cli/package.json
index 9e308f231d1..6cc16921bb2 100644
--- a/packages/hoppscotch-cli/package.json
+++ b/packages/hoppscotch-cli/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@hoppscotch/cli",
-  "version": "0.24.0",
+  "name": "@devenap/hoppscotch-cli",
+  "version": "1.2.3",
   "description": "A CLI to run Hoppscotch test scripts in CI environments.",
   "homepage": "https://hoppscotch.io",
   "type": "module",
diff --git a/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/digest-auth-success-coll.json b/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/digest-auth-success-coll.json
index 16f0b6fca4c..0ae506443b4 100644
--- a/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/digest-auth-success-coll.json
+++ b/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/digest-auth-success-coll.json
@@ -29,7 +29,7 @@
       "params": [],
       "headers": [],
       "endpoint": "<<url>>",
-      "testScript": "pw.test(\"Status code is 200\", ()=> { pw.expect(pw.response.status).toBe(200);}); \n pw.test(\"Receives the www-authenticate header\", ()=> { pw.expect(pw.response.headers['www-authenticate']).toBeType('string');});",
+      "testScript": "pw.test(\"Status code is 200\", ()=> { pw.expect(pw.response.status).toBe(200);});",
       "preRequestScript": "",
       "responses": {},
       "requestVariables": []
diff --git a/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/sample-coll.json b/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/sample-coll.json
index b0ca8cecf2f..facdb85c474 100644
--- a/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/sample-coll.json
+++ b/packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/sample-coll.json
@@ -15,7 +15,7 @@
                 "authActive": true
             },
             "preRequestScript": "",
-            "testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n});",
+            "testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n }); \n\n// Check Content-Type\n pw.test(\"Check Content-Type\", () => {\n  let contentType = null;\n  for (const header of pw.response.headers) {\n  if (header.key.toLowerCase() === 'content-type') {\n    contentType = header.value;\n    break;\n  }\n}\npw.expect(contentType).toBe('application/json');\n });",
             "body": {
                 "contentType": null,
                 "body": null
@@ -23,4 +23,4 @@
             "requestVariables": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/packages/hoppscotch-cli/src/utils/collections.ts b/packages/hoppscotch-cli/src/utils/collections.ts
index fa635783886..860b5c45b4f 100644
--- a/packages/hoppscotch-cli/src/utils/collections.ts
+++ b/packages/hoppscotch-cli/src/utils/collections.ts
@@ -34,6 +34,8 @@ import {
   processRequest,
 } from "./request";
 import { getTestMetrics } from "./test";
+import {ProxyAgent} from "proxy-agent";
+import axios from "axios";
 
 const { WARN, FAIL, INFO } = exceptionColors;
 
@@ -132,8 +134,15 @@ const processCollection = async (
     // Request processing initiated message.
     log(WARN(`\nRunning: ${chalk.bold(requestPath)}`));
 
+    const agent = new ProxyAgent();
+    const axiosInstance = axios.create({
+      httpsAgent : agent,
+      httpAgent : agent,
+      proxy: false, // Disable axios's default proxy handling
+    });
+
     // Processing current request.
-    const result = await processRequest(processRequestParams)();
+    const result = await processRequest(processRequestParams,axiosInstance)();
 
     // Updating global & selected envs with new envs from processed-request output.
     const { global, selected } = result.envs;
diff --git a/packages/hoppscotch-cli/src/utils/mutators.ts b/packages/hoppscotch-cli/src/utils/mutators.ts
index 153e66b24a9..3fe2ba3eaf7 100644
--- a/packages/hoppscotch-cli/src/utils/mutators.ts
+++ b/packages/hoppscotch-cli/src/utils/mutators.ts
@@ -8,6 +8,8 @@ import { error } from "../types/errors";
 import { FormDataEntry } from "../types/request";
 import { isHoppErrnoException } from "./checks";
 import { getResourceContents } from "./getters";
+import FormData from "form-data";
+import fsSync from "fs";
 
 const getValidRequests = (
   collections: HoppCollection[],
@@ -52,20 +54,9 @@ const getValidRequests = (
 export const toFormData = (values: FormDataEntry[]) => {
   const formData = new FormData();
 
-  values.forEach(({ key, value, contentType }) => {
-    if (contentType) {
-      formData.append(
-        key,
-        new Blob([value], {
-          type: contentType,
-        }),
-        key
-      );
-
-      return;
-    }
-
-    formData.append(key, value);
+  values.forEach(({ key, value }) => {
+    const isFilePath = typeof value === "string" && value.startsWith("/");
+    formData.append(key, isFilePath ? fsSync.createReadStream(value) : value);
   });
 
   return formData;
diff --git a/packages/hoppscotch-cli/src/utils/pre-request.ts b/packages/hoppscotch-cli/src/utils/pre-request.ts
index 4837ff6fd63..a12a944d867 100644
--- a/packages/hoppscotch-cli/src/utils/pre-request.ts
+++ b/packages/hoppscotch-cli/src/utils/pre-request.ts
@@ -33,6 +33,7 @@ import {
   fetchInitialDigestAuthInfo,
   generateDigestAuthHeader,
 } from "./auth/digest";
+import FormData from "form-data";
 
 import { calculateHawkHeader } from "@hoppscotch/data";
 
@@ -388,7 +389,14 @@ export async function getEffectiveRESTRequest(
 
   const effectiveFinalBody = _effectiveFinalBody.right;
 
-  if (
+  if (effectiveFinalBody instanceof FormData) {
+    effectiveFinalHeaders.push({
+      active: true,
+      key: "Content-Type",
+      value: `multipart/form-data; boundary=${effectiveFinalBody.getBoundary()}`,
+      description: "",
+    });
+  } else if (
     request.body.contentType &&
     !effectiveFinalHeaders.some(
       ({ key }) => key.toLowerCase() === "content-type"
diff --git a/packages/hoppscotch-cli/src/utils/request.ts b/packages/hoppscotch-cli/src/utils/request.ts
index 4f1611f2103..485a336090c 100644
--- a/packages/hoppscotch-cli/src/utils/request.ts
+++ b/packages/hoppscotch-cli/src/utils/request.ts
@@ -4,7 +4,7 @@ import {
   HoppRESTRequest,
   RESTReqSchemaVersion,
 } from "@hoppscotch/data";
-import axios, { Method } from "axios";
+import axios, { AxiosInstance,Method } from "axios";
 import * as A from "fp-ts/Array";
 import * as E from "fp-ts/Either";
 import * as T from "fp-ts/Task";
@@ -102,7 +102,7 @@ export const createRequest = (req: EffectiveHoppRESTRequest): RequestConfig => {
  */
 export const requestRunner =
   (
-    requestConfig: RequestConfig
+    requestConfig: RequestConfig, axiosInstance: AxiosInstance
   ): TE.TaskEither<HoppCLIError, RequestRunnerResponse> =>
   async () => {
     const start = hrtime();
@@ -112,7 +112,7 @@ export const requestRunner =
       requestConfig.url = new URL(requestConfig.url ?? "").toString();
 
       let status: number;
-      const baseResponse = await axios(requestConfig);
+      const baseResponse = await axiosInstance(requestConfig);
       const { config } = baseResponse;
       // PR-COMMENT: type error
       const runnerResponse: RequestRunnerResponse = {
@@ -199,7 +199,7 @@ const getRequest = {
  */
 export const processRequest =
   (
-    params: ProcessRequestParams
+    params: ProcessRequestParams, axiosInstance : AxiosInstance
   ): T.Task<{ envs: HoppEnvs; report: RequestReport }> =>
   async () => {
     const { envs, path, request, delay, legacySandbox, collectionVariables } =
@@ -271,7 +271,7 @@ export const processRequest =
     // Executing request-runner.
     const requestRunnerRes = await delayPromiseFunction<
       E.Either<HoppCLIError, RequestRunnerResponse>
-    >(requestRunner(requestConfig), delay);
+    >(requestRunner(requestConfig ,axiosInstance), delay);
     if (E.isLeft(requestRunnerRes)) {
       // Updating report for errors & current result
       report.errors.push(requestRunnerRes.left);
diff --git a/packages/hoppscotch-common/locales/en.json b/packages/hoppscotch-common/locales/en.json
index 7c4c60cfc53..871c8dcf0c3 100644
--- a/packages/hoppscotch-common/locales/en.json
+++ b/packages/hoppscotch-common/locales/en.json
@@ -991,6 +991,7 @@
     "extensions": "Browser extension",
     "extensions_use_toggle": "Use the browser extension to send requests (if present)",
     "follow": "Follow us",
+    "follow_redirects": "Automatically follow redirects",
     "general": "General",
     "general_description": " General settings used in the application",
     "interceptor": "Interceptor",
diff --git a/packages/hoppscotch-common/src/components/app/Footer.vue b/packages/hoppscotch-common/src/components/app/Footer.vue
index 6676e5d8a4e..6732f65cc6c 100644
--- a/packages/hoppscotch-common/src/components/app/Footer.vue
+++ b/packages/hoppscotch-common/src/components/app/Footer.vue
@@ -11,7 +11,7 @@
           @click="EXPAND_NAVIGATION = !EXPAND_NAVIGATION"
         />
         <tippy interactive trigger="click" theme="popover">
-          <HoppButtonSecondary
+          <HoppButtonSecondary v-if="false"
             v-tippy="{ theme: 'tooltip' }"
             :title="t('settings.interceptor')"
             :icon="IconShieldCheck"
@@ -228,7 +228,7 @@ const SIDEBAR = useSetting("SIDEBAR")
 const COLUMN_LAYOUT = useSetting("COLUMN_LAYOUT")
 const SIDEBAR_ON_LEFT = useSetting("SIDEBAR_ON_LEFT")
 
-const navigatorShare = !!navigator.share
+const navigatorShare = ref(false)
 
 const currentUser = useReadonlyStream(
   platform.auth.getCurrentUserStream(),
diff --git a/packages/hoppscotch-common/src/components/app/Header.vue b/packages/hoppscotch-common/src/components/app/Header.vue
index 7c7668293fc..9080eeb6b56 100644
--- a/packages/hoppscotch-common/src/components/app/Header.vue
+++ b/packages/hoppscotch-common/src/components/app/Header.vue
@@ -134,7 +134,7 @@
             class="inline-flex items-center space-x-2"
           >
             <HoppButtonSecondary
-              v-if="!workspaceSelectorFlagEnabled"
+              v-if="false"
               :icon="IconUploadCloud"
               :label="t('header.save_workspace')"
               class="!focus-visible:text-emerald-600 !hover:text-emerald-600 hidden h-8 border border-emerald-600/25 bg-emerald-500/10 !text-emerald-500 hover:border-emerald-600/20 hover:bg-emerald-600/20 focus-visible:border-emerald-600/20 focus-visible:bg-emerald-600/20 md:flex"
@@ -144,6 +144,7 @@
               :label="t('header.login')"
               class="h-8"
               @click="invokeAction('modals.login.toggle')"
+              v-if="!isLoginDisabled"
             />
           </div>
           <TeamsMemberStack
@@ -443,7 +444,7 @@ onMounted(async () => {
 })
 
 const showTeamsModal = ref(false)
-
+const isLoginDisabled = ref(true)
 const breakpoints = useBreakpoints(breakpointsTailwind)
 const mdAndLarger = breakpoints.greater("md")
 
diff --git a/packages/hoppscotch-common/src/components/app/KernelInterceptor.vue b/packages/hoppscotch-common/src/components/app/KernelInterceptor.vue
index a0342c9af1f..3e4fb0e4cfb 100644
--- a/packages/hoppscotch-common/src/components/app/KernelInterceptor.vue
+++ b/packages/hoppscotch-common/src/components/app/KernelInterceptor.vue
@@ -16,6 +16,7 @@
         class="flex flex-col"
       >
         <HoppSmartRadio
+          v-if="kernelInterceptor.id !== 'proxy'"
           :value="kernelInterceptor.id"
           :label="kernelInterceptor.name(t)"
           :selected="kernelInterceptorSelection === kernelInterceptor.id"
diff --git a/packages/hoppscotch-common/src/components/collections/Request.vue b/packages/hoppscotch-common/src/components/collections/Request.vue
index 66b1d62d483..3b5f892c75a 100644
--- a/packages/hoppscotch-common/src/components/collections/Request.vue
+++ b/packages/hoppscotch-common/src/components/collections/Request.vue
@@ -129,25 +129,25 @@
                   "
                 />
                 <HoppSmartItem
-                  ref="shareAction"
-                  :icon="IconShare2"
-                  :label="t('action.share')"
-                  :shortcut="['S']"
+                  ref="deleteAction"
+                  :icon="IconTrash2"
+                  :label="t('action.delete')"
+                  :shortcut="['⌫']"
                   @click="
                     () => {
-                      emit('share-request')
+                      emit('remove-request')
                       hide()
                     }
                   "
                 />
                 <HoppSmartItem
-                  ref="deleteAction"
-                  :icon="IconTrash2"
-                  :label="t('action.delete')"
-                  :shortcut="['⌫']"
+                  ref="shareAction"
+                  :icon="IconShare2"
+                  :label="t('action.share')"
+                  :shortcut="['S']"
                   @click="
                     () => {
-                      emit('remove-request')
+                      emit('share-request')
                       hide()
                     }
                   "
diff --git a/packages/hoppscotch-common/src/components/http/Request.vue b/packages/hoppscotch-common/src/components/http/Request.vue
index 6afce1bf93e..b25bdcb3d0c 100644
--- a/packages/hoppscotch-common/src/components/http/Request.vue
+++ b/packages/hoppscotch-common/src/components/http/Request.vue
@@ -198,7 +198,7 @@
                   "
                 />
                 <hr />
-                <HoppSmartItem
+                <HoppSmartItem v-if="false"
                   ref="copyRequestAction"
                   :label="t('request.share_request')"
                   :icon="IconShare2"
diff --git a/packages/hoppscotch-common/src/components/http/Sidebar.vue b/packages/hoppscotch-common/src/components/http/Sidebar.vue
index b62836b1c04..b640481e946 100644
--- a/packages/hoppscotch-common/src/components/http/Sidebar.vue
+++ b/packages/hoppscotch-common/src/components/http/Sidebar.vue
@@ -26,7 +26,7 @@
     >
       <History :page="'rest'" :selected-tab="selectedNavigationTab" />
     </HoppSmartTab>
-    <HoppSmartTab
+    <HoppSmartTab v-if="false"
       :id="'share-request'"
       :icon="IconShare2"
       :label="`${t('tab.shared_requests')}`"
diff --git a/packages/hoppscotch-common/src/components/http/TabHead.vue b/packages/hoppscotch-common/src/components/http/TabHead.vue
index 5aa3549ebab..66b4131e7d9 100644
--- a/packages/hoppscotch-common/src/components/http/TabHead.vue
+++ b/packages/hoppscotch-common/src/components/http/TabHead.vue
@@ -65,7 +65,7 @@
             "
           />
           <HoppSmartItem
-            v-if="!isResponseExample"
+            v-if="!isResponseExample && showShareRequestAction"
             ref="shareRequestAction"
             :icon="IconShare2"
             :label="t('tab.share_tab_request')"
@@ -132,6 +132,7 @@ const props = defineProps<{
   isRemovable: boolean
 }>()
 
+const showShareRequestAction = ref(false)
 const tabState = computed(() => {
   if (props.tab.document.type === "request") {
     return {
diff --git a/packages/hoppscotch-common/src/components/interceptors/ErrorPlaceholder.vue b/packages/hoppscotch-common/src/components/interceptors/ErrorPlaceholder.vue
index 351ad8406d1..a5c933101f4 100644
--- a/packages/hoppscotch-common/src/components/interceptors/ErrorPlaceholder.vue
+++ b/packages/hoppscotch-common/src/components/interceptors/ErrorPlaceholder.vue
@@ -5,51 +5,58 @@
     :heading="t('error.network_fail')"
   >
     <template #body>
-      <div class="my-1 flex flex-col items-center text-secondaryLight">
-        <span>
-          {{ t("error.please_install_extension") }}
-        </span>
-        <span>
-          {{ t("error.check_how_to_add_origin") }}
-          <HoppSmartLink
-            blank
-            to="https://docs.hoppscotch.io/documentation/features/interceptor#browser-extension"
-            class="text-accent hover:text-accentDark"
-          >
-            here
-          </HoppSmartLink>
-        </span>
-      </div>
-      <div class="flex flex-col space-y-2 py-4">
-        <HoppSmartItem
-          to="https://chrome.google.com/webstore/detail/hoppscotch-browser-extens/amknoiejhlmhancpahfcfcfhllgkpbld"
-          blank
-          :icon="IconChrome"
-          label="Chrome"
-          :info-icon="hasChromeExtInstalled ? IconCheckCircle : null"
-          :active-info-icon="hasChromeExtInstalled"
-          outline
-        />
-        <HoppSmartItem
-          to="https://addons.mozilla.org/en-US/firefox/addon/hoppscotch"
-          blank
-          :icon="IconFirefox"
-          label="Firefox"
-          :info-icon="hasFirefoxExtInstalled ? IconCheckCircle : null"
-          :active-info-icon="hasFirefoxExtInstalled"
-          outline
-        />
+      <!-- Desktop mode: show only the concise error message -->
+      <div v-if="isDesktop" class="my-1 flex flex-col items-center text-secondaryLight">
+        <span>{{ t('error.network_fail') }}</span>
       </div>
-      <div class="space-y-4 py-4">
-        <div class="flex items-center">
-          <HoppSmartToggle
-            :on="extensionEnabled"
-            @change="extensionEnabled = !extensionEnabled"
-          >
-            {{ t("settings.extensions_use_toggle") }}
-          </HoppSmartToggle>
+      <!-- Web mode: show extension guidance -->
+      <template v-else>
+        <div class="my-1 flex flex-col items-center text-secondaryLight">
+          <span>
+            {{ t("error.please_install_extension") }}
+          </span>
+          <span>
+            {{ t("error.check_how_to_add_origin") }}
+            <HoppSmartLink
+              blank
+              to="https://docs.hoppscotch.io/documentation/features/interceptor#browser-extension"
+              class="text-accent hover:text-accentDark"
+            >
+              here
+            </HoppSmartLink>
+          </span>
         </div>
-      </div>
+        <div class="flex flex-col space-y-2 py-4">
+          <HoppSmartItem
+            to="https://chrome.google.com/webstore/detail/hoppscotch-browser-extens/amknoiejhlmhancpahfcfcfhllgkpbld"
+            blank
+            :icon="IconChrome"
+            label="Chrome"
+            :info-icon="hasChromeExtInstalled ? IconCheckCircle : null"
+            :active-info-icon="hasChromeExtInstalled"
+            outline
+          />
+          <HoppSmartItem
+            to="https://addons.mozilla.org/en-US/firefox/addon/hoppscotch"
+            blank
+            :icon="IconFirefox"
+            label="Firefox"
+            :info-icon="hasFirefoxExtInstalled ? IconCheckCircle : null"
+            :active-info-icon="hasFirefoxExtInstalled"
+            outline
+          />
+        </div>
+        <div class="space-y-4 py-4">
+          <div class="flex items-center">
+            <HoppSmartToggle
+              :on="extensionEnabled"
+              @change="extensionEnabled = !extensionEnabled"
+            >
+              {{ t("settings.extensions_use_toggle") }}
+            </HoppSmartToggle>
+          </div>
+        </div>
+      </template>
     </template>
   </HoppSmartPlaceholder>
 </template>
@@ -65,6 +72,7 @@ import { computed } from "vue"
 import { InterceptorService } from "~/services/interceptor.service"
 import { platform } from "~/platform"
 import { useColorMode } from "~/composables/theming"
+import { getKernelMode } from "@hoppscotch/kernel"
 
 const colorMode = useColorMode()
 const t = useI18n()
@@ -75,6 +83,8 @@ const extensionService = useService(ExtensionInterceptorService)
 const hasChromeExtInstalled = extensionService.chromeExtensionInstalled
 const hasFirefoxExtInstalled = extensionService.firefoxExtensionInstalled
 
+const isDesktop = getKernelMode() === "desktop"
+
 const extensionEnabled = computed({
   get() {
     return (
diff --git a/packages/hoppscotch-common/src/components/settings/Native.vue b/packages/hoppscotch-common/src/components/settings/Native.vue
index 2c266d4fe53..f5d6a7b0cbe 100644
--- a/packages/hoppscotch-common/src/components/settings/Native.vue
+++ b/packages/hoppscotch-common/src/components/settings/Native.vue
@@ -67,6 +67,13 @@
           input-styles="floating-input !border-0"
           @update:model-value="updateProxyUrl"
         />
+        <HoppSmartInput
+          :model-value="domainSettings[selectedDomain].proxy.no_proxy"
+          :placeholder="' '"
+          :label="'Proxy Bypass (Enter comma separated values to bypass proxy settings. Example: localhost, .example.com)'"
+          input-styles="floating-input !border-0"
+          @update:model-value="updateNoProxy"
+        />
         <p class="my-1 text-secondaryLight">
           {{ t("settings.proxy_auth") }}
         </p>
@@ -575,6 +582,14 @@ function updateProxyPassword(value: string) {
   })
 }
 
+function updateNoProxy(value: string) {
+  console.log(" Noproxy  " + JSON.stringify(value,null,2))
+  const current = domainSettings[selectedDomain.value]?.proxy
+  updateDomainSettings({
+    proxy: { ...current, no_proxy: value },
+  })
+}
+
 function updatePFXPassword(value: string) {
   const currentClient =
     domainSettings[selectedDomain.value]?.security?.certificates?.client
diff --git a/packages/hoppscotch-common/src/components/settings/Proxy.vue b/packages/hoppscotch-common/src/components/settings/Proxy.vue
index 6c136ea5ff3..033a4988e4d 100644
--- a/packages/hoppscotch-common/src/components/settings/Proxy.vue
+++ b/packages/hoppscotch-common/src/components/settings/Proxy.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="my-1 text-secondaryLight">
+  <div class="my-1 text-secondaryLight" v-if="false">
     {{ `${t("settings.official_proxy_hosting")} ${t("settings.read_the")}` }}
     <HoppSmartAnchor
       class="link"
@@ -8,7 +8,7 @@
       :label="t('app.proxy_privacy_policy')"
     />.
   </div>
-  <div class="flex items-center space-x-2 py-4">
+  <div class="flex items-center space-x-2 py-4" v-if="false">
     <HoppSmartInput
       v-model="proxyUrl"
       :autofocus="false"
diff --git a/packages/hoppscotch-common/src/helpers/RequestRunner.ts b/packages/hoppscotch-common/src/helpers/RequestRunner.ts
index 067a548335d..efde22557b6 100644
--- a/packages/hoppscotch-common/src/helpers/RequestRunner.ts
+++ b/packages/hoppscotch-common/src/helpers/RequestRunner.ts
@@ -477,6 +477,7 @@ export function runRESTRequest$(
               status: res.statusCode,
               body: getTestableBody(res),
               headers: res.headers,
+              duration: res.meta.responseDuration,
             }
           )
 
@@ -646,6 +647,7 @@ export function runTestRunnerRequest(
               status: res.statusCode,
               body: getTestableBody(res),
               headers: res.headers,
+              duration: res.meta.responseDuration,
             }
           )
 
diff --git a/packages/hoppscotch-common/src/helpers/functional/domain-settings.ts b/packages/hoppscotch-common/src/helpers/functional/domain-settings.ts
index a18693ffc0e..138e5637df6 100644
--- a/packages/hoppscotch-common/src/helpers/functional/domain-settings.ts
+++ b/packages/hoppscotch-common/src/helpers/functional/domain-settings.ts
@@ -25,6 +25,7 @@ export type InputDomainSetting = {
   }
   proxy?: {
     url: string
+    no_proxy: string
     auth?: {
       username?: string
       password?: string
@@ -221,6 +222,5 @@ export const convertDomainSetting = (
     proxy: O.isSome(proxy) ? proxy.value : undefined,
     security: O.isSome(security) ? security.value : undefined,
   }
-
   return E.right(result)
 }
diff --git a/packages/hoppscotch-common/src/helpers/functional/process-request.ts b/packages/hoppscotch-common/src/helpers/functional/process-request.ts
index e4bf20c93d5..dfaf8b323b5 100644
--- a/packages/hoppscotch-common/src/helpers/functional/process-request.ts
+++ b/packages/hoppscotch-common/src/helpers/functional/process-request.ts
@@ -80,15 +80,28 @@ const updateUrl = (
   )
 
 export const preProcessRelayRequest = (req: RelayRequest): RelayRequest =>
-  pipe(cloneDeep(req), (req) =>
-    req.params
+  pipe(cloneDeep(req), (req) => {
+    // Ensure options are preserved during URL processing
+    const processedReq = req.params
       ? pipe(
           updateUrl(req.url, req.params),
-          E.map((url) => ({ ...req, url, params: {} })),
+          E.map((url) => ({
+            ...req,
+            url,
+            params: {},
+            // CRITICAL: Preserve options including followRedirects
+            options: req.options,
+            meta: req.meta
+          })),
           E.getOrElse(() => req)
         )
       : req
-  )
 
-export const postProcessRelayRequest = (req: RelayRequest): RelayRequest =>
-  pipe(cloneDeep(req), (req) => superjson.serialize(req).json)
+
+    return processedReq
+  })
+
+export const postProcessRelayRequest = (req: RelayRequest): RelayRequest => {
+  const result = pipe(cloneDeep(req), (req) => superjson.serialize(req).json)
+  return result
+}
diff --git a/packages/hoppscotch-common/src/helpers/graphql/connection.ts b/packages/hoppscotch-common/src/helpers/graphql/connection.ts
index 66b05120d8f..9b75d38b437 100644
--- a/packages/hoppscotch-common/src/helpers/graphql/connection.ts
+++ b/packages/hoppscotch-common/src/helpers/graphql/connection.ts
@@ -22,6 +22,7 @@ import { Component, computed, reactive, ref } from "vue"
 import { useToast } from "~/composables/toast"
 import { getService } from "~/modules/dioc"
 import { getI18n } from "~/modules/i18n"
+import { settingsStore } from "~/newstore/settings"
 
 import { addGraphqlHistoryEntry, makeGQLHistoryEntry } from "~/newstore/history"
 
@@ -286,6 +287,9 @@ const getSchema = async (options: ConnectionRequestOptions) => {
         { query: getIntrospectionQuery() },
         MediaType.APPLICATION_JSON
       ),
+      options: {
+        followRedirects: settingsStore.value.FOLLOW_REDIRECTS,
+      },
     }
 
     const kernelInterceptorService = getService(KernelInterceptorService)
diff --git a/packages/hoppscotch-common/src/helpers/kernel/gql/request.ts b/packages/hoppscotch-common/src/helpers/kernel/gql/request.ts
index d153cce053a..fd8af874e31 100644
--- a/packages/hoppscotch-common/src/helpers/kernel/gql/request.ts
+++ b/packages/hoppscotch-common/src/helpers/kernel/gql/request.ts
@@ -8,6 +8,7 @@ import { HoppGQLRequest } from "@hoppscotch/data"
 import { transformAuth } from "~/helpers/kernel/common"
 import { defaultAuth } from "~/helpers/kernel/common/auth"
 import { filterActiveToRecord } from "~/helpers/functional/filter-active"
+import { settingsStore } from "~/newstore/settings"
 
 const parseVariables = async (variables: string | null): Promise<unknown> => {
   if (!variables) return undefined
@@ -43,6 +44,9 @@ export const GQLRequest = {
         { query: request.query, variables },
         MediaType.APPLICATION_JSON
       ),
+      options: {
+        followRedirects: settingsStore.value.FOLLOW_REDIRECTS,
+      },
     }
   },
 }
diff --git a/packages/hoppscotch-common/src/helpers/kernel/rest/request.ts b/packages/hoppscotch-common/src/helpers/kernel/rest/request.ts
index 585b4b6ea59..68cbe1e71c8 100644
--- a/packages/hoppscotch-common/src/helpers/kernel/rest/request.ts
+++ b/packages/hoppscotch-common/src/helpers/kernel/rest/request.ts
@@ -5,6 +5,7 @@ import { pipe } from "fp-ts/function"
 
 import { Method, RelayRequest, ContentType, AuthType } from "@hoppscotch/kernel"
 import { EffectiveHoppRESTRequest } from "~/helpers/utils/EffectiveURL"
+import { settingsStore } from "~/newstore/settings"
 
 import { transformAuth, transformContent } from "~/helpers/kernel/common"
 import { defaultAuth } from "~/helpers/kernel/common/auth"
@@ -29,7 +30,7 @@ export const RESTRequest = {
     const headers = filterActiveToRecord(request.effectiveFinalHeaders)
     const params = filterActiveParams(request.effectiveFinalParams)
 
-    return {
+    const relayRequest = {
       id: Date.now(),
       url: request.effectiveFinalURL,
       method: request.method.toUpperCase() as Method,
@@ -38,6 +39,11 @@ export const RESTRequest = {
       params,
       auth,
       content,
+      options: {
+        followRedirects: settingsStore.value.FOLLOW_REDIRECTS,
+      },
     }
+
+    return relayRequest
   },
 }
diff --git a/packages/hoppscotch-common/src/helpers/terndoc/pw-test.json b/packages/hoppscotch-common/src/helpers/terndoc/pw-test.json
index 3b588355532..3016e7a5739 100644
--- a/packages/hoppscotch-common/src/helpers/terndoc/pw-test.json
+++ b/packages/hoppscotch-common/src/helpers/terndoc/pw-test.json
@@ -10,7 +10,11 @@
       "toBeLevel5xx": "fn()",
       "toBeType": "fn(type: string)",
       "toHaveLength": "fn(length: number)",
-      "toInclude": "fn(value: ?)"
+      "toInclude": "fn(value: ?)",
+      "toBeGreaterThan": "fn(value: number)",
+      "toBeLessThan": "fn(value: number)",
+      "toBeGreaterThanOrEqual": "fn(value: number)",
+      "toBeLessThanOrEqual": "fn(value: number)"
     }
   },
   "pw": {
@@ -18,7 +22,8 @@
     "response": {
       "status": "number",
       "headers": "?",
-      "body": "?"
+      "body": "?",
+      "duration": "number"
     },
     "env": {
       "set": "fn(key: string, value: string)",
diff --git a/packages/hoppscotch-common/src/helpers/testSnippets.ts b/packages/hoppscotch-common/src/helpers/testSnippets.ts
index 002d39578ab..ba2ec6df8a3 100644
--- a/packages/hoppscotch-common/src/helpers/testSnippets.ts
+++ b/packages/hoppscotch-common/src/helpers/testSnippets.ts
@@ -46,4 +46,11 @@ pw.test("Status code is 5xx", ()=> {
     pw.expect(pw.response.status).toBeLevel5xx();
 });`,
   },
+  {
+    name: "Response Duration: Response time is less than 200ms",
+    script: `\n\n// Check response time is less than 200ms
+ pw.test("Response time is less than 200ms", ()=> {
+    pw.expect(pw.response.duration).toBeLessThan(200);
+ });`,
+  },
 ]
diff --git a/packages/hoppscotch-common/src/kernel/relay.ts b/packages/hoppscotch-common/src/kernel/relay.ts
index 46a8d4ea4ec..3ce824eeba2 100644
--- a/packages/hoppscotch-common/src/kernel/relay.ts
+++ b/packages/hoppscotch-common/src/kernel/relay.ts
@@ -21,6 +21,13 @@ export const Relay = (() => {
       cancel: () => Promise<void>
       emitter: RelayEventEmitter<RelayRequestEvents>
       response: Promise<E.Either<RelayError, RelayResponse>>
-    } => module().execute(request),
+    } => {
+      // DEBUG: Log the actual relay module being used
+      const relayModule = module();
+
+      const result = relayModule.execute(request);
+
+      return result;
+    },
   } as const
 })()
diff --git a/packages/hoppscotch-common/src/newstore/settings.ts b/packages/hoppscotch-common/src/newstore/settings.ts
index 6b9cfef7314..57e0712bc21 100644
--- a/packages/hoppscotch-common/src/newstore/settings.ts
+++ b/packages/hoppscotch-common/src/newstore/settings.ts
@@ -33,6 +33,7 @@ export type SettingsDef = {
   syncEnvironments: boolean
 
   PROXY_URL: string
+  FOLLOW_REDIRECTS: boolean
 
   WRAP_LINES: {
     httpRequestBody: boolean
@@ -124,6 +125,7 @@ export const getDefaultSettings = (): SettingsDef => {
 
     // TODO: Interceptor related settings should move under the interceptor systems
     PROXY_URL: defaultProxyURL,
+    FOLLOW_REDIRECTS: true,
     URL_EXCLUDES: {
       auth: true,
       httpUser: true,
diff --git a/packages/hoppscotch-common/src/pages/settings.vue b/packages/hoppscotch-common/src/pages/settings.vue
index ff2a0dee9de..a387597a999 100644
--- a/packages/hoppscotch-common/src/pages/settings.vue
+++ b/packages/hoppscotch-common/src/pages/settings.vue
@@ -55,6 +55,14 @@
                   {{ t("settings.telemetry") }}
                 </HoppSmartToggle>
               </div>
+              <div class="flex items-center">
+                <HoppSmartToggle
+                  :on="FOLLOW_REDIRECTS"
+                  @change="toggleSetting('FOLLOW_REDIRECTS')"
+                >
+                  {{ t("settings.follow_redirects") }}
+                </HoppSmartToggle>
+              </div>
               <div class="flex items-center">
                 <HoppSmartToggle
                   :on="EXPAND_NAVIGATION"
@@ -253,7 +261,7 @@
             v-for="[id, settings] in kernelInterceptorsWithSettings"
             :key="id"
           >
-            <h4 class="font-semibold text-secondaryDark">
+            <h4 v-if="settings.title(t) !== 'Proxy'" class="font-semibold text-secondaryDark">
               {{ settings.title(t) }}
             </h4>
             <component :is="settings.component" />
@@ -345,6 +353,7 @@ const kernelInterceptorsWithSettings = computed(() =>
 
 const ACCENT_COLOR = useSetting("THEME_COLOR")
 const TELEMETRY_ENABLED = useSetting("TELEMETRY_ENABLED")
+const FOLLOW_REDIRECTS = useSetting("FOLLOW_REDIRECTS")
 const EXPAND_NAVIGATION = useSetting("EXPAND_NAVIGATION")
 const SIDEBAR_ON_LEFT = useSetting("SIDEBAR_ON_LEFT")
 const ENABLE_AI_EXPERIMENTS = useSetting("ENABLE_AI_EXPERIMENTS")
diff --git a/packages/hoppscotch-common/src/platform/std/interceptors/proxy.ts b/packages/hoppscotch-common/src/platform/std/interceptors/proxy.ts
index ed8f521870d..8792a7dfab6 100644
--- a/packages/hoppscotch-common/src/platform/std/interceptors/proxy.ts
+++ b/packages/hoppscotch-common/src/platform/std/interceptors/proxy.ts
@@ -15,7 +15,7 @@ type ProxyHeaders = {
 
 type ProxyPayloadType =
   | FormData
-  | (AxiosRequestConfig & { wantsBinary: true; accessToken: string })
+  | (AxiosRequestConfig & { wantsBinary: true; accessToken: string; followRedirects?: boolean })
 
 const getProxyPayload = (
   req: AxiosRequestConfig,
@@ -25,8 +25,10 @@ const getProxyPayload = (
     ...req,
     wantsBinary: true,
     accessToken: import.meta.env.VITE_PROXYSCOTCH_ACCESS_TOKEN ?? "",
+    followRedirects: settingsStore.value.FOLLOW_REDIRECTS,
   }
 
+
   if (payload.data instanceof FormData) {
     const formData = payload.data
     payload.data = ""
diff --git a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/browser/index.ts b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/browser/index.ts
index cdd81a9e695..87ddeaa0474 100644
--- a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/browser/index.ts
+++ b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/browser/index.ts
@@ -48,13 +48,15 @@ export class BrowserKernelInterceptorService
     auth: new Set(["basic", "bearer", "apikey"]),
     security: new Set([]),
     proxy: new Set([]),
-    advanced: new Set([]),
+    advanced: new Set(["redirects"]),
   } as const
 
   public execute(
     request: RelayRequest
   ): ExecutionResult<KernelInterceptorError> {
+    // Ensure redirect options are properly passed through to the Relay
     const processedRequest = preProcessRelayRequest(request)
+
     const relayExecution = Relay.execute(processedRequest)
 
     const response = pipe(relayExecution.response, (promise) =>
diff --git a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/extension/index.ts b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/extension/index.ts
index 1b18b4039f1..65571747bf0 100644
--- a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/extension/index.ts
+++ b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/extension/index.ts
@@ -105,7 +105,7 @@ export class ExtensionKernelInterceptorService
       "peerverification",
     ]),
     proxy: new Set(["http", "https", "authentication", "certificates"]),
-    advanced: new Set(["localaccess"]),
+    advanced: new Set(["redirects", "localaccess"]),
   } as const
 
   public readonly extensionStatus = computed(() => this._extensionStatus.value)
@@ -273,14 +273,17 @@ export class ExtensionKernelInterceptorService
         }
       }
 
+      // Pass redirect configuration to extension
+      const extensionRequestOptions = {
+        url: request.url,
+        method: request.method,
+        headers: request.headers ?? {},
+        data: requestData,
+        wantsBinary: true,
+        followRedirects: request.options?.followRedirects
+      }
       const extensionResponse =
-        await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
-          url: request.url,
-          method: request.method,
-          headers: request.headers ?? {},
-          data: requestData,
-          wantsBinary: true,
-        })
+        await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(extensionRequestOptions)
 
       const endTime = Date.now()
 
diff --git a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/index.ts b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/index.ts
index 428ce9b933e..f6d7b1770bb 100644
--- a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/index.ts
+++ b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/index.ts
@@ -214,7 +214,9 @@ export class NativeKernelInterceptorService
       const nativeRequest = await relayRequestToNativeAdapter(
         effectiveRequestWithUserAgent
       )
+
       const postProcessedRequest = postProcessRelayRequest(nativeRequest)
+
       const relayExecution = Relay.execute(postProcessedRequest)
 
       setRelayExecution(relayExecution)
diff --git a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/store.ts b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/store.ts
index c8294386bb3..915bdc664b7 100644
--- a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/store.ts
+++ b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/native/store.ts
@@ -140,13 +140,44 @@ export class KernelInterceptorNativeStore extends Service {
   ): RelayRequest {
     const host = new URL(request.url).host
     const settings = this.getMergedSettings(host)
+
+    this.bypassProxyForDomains(host, settings.proxy?.no_proxy, settings)
     const effective = convertDomainSetting(settings)
 
     if (E.isLeft(effective)) {
       throw effective.left
     }
 
-    return { ...request, ...effective.right }
+    // CRITICAL FIX: Preserve the original request options (including followRedirects)
+    return {
+      ...request,
+      ...effective.right,
+      // Ensure options are preserved from the original request
+      options: (request as any).options,
+    }
+  }
+
+  private bypassProxyForDomains(
+    host: string,
+    domainsString: string | null | undefined,
+    settings: InputDomainSetting
+  ): void {
+    if (!domainsString || !settings.proxy) {
+      return
+    }
+
+    const domainsToBypass: string[] = domainsString.split(",").map((domain) =>
+      domain.trim()
+    )
+
+    const shouldBypass = domainsToBypass.some((domain) =>
+      host.toLowerCase().endsWith(domain.toLowerCase())
+    )
+
+    if (shouldBypass && settings.proxy) {
+      // Set url to empty string to disable proxy for this domain
+      settings.proxy.url = ""
+    }
   }
 
   public getDomainSettings(domain: string): InputDomainSetting {
diff --git a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/proxy/index.ts b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/proxy/index.ts
index 62d1ac20a6d..6f7be9a94fd 100644
--- a/packages/hoppscotch-common/src/platform/std/kernel-interceptors/proxy/index.ts
+++ b/packages/hoppscotch-common/src/platform/std/kernel-interceptors/proxy/index.ts
@@ -33,6 +33,7 @@ type ProxyRequest = {
   data: string
   wantsBinary: boolean
   accessToken: string
+  followRedirects?: boolean
   auth?: {
     username: string
     password: string
@@ -74,7 +75,7 @@ export class ProxyKernelInterceptorService
     auth: new Set(["basic"]),
     security: new Set([]),
     proxy: new Set([]),
-    advanced: new Set([]),
+    advanced: new Set(["redirects"]),
   } as const
   public readonly settingsEntry = markRaw({
     title: (t: ReturnType<typeof getI18n>) =>
@@ -85,7 +86,7 @@ export class ProxyKernelInterceptorService
   private constructProxyRequest(
     request: RelayRequest,
     accessToken: string
-  ): ProxyRequest {
+  ): ProxyRequest & { followRedirects?: boolean } {
     // NOTE: This should be conditional but for now setting it to true for backwards compat,
     // see std/interceptor/proxy.ts for more info.
     const wantsBinary = true
@@ -139,7 +140,7 @@ export class ProxyKernelInterceptorService
       }
     }
 
-    return {
+    const proxyRequest = {
       accessToken,
       wantsBinary,
       url: request.url,
@@ -147,6 +148,7 @@ export class ProxyKernelInterceptorService
       headers: request.headers,
       params: request.params,
       data: requestData,
+      followRedirects: request.options?.followRedirects,
       auth:
         request.auth?.kind === "basic"
           ? {
@@ -155,6 +157,8 @@ export class ProxyKernelInterceptorService
             }
           : undefined,
     }
+
+    return proxyRequest
   }
 
   public execute(
diff --git a/packages/hoppscotch-common/src/services/kernel-interceptor.service.ts b/packages/hoppscotch-common/src/services/kernel-interceptor.service.ts
index 4da8a7babc6..aaeb3a96141 100644
--- a/packages/hoppscotch-common/src/services/kernel-interceptor.service.ts
+++ b/packages/hoppscotch-common/src/services/kernel-interceptor.service.ts
@@ -155,7 +155,9 @@ export class KernelInterceptorService extends Service {
 
   public execute(req: RelayRequest): ExecutionResult {
     const interceptor = this.validateAndGetActiveInterceptor()
-    return interceptor.execute(req)
+    const result = interceptor.execute(req)
+
+    return result
   }
 
   private validateAndGetActiveInterceptor(): KernelInterceptor {
diff --git a/packages/hoppscotch-common/src/services/spotlight/searchers/request.searcher.ts b/packages/hoppscotch-common/src/services/spotlight/searchers/request.searcher.ts
index e066cff3a93..09882c332b9 100644
--- a/packages/hoppscotch-common/src/services/spotlight/searchers/request.searcher.ts
+++ b/packages/hoppscotch-common/src/services/spotlight/searchers/request.searcher.ts
@@ -103,7 +103,7 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       text: this.t("shortcut.request.share_request"),
       alternates: ["share", "request", "copy"],
       icon: markRaw(IconShare2),
-      excludeFromSearch: computed(() => !this.isRESTPage.value),
+      excludeFromSearch: true,
     },
     reset_request: {
       text: this.t("shortcut.request.reset_request"),
diff --git a/packages/hoppscotch-common/src/types/post-request.d.ts b/packages/hoppscotch-common/src/types/post-request.d.ts
index f1bc84cd785..fe512bbff1b 100644
--- a/packages/hoppscotch-common/src/types/post-request.d.ts
+++ b/packages/hoppscotch-common/src/types/post-request.d.ts
@@ -32,4 +32,8 @@ interface ExpectationMethods {
   toBeType(type: string): void
   toHaveLength(length: number): void
   toInclude(value: any): void
+  toBeGreaterThan(value: number): void
+  toBeLessThan(value: number): void
+  toBeGreaterThanOrEqual(value: number): void
+  toBeLessThanOrEqual(value: number): void
 }
diff --git a/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs b/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
index 73604247a73..419619bbde4 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
+++ b/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
@@ -327,6 +327,7 @@ pub struct Request {
     pub auth: Option<AuthType>,
     pub security: Option<SecurityConfig>,
     pub proxy: Option<ProxyConfig>,
+    pub follow_redirects: Option<bool>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
diff --git a/packages/hoppscotch-desktop/plugin-workspace/relay/src/request.rs b/packages/hoppscotch-desktop/plugin-workspace/relay/src/request.rs
index e0345fab3a5..50afaf91f96 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/relay/src/request.rs
+++ b/packages/hoppscotch-desktop/plugin-workspace/relay/src/request.rs
@@ -49,49 +49,31 @@ impl<'a> CurlRequest<'a> {
             }
         })?;
 
-        /* NOTE: Once auth handling is correctly migrated over, this is how query param should be handled
-        if let Some(AuthType::ApiKey { key, value, location }) = &self.request.auth {
-            if let ApiKeyLocation::Query = location {
-                tracing::debug!(key = %key, "Adding API key to query parameters");
-
-                let mut url = url::Url::parse(&self.request.url).map_err(|e| {
-                    tracing::error!(error = %e, "Failed to parse URL for API key addition");
-                    RelayError::Parse {
-                        message: "Failed to parse URL for API key addition".into(),
-                        cause: Some(e.to_string()),
-                    }
-                })?;
-
-                url.query_pairs_mut().append_pair(key, value);
-                let updated_url = url.to_string();
-                tracing::debug!(url = %updated_url, "Updated URL with API key in query parameters");
-
-                self.handle.url(&updated_url).map_err(|e| {
-                    tracing::error!(error = %e, "Failed to set URL with API key");
-                    RelayError::Network {
-                        message: "Failed to set URL with API key".into(),
-                        cause: Some(e.to_string()),
-                    }
-                })?;
-            } else {
-                self.handle.url(&self.request.url).map_err(|e| {
-                    tracing::error!(error = %e, "Failed to set URL");
-                    RelayError::Network {
-                        message: "Failed to set URL".into(),
-                        cause: Some(e.to_string()),
-                    }
-                })?;
+        // Configure redirect handling
+        let follow_redirects = self.request.follow_redirects.unwrap_or(false);
+
+        self.handle.follow_location(follow_redirects).map_err(|e| {
+            tracing::error!(
+                error = %e,
+                follow_redirects = follow_redirects,
+                "Failed to configure redirect handling"
+            );
+            RelayError::Network {
+                message: format!("Failed to configure redirect handling: follow_redirects={}", follow_redirects),
+                cause: Some(e.to_string()),
             }
-        } else {
-            self.handle.url(&self.request.url).map_err(|e| {
-                tracing::error!(error = %e, "Failed to set URL");
+        })?;
+
+        if follow_redirects {
+            // Set maximum redirects to prevent infinite loops
+            self.handle.max_redirections(10).map_err(|e| {
+                tracing::error!(error = %e, "Failed to set max redirections");
                 RelayError::Network {
-                    message: "Failed to set URL".into(),
+                    message: "Failed to set max redirections".into(),
                     cause: Some(e.to_string()),
                 }
             })?;
         }
-        */
 
         self.handle
             .http_version(self.request.version.to_curl_version())
diff --git a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.toml b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.toml
index 8411c6128d9..917bb9bbffb 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.toml
+++ b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.toml
@@ -13,7 +13,7 @@ tauri = { version = "2.1.0" }
 serde = "1.0"
 thiserror = "2"
 tracing = "0.1.41"
-relay = { git = "https://github.com/CuriousCorrelation/relay.git" }
+relay = { path = "../relay" }
 
 [build-dependencies]
 tauri-plugin = { version = "2.0.2", features = ["build"] }
diff --git a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts
index 536ac1daa51..90ea93bb454 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts
+++ b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts
@@ -149,11 +149,13 @@ export interface Request {
     };
     proxy?: {
         url: string;
+        no_proxy: string;
         auth?: {
             username: string;
             password: string;
         };
     };
+    follow_redirects?: boolean;
 }
 export interface Response {
     id: number;
diff --git a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts.map b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts.map
index 18a5d7781da..c97ff9e7685 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts.map
+++ b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/dist-js/index.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["guest-js/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["guest-js/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/guest-js/index.ts b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/guest-js/index.ts
index cc86a69dc59..28f6280e7ba 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/guest-js/index.ts
+++ b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/guest-js/index.ts
@@ -208,11 +208,14 @@ export interface Request {
 
   proxy?: {
     url: string
+    no_proxy: string
     auth?: {
       username: string
       password: string
     }
   }
+
+  follow_redirects?: boolean
 }
 
 export interface Response {
diff --git a/packages/hoppscotch-desktop/src-tauri/Cargo.lock b/packages/hoppscotch-desktop/src-tauri/Cargo.lock
index 26b7f120520..492c1d80ddc 100644
--- a/packages/hoppscotch-desktop/src-tauri/Cargo.lock
+++ b/packages/hoppscotch-desktop/src-tauri/Cargo.lock
@@ -4413,7 +4413,6 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relay"
 version = "0.1.1"
-source = "git+https://github.com/CuriousCorrelation/relay.git#10aca0e5d74515a6fed231ee9d7220a014f8b184"
 dependencies = [
  "bytes",
  "curl",
@@ -5448,7 +5447,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-appload"
 version = "0.1.0"
-source = "git+https://github.com/CuriousCorrelation/tauri-plugin-appload?rev=e05861959938b57479a1a81fa796735ebbd08c7c#e05861959938b57479a1a81fa796735ebbd08c7c"
+source = "git+https://github.com/CuriousCorrelation/tauri-plugin-appload#e05861959938b57479a1a81fa796735ebbd08c7c"
 dependencies = [
  "base64 0.22.1",
  "blake3",
@@ -5603,7 +5602,6 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-relay"
 version = "0.1.0"
-source = "git+https://github.com/CuriousCorrelation/tauri-plugin-relay?rev=ff18f776ddeb53dbbdeaf97e1fabc30bdc57c158#ff18f776ddeb53dbbdeaf97e1fabc30bdc57c158"
 dependencies = [
  "relay",
  "serde",
diff --git a/packages/hoppscotch-desktop/src-tauri/Cargo.toml b/packages/hoppscotch-desktop/src-tauri/Cargo.toml
index 894a2625109..0180f0fe0e1 100644
--- a/packages/hoppscotch-desktop/src-tauri/Cargo.toml
+++ b/packages/hoppscotch-desktop/src-tauri/Cargo.toml
@@ -29,8 +29,8 @@ tauri-plugin-store = "2.2.0"
 tauri-plugin-dialog = "2.2.0"
 tauri-plugin-fs = "2.2.0"
 tauri-plugin-deep-link = "2.2.0"
-tauri-plugin-appload = { git = "https://github.com/CuriousCorrelation/tauri-plugin-appload", rev = "e05861959938b57479a1a81fa796735ebbd08c7c" }
-tauri-plugin-relay = { git = "https://github.com/CuriousCorrelation/tauri-plugin-relay", rev = "ff18f776ddeb53dbbdeaf97e1fabc30bdc57c158" }
+tauri-plugin-appload = { git = "https://github.com/CuriousCorrelation/tauri-plugin-appload" }
+tauri-plugin-relay = { path = "../plugin-workspace/tauri-plugin-relay" }
 axum = "0.8.1"
 tower-http = { version = "0.6.2", features = ["cors"] }
 random-port = "0.1.1"
diff --git a/packages/hoppscotch-desktop/src-tauri/src/lib.rs b/packages/hoppscotch-desktop/src-tauri/src/lib.rs
index f5e68221af1..9e47374cedc 100644
--- a/packages/hoppscotch-desktop/src-tauri/src/lib.rs
+++ b/packages/hoppscotch-desktop/src-tauri/src/lib.rs
@@ -5,7 +5,6 @@ pub mod error;
 pub mod logger;
 pub mod path;
 pub mod server;
-pub mod updater;
 pub mod util;
 pub mod webview;
 
@@ -198,7 +197,6 @@ pub fn run() {
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_opener::init())
-        .plugin(tauri_plugin_updater::Builder::new().build())
         .plugin(tauri_plugin_store::Builder::new().build())
         .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_dialog::init())
@@ -211,7 +209,6 @@ pub fn run() {
             hopp_auth_port,
             quit_app,
             backup::check_and_backup_on_version_change,
-            updater::check_for_updates,
             path::get_config_dir,
             path::get_latest_dir,
             path::get_instance_dir,
diff --git a/packages/hoppscotch-desktop/src-tauri/tauri.conf.json b/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
index c7893fb8288..2a2405ad179 100644
--- a/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
+++ b/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
@@ -35,7 +35,7 @@
   "bundle": {
     "active": true,
     "targets": "all",
-    "createUpdaterArtifacts": true,
+    "createUpdaterArtifacts": false,
     "icon": [
       "icons/32x32.png",
       "icons/128x128.png",
@@ -51,7 +51,7 @@
       }
     },
     "updater": {
-      "active": true,
+      "active": false,
       "endpoints": [
         "https://releases.hoppscotch.com/hoppscotch-selfhost-desktop.json"
       ],
diff --git a/packages/hoppscotch-desktop/src/utils/updater.ts b/packages/hoppscotch-desktop/src/utils/updater.ts
index c98276d3154..ef12f50e0f1 100644
--- a/packages/hoppscotch-desktop/src/utils/updater.ts
+++ b/packages/hoppscotch-desktop/src/utils/updater.ts
@@ -4,6 +4,10 @@ import { type LazyStore } from "@tauri-apps/plugin-store"
 import { UpdateStatus, CheckResult, UpdateState } from "~/types"
 
 export class UpdaterService {
+  // Add a flag to completely disable updater functionality.
+  // Set to true to suppress any auto update behavior.
+  private static readonly UPDATES_DISABLED = true
+
   private currentProgress: { downloaded: number; total?: number } = {
     downloaded: 0,
   }
@@ -21,6 +25,14 @@ export class UpdaterService {
   }
 
   async checkForUpdates(timeout = 5000): Promise<CheckResult> {
+    if (UpdaterService.UPDATES_DISABLED) {
+      await this.saveUpdateState({
+        status: UpdateStatus.NOT_AVAILABLE,
+        message: "Updater disabled",
+      })
+      return CheckResult.NOT_AVAILABLE
+    }
+
     try {
       await this.saveUpdateState({
         status: UpdateStatus.CHECKING,
@@ -89,6 +101,14 @@ export class UpdaterService {
   }
 
   async downloadAndInstall(): Promise<void> {
+    if (UpdaterService.UPDATES_DISABLED) {
+      await this.saveUpdateState({
+        status: UpdateStatus.ERROR,
+        message: "Updater disabled",
+      })
+      throw new Error("Updater disabled")
+    }
+
     try {
       const updateResult = await check()
 
diff --git a/packages/hoppscotch-js-sandbox/src/bootstrap-code/post-request.js b/packages/hoppscotch-js-sandbox/src/bootstrap-code/post-request.js
index a996d5d6daf..0dae3b0565e 100644
--- a/packages/hoppscotch-js-sandbox/src/bootstrap-code/post-request.js
+++ b/packages/hoppscotch-js-sandbox/src/bootstrap-code/post-request.js
@@ -22,6 +22,14 @@
         toHaveLength: (expectedLength) =>
           inputs.expectToHaveLength(expectVal, expectedLength),
         toInclude: (needle) => inputs.expectToInclude(expectVal, needle),
+        toBeGreaterThan: (expected) =>
+          inputs.expectToBeGreaterThan(expectVal, expected),
+        toBeLessThan: (expected) =>
+          inputs.expectToBeLessThan(expectVal, expected),
+        toBeGreaterThanOrEqual: (expected) =>
+          inputs.expectToBeGreaterThanOrEqual(expectVal, expected),
+        toBeLessThanOrEqual: (expected) =>
+          inputs.expectToBeLessThanOrEqual(expectVal, expected),
       }
 
       Object.defineProperty(expectation, "not", {
@@ -36,6 +44,14 @@
           toHaveLength: (expectedLength) =>
             inputs.expectNotToHaveLength(expectVal, expectedLength),
           toInclude: (needle) => inputs.expectNotToInclude(expectVal, needle),
+          toBeGreaterThan: (expected) =>
+            inputs.expectNotToBeGreaterThan(expectVal, expected),
+          toBeLessThan: (expected) =>
+            inputs.expectNotToBeLessThan(expectVal, expected),
+          toBeGreaterThanOrEqual: (expected) =>
+            inputs.expectNotToBeGreaterThanOrEqual(expectVal, expected),
+          toBeLessThanOrEqual: (expected) =>
+            inputs.expectNotToBeLessThanOrEqual(expectVal, expected),
         }),
       })
 
diff --git a/packages/hoppscotch-js-sandbox/src/cage-modules/pw.ts b/packages/hoppscotch-js-sandbox/src/cage-modules/pw.ts
index 46a8125b675..a3db5e532d7 100644
--- a/packages/hoppscotch-js-sandbox/src/cage-modules/pw.ts
+++ b/packages/hoppscotch-js-sandbox/src/cage-modules/pw.ts
@@ -120,6 +120,43 @@ const createPwInputsObj = (
           needle
         )
       ),
+      // New numeric comparison matchers
+      expectToBeGreaterThan: defineSandboxFn(
+        ctx,
+        "toBeGreaterThan",
+        (expectVal, expected) =>
+          createExpectation(expectVal, false, postConfig.testRunStack).toBeGreaterThan(
+            expected
+          )
+      ),
+      expectToBeLessThan: defineSandboxFn(
+        ctx,
+        "toBeLessThan",
+        (expectVal, expected) =>
+          createExpectation(expectVal, false, postConfig.testRunStack).toBeLessThan(
+            expected
+          )
+      ),
+      expectToBeGreaterThanOrEqual: defineSandboxFn(
+        ctx,
+        "toBeGreaterThanOrEqual",
+        (expectVal, expected) =>
+          createExpectation(
+            expectVal,
+            false,
+            postConfig.testRunStack
+          ).toBeGreaterThanOrEqual(expected)
+      ),
+      expectToBeLessThanOrEqual: defineSandboxFn(
+        ctx,
+        "toBeLessThanOrEqual",
+        (expectVal, expected) =>
+          createExpectation(
+            expectVal,
+            false,
+            postConfig.testRunStack
+          ).toBeLessThanOrEqual(expected)
+      ),
       expectNotToBe: defineSandboxFn(ctx, "notToBe", (expectVal, expectedVal) =>
         createExpectation(expectVal, false, postConfig.testRunStack).not.toBe(
           expectedVal
@@ -203,6 +240,45 @@ const createPwInputsObj = (
             postConfig.testRunStack
           ).not.toInclude(needle)
       ),
+      // Negated numeric comparison matchers
+      expectNotToBeGreaterThan: defineSandboxFn(
+        ctx,
+        "notToBeGreaterThan",
+        (expectVal, expected) =>
+          createExpectation(
+            expectVal,
+            false,
+            postConfig.testRunStack
+          ).not.toBeGreaterThan(expected)
+      ),
+      expectNotToBeLessThan: defineSandboxFn(
+        ctx,
+        "notToBeLessThan",
+        (expectVal, expected) =>
+          createExpectation(expectVal, false, postConfig.testRunStack).not.toBeLessThan(
+            expected
+          )
+      ),
+      expectNotToBeGreaterThanOrEqual: defineSandboxFn(
+        ctx,
+        "notToBeGreaterThanOrEqual",
+        (expectVal, expected) =>
+          createExpectation(
+            expectVal,
+            false,
+            postConfig.testRunStack
+          ).not.toBeGreaterThanOrEqual(expected)
+      ),
+      expectNotToBeLessThanOrEqual: defineSandboxFn(
+        ctx,
+        "notToBeLessThanOrEqual",
+        (expectVal, expected) =>
+          createExpectation(
+            expectVal,
+            false,
+            postConfig.testRunStack
+          ).not.toBeLessThanOrEqual(expected)
+      ),
       preTest: defineSandboxFn(ctx, "preTest", (descriptor: any) => {
         postConfig.testRunStack.push({
           descriptor,
diff --git a/packages/hoppscotch-js-sandbox/src/node/test-runner/legacy.ts b/packages/hoppscotch-js-sandbox/src/node/test-runner/legacy.ts
index 279e85a26db..e8c87a5107a 100644
--- a/packages/hoppscotch-js-sandbox/src/node/test-runner/legacy.ts
+++ b/packages/hoppscotch-js-sandbox/src/node/test-runner/legacy.ts
@@ -22,8 +22,14 @@ const executeScriptInContext = (
   context: ivmT.Context
 ): Promise<TestResult> => {
   return new Promise((resolve, reject) => {
+    const headersArray = Array.isArray(response.headers)
+      ? response.headers
+      : Object.entries(response.headers).map(([key, value]) => ({
+        key,
+        value: String(value),
+      }))
     // Parse response object
-    const responseObjHandle = preventCyclicObjects<TestResponse>(response)
+    const responseObjHandle = preventCyclicObjects<TestResponse>({ ...response, headers: headersArray })
     if (E.isLeft(responseObjHandle)) {
       return reject(`Response parsing failed: ${responseObjHandle.left}`)
     }
@@ -108,6 +114,10 @@ const executeScriptInContext = (
                 "toBeType",
                 "toHaveLength",
                 "toInclude",
+                "toBeGreaterThan",
+                "toBeLessThan",
+                "toBeGreaterThanOrEqual",
+                "toBeLessThanOrEqual"
               ]
               matcherMethodNames.forEach((methodName) => {
                 matcherMethods[methodName] = expectFnResult.getSync(methodName)
diff --git a/packages/hoppscotch-js-sandbox/src/shared-utils.ts b/packages/hoppscotch-js-sandbox/src/shared-utils.ts
index 802b6bfb6c1..973f63df742 100644
--- a/packages/hoppscotch-js-sandbox/src/shared-utils.ts
+++ b/packages/hoppscotch-js-sandbox/src/shared-utils.ts
@@ -83,7 +83,7 @@ const unsetEnv = (
   }
 }
 
-// Compiles shared scripting API methods for use in both pre and post request scripts
+// Shared scripting API methods
 export const getSharedMethods = (envs: TestResult["envs"]) => {
   let updatedEnvs = envs
 
@@ -92,15 +92,13 @@ export const getSharedMethods = (envs: TestResult["envs"]) => {
       throw new Error("Expected key to be a string")
     }
 
-    const result = pipe(
+    return pipe(
       getEnv(key, updatedEnvs),
       O.fold(
         () => undefined,
         (env) => String(env.currentValue)
       )
     )
-
-    return result
   }
 
   const envGetResolveFn = (key: any) => {
@@ -108,25 +106,21 @@ export const getSharedMethods = (envs: TestResult["envs"]) => {
       throw new Error("Expected key to be a string")
     }
 
-    const result = pipe(
+    return pipe(
       getEnv(key, updatedEnvs),
       E.fromOption(() => "INVALID_KEY" as const),
-
       E.map((e) =>
         pipe(
           parseTemplateStringE(e.currentValue, [
             ...updatedEnvs.selected,
             ...updatedEnvs.global,
-          ]), // If the recursive resolution failed, return the unresolved value
+          ]),
           E.getOrElse(() => e.currentValue)
         )
       ),
       E.map((x) => String(x)),
-
       E.getOrElseW(() => undefined)
     )
-
-    return result
   }
 
   const envSetFn = (key: any, value: any) => {
@@ -139,7 +133,6 @@ export const getSharedMethods = (envs: TestResult["envs"]) => {
     }
 
     updatedEnvs = setEnv(key, value, updatedEnvs)
-
     return undefined
   }
 
@@ -149,7 +142,6 @@ export const getSharedMethods = (envs: TestResult["envs"]) => {
     }
 
     updatedEnvs = unsetEnv(key, updatedEnvs)
-
     return undefined
   }
 
@@ -158,15 +150,15 @@ export const getSharedMethods = (envs: TestResult["envs"]) => {
       throw new Error("Expected value to be a string")
     }
 
-    const result = pipe(
-      parseTemplateStringE(value, [
-        ...updatedEnvs.selected,
-        ...updatedEnvs.global,
-      ]),
-      E.getOrElse(() => value)
+    return String(
+      pipe(
+        parseTemplateStringE(value, [
+          ...updatedEnvs.selected,
+          ...updatedEnvs.global,
+        ]),
+        E.getOrElse(() => value)
+      )
     )
-
-    return String(result)
   }
 
   return {
@@ -184,29 +176,18 @@ export const getSharedMethods = (envs: TestResult["envs"]) => {
 }
 
 const getResolvedExpectValue = (expectVal: any) => {
-  if (typeof expectVal !== "string") {
-    return expectVal
-  }
+  if (typeof expectVal !== "string") return expectVal
 
   try {
     const parsedExpectVal = JSON.parse(expectVal)
-
-    // Supplying non-primitive values is not permitted in the `isStringifiedWithinIsolate` property indicates that the object was stringified before executing the script from the isolate context
-    // This is done to ensure a JSON string supplied as the "expectVal" is not parsed and preserved as is
     if (typeof parsedExpectVal === "object") {
-      if (parsedExpectVal.isStringifiedWithinIsolate !== true) {
-        return expectVal
-      }
+      if (parsedExpectVal.isStringifiedWithinIsolate !== true) return expectVal
 
-      // For an array, the contents are stored in the `arr` property
-      if (Array.isArray(parsedExpectVal.arr)) {
-        return parsedExpectVal.arr
-      }
+      if (Array.isArray(parsedExpectVal.arr)) return parsedExpectVal.arr
 
       delete parsedExpectVal.isStringifiedWithinIsolate
       return parsedExpectVal
     }
-
     return expectVal
   } catch (_) {
     return expectVal
@@ -216,89 +197,53 @@ const getResolvedExpectValue = (expectVal: any) => {
 export function preventCyclicObjects<T extends object = Record<string, any>>(
   obj: T
 ): E.Left<string> | E.Right<T> {
-  let jsonString
-
-  try {
-    jsonString = JSON.stringify(obj)
-  } catch (_) {
-    return E.left("Stringification failed")
-  }
-
   try {
+    const jsonString = JSON.stringify(obj)
     const parsedJson = JSON.parse(jsonString)
     return E.right(parsedJson)
   } catch (_) {
-    return E.left("Parsing failed")
+    return E.left("Stringification failed")
   }
 }
 
-/**
- * Creates an Expectation object for use inside the sandbox
- * @param expectVal The expecting value of the expectation
- * @param negated Whether the expectation is negated (negative)
- * @param currTestStack The current state of the test execution stack
- * @returns Object with the expectation methods
- */
+// Expectation implementation
 export const createExpectation = (
   expectVal: any,
   negated: boolean,
   currTestStack: TestDescriptor[]
 ): Expectation => {
-  // Non-primitive values supplied are stringified in the isolate context
   const resolvedExpectVal = getResolvedExpectValue(expectVal)
 
-  const toBeFn = (expectedVal: any) => {
-    let assertion = resolvedExpectVal === expectedVal
-
-    if (negated) {
-      assertion = !assertion
-    }
-
-    const status = assertion ? "pass" : "fail"
-    const message = `Expected '${resolvedExpectVal}' to${
-      negated ? " not" : ""
-    } be '${expectedVal}'`
+  const pushResult = (status: "pass" | "fail" | "error", message: string) => {
+    currTestStack[currTestStack.length - 1].expectResults.push({ status, message })
+  }
 
-    currTestStack[currTestStack.length - 1].expectResults.push({
-      status,
-      message,
-    })
+  const baseAssert = (assertion: boolean, message: string) => {
+    if (negated) assertion = !assertion
+    pushResult(assertion ? "pass" : "fail", message)
+  }
 
+  const toBeFn = (expectedVal: any) => {
+    baseAssert(
+      resolvedExpectVal === expectedVal,
+      `Expected '${resolvedExpectVal}' to${negated ? " not" : ""} be '${expectedVal}'`
+    )
     return undefined
   }
 
-  const toBeLevelXxx = (
-    level: string,
-    rangeStart: number,
-    rangeEnd: number
-  ) => {
+  const toBeLevelXxx = (level: string, rangeStart: number, rangeEnd: number) => {
     const parsedExpectVal = parseInt(resolvedExpectVal)
-
     if (!Number.isNaN(parsedExpectVal)) {
-      let assertion =
-        parsedExpectVal >= rangeStart && parsedExpectVal <= rangeEnd
-
-      if (negated) {
-        assertion = !assertion
-      }
-
-      const status = assertion ? "pass" : "fail"
-      const message = `Expected '${parsedExpectVal}' to${
-        negated ? " not" : ""
-      } be ${level}-level status`
-
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status,
-        message,
-      })
+      baseAssert(
+        parsedExpectVal >= rangeStart && parsedExpectVal <= rangeEnd,
+        `Expected '${parsedExpectVal}' to${negated ? " not" : ""} be ${level}-level status`
+      )
     } else {
-      const message = `Expected ${level}-level status but could not parse value '${resolvedExpectVal}'`
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
+      pushResult(
+        "error",
+        `Expected ${level}-level status but could not parse value '${resolvedExpectVal}'`
+      )
     }
-
     return undefined
   }
 
@@ -308,139 +253,140 @@ export const createExpectation = (
   const toBeLevel5xxFn = () => toBeLevelXxx("500", 500, 599)
 
   const toBeTypeFn = (expectedType: any) => {
-    if (
-      [
-        "string",
-        "boolean",
-        "number",
-        "object",
-        "undefined",
-        "bigint",
-        "symbol",
-        "function",
-      ].includes(expectedType)
-    ) {
-      let assertion = typeof resolvedExpectVal === expectedType
-
-      if (negated) {
-        assertion = !assertion
-      }
-
-      const status = assertion ? "pass" : "fail"
-      const message = `Expected '${resolvedExpectVal}' to${
-        negated ? " not" : ""
-      } be type '${expectedType}'`
-
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status,
-        message,
-      })
-    } else {
-      const message =
+    const allowed = [
+      "string",
+      "boolean",
+      "number",
+      "object",
+      "undefined",
+      "bigint",
+      "symbol",
+      "function",
+    ]
+    if (!allowed.includes(expectedType)) {
+      pushResult(
+        "error",
         'Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"'
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
+      )
+      return undefined
     }
-
+    baseAssert(
+      typeof resolvedExpectVal === expectedType,
+      `Expected '${resolvedExpectVal}' to${negated ? " not" : ""} be type '${expectedType}'`
+    )
     return undefined
   }
 
   const toHaveLengthFn = (expectedLength: any) => {
-    if (
-      !(
-        Array.isArray(resolvedExpectVal) ||
-        typeof resolvedExpectVal === "string"
-      )
-    ) {
-      const message =
-        "Expected toHaveLength to be called for an array or string"
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
-
+    if (!(Array.isArray(resolvedExpectVal) || typeof resolvedExpectVal === "string")) {
+      pushResult("error", "Expected toHaveLength to be called for an array or string")
       return undefined
     }
-
-    if (typeof expectedLength === "number" && !Number.isNaN(expectedLength)) {
-      let assertion = resolvedExpectVal.length === expectedLength
-
-      if (negated) {
-        assertion = !assertion
-      }
-
-      const status = assertion ? "pass" : "fail"
-      const message = `Expected the array to${
-        negated ? " not" : ""
-      } be of length '${expectedLength}'`
-
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status,
-        message,
-      })
-    } else {
-      const message = "Argument for toHaveLength should be a number"
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
+    if (!(typeof expectedLength === "number" && !Number.isNaN(expectedLength))) {
+      pushResult("error", "Argument for toHaveLength should be a number")
+      return undefined
     }
-
+    baseAssert(
+      (resolvedExpectVal as any).length === expectedLength,
+      `Expected the array to${negated ? " not" : ""} be of length '${expectedLength}'`
+    )
     return undefined
   }
 
   const toIncludeFn = (needle: any) => {
-    if (
-      !(
-        Array.isArray(resolvedExpectVal) ||
-        typeof resolvedExpectVal === "string"
-      )
-    ) {
-      const message = "Expected toInclude to be called for an array or string"
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
+    if (!(Array.isArray(resolvedExpectVal) || typeof resolvedExpectVal === "string")) {
+      pushResult("error", "Expected toInclude to be called for an array or string")
       return undefined
     }
-
     if (needle === null) {
-      const message = "Argument for toInclude should not be null"
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
+      pushResult("error", "Argument for toInclude should not be null")
       return undefined
     }
-
     if (needle === undefined) {
-      const message = "Argument for toInclude should not be undefined"
-      currTestStack[currTestStack.length - 1].expectResults.push({
-        status: "error",
-        message,
-      })
+      pushResult("error", "Argument for toInclude should not be undefined")
       return undefined
     }
+    const expectValPretty = JSON.stringify(resolvedExpectVal)
+    const needlePretty = JSON.stringify(needle)
+    baseAssert(
+      (resolvedExpectVal as any).includes(needle),
+      `Expected ${expectValPretty} to${negated ? " not" : ""} include ${needlePretty}`
+    )
+    return undefined
+  }
 
-    let assertion = resolvedExpectVal.includes(needle)
+  // Numeric comparisons
+  const getNumeric = (val: any) => {
+    if (typeof val === "number") return val
+    if (typeof val === "string" && val.trim() !== "") {
+      const n = Number(val)
+      if (!Number.isNaN(n)) return n
+    }
+    return undefined
+  }
 
-    if (negated) {
-      assertion = !assertion
+  const comparison = (
+    comparator: "gt" | "lt" | "gte" | "lte",
+    expected: any
+  ) => {
+    const actualNum = getNumeric(resolvedExpectVal)
+    if (actualNum === undefined) {
+      pushResult(
+        "error",
+        `Expected numeric comparison but could not parse value '${resolvedExpectVal}'`
+      )
+      return
+    }
+    if (typeof expected !== "number" || Number.isNaN(expected)) {
+      const map: Record<string, string> = {
+        gt: "Argument for toBeGreaterThan should be a number",
+        lt: "Argument for toBeLessThan should be a number",
+        gte: "Argument for toBeGreaterThanOrEqual should be a number",
+        lte: "Argument for toBeLessThanOrEqual should be a number",
+      }
+      pushResult("error", map[comparator])
+      return
+    }
+    let ok = false
+    let verb = ""
+    switch (comparator) {
+      case "gt":
+        ok = actualNum > expected
+        verb = "greater than"
+        break
+      case "lt":
+        ok = actualNum < expected
+        verb = "less than"
+        break
+      case "gte":
+        ok = actualNum >= expected
+        verb = "greater than or equal to"
+        break
+      case "lte":
+        ok = actualNum <= expected
+        verb = "less than or equal to"
+        break
     }
+    baseAssert(
+      ok,
+      `Expected '${actualNum}' to${negated ? " not" : ""} be ${verb} '${expected}'`
+    )
+  }
 
-    const expectValPretty = JSON.stringify(resolvedExpectVal)
-    const needlePretty = JSON.stringify(needle)
-    const status = assertion ? "pass" : "fail"
-    const message = `Expected ${expectValPretty} to${
-      negated ? " not" : ""
-    } include ${needlePretty}`
-
-    currTestStack[currTestStack.length - 1].expectResults.push({
-      status,
-      message,
-    })
+  const toBeGreaterThanFn = (expected: any) => {
+    comparison("gt", expected)
+    return undefined
+  }
+  const toBeLessThanFn = (expected: any) => {
+    comparison("lt", expected)
+    return undefined
+  }
+  const toBeGreaterThanOrEqualFn = (expected: any) => {
+    comparison("gte", expected)
+    return undefined
+  }
+  const toBeLessThanOrEqualFn = (expected: any) => {
+    comparison("lte", expected)
     return undefined
   }
 
@@ -453,6 +399,10 @@ export const createExpectation = (
     toBeType: toBeTypeFn,
     toHaveLength: toHaveLengthFn,
     toInclude: toIncludeFn,
+    toBeGreaterThan: toBeGreaterThanFn,
+    toBeLessThan: toBeLessThanFn,
+    toBeGreaterThanOrEqual: toBeGreaterThanOrEqualFn,
+    toBeLessThanOrEqual: toBeLessThanOrEqualFn,
   } as Expectation
 
   Object.defineProperties(result, {
@@ -464,35 +414,21 @@ export const createExpectation = (
   return result
 }
 
-/**
- * Compiles methods for use under the `pw` namespace for pre request scripts
- * @param envs The current state of the environment variables
- * @returns Object with methods in the `pw` namespace
- */
+// Pre-request methods (no tests stack returned)
 export const getPreRequestScriptMethods = (envs: TestResult["envs"]) => {
   const { methods, updatedEnvs } = getSharedMethods(cloneDeep(envs))
   return { pw: methods, updatedEnvs }
 }
 
-/**
- * Compiles methods for use under the `pw` namespace for post request scripts
- * @param envs The current state of the environment variables
- * @returns Object with methods in the `pw` namespace and test run stack
- */
+// Post-request/test runner methods
 export const getTestRunnerScriptMethods = (envs: TestResult["envs"]) => {
   const testRunStack: TestDescriptor[] = [
     { descriptor: "root", expectResults: [], children: [] },
   ]
 
   const testFn = (descriptor: string, testFunc: () => void) => {
-    testRunStack.push({
-      descriptor,
-      expectResults: [],
-      children: [],
-    })
-
+    testRunStack.push({ descriptor, expectResults: [], children: [] })
     testFunc()
-
     const child = testRunStack.pop() as TestDescriptor
     testRunStack[testRunStack.length - 1].children.push(child)
   }
@@ -501,12 +437,6 @@ export const getTestRunnerScriptMethods = (envs: TestResult["envs"]) => {
     createExpectation(expectVal, false, testRunStack)
 
   const { methods, updatedEnvs } = getSharedMethods(cloneDeep(envs))
-
-  const pw = {
-    ...methods,
-    expect: expectFn,
-    test: testFn,
-  }
-
+  const pw = { ...methods, expect: expectFn, test: testFn }
   return { pw, testRunStack, updatedEnvs }
 }
diff --git a/packages/hoppscotch-js-sandbox/src/types/index.ts b/packages/hoppscotch-js-sandbox/src/types/index.ts
index c23d685e9ec..dff084d3c0b 100644
--- a/packages/hoppscotch-js-sandbox/src/types/index.ts
+++ b/packages/hoppscotch-js-sandbox/src/types/index.ts
@@ -84,5 +84,9 @@ export interface Expectation {
   toBeType(expectedType: any): void
   toHaveLength(expectedLength: any): void
   toInclude(needle: any): void
+  toBeGreaterThan(expected: any): void
+  toBeLessThan(expected: any): void
+  toBeGreaterThanOrEqual(expected: any): void
+  toBeLessThanOrEqual(expected: any): void
   readonly not: Expectation
 }
diff --git a/packages/hoppscotch-kernel/src/relay/impl/desktop/v/1.ts b/packages/hoppscotch-kernel/src/relay/impl/desktop/v/1.ts
index 029a9c528bd..eb2d21c2aad 100644
--- a/packages/hoppscotch-kernel/src/relay/impl/desktop/v/1.ts
+++ b/packages/hoppscotch-kernel/src/relay/impl/desktop/v/1.ts
@@ -137,23 +137,26 @@ export const implementation: VersionedAPI<RelayV1> = {
             }
 
             const responsePromise = relayRequestToNativeAdapter(request)
-                .then(request => {
-                    // SAFETY: Type assertion is safe because:
-                    // 1. The capabilities system prevents requests with unsupported methods from reaching this point
-                    // 2. Content types not supported by the plugin are filtered by capabilities
-                    // 3. Authentication methods are validated through capabilities
-                    // 4. The plugin's Request type is a subset of our Request type
-                    const pluginRequest = {
-                        id: request.id,
-                        url: request.url,
-                        method: request.method,
-                        version: request.version,
-                        headers: request.headers,
-                        params: request.params,
-                        content: request.content,
-                        auth: request.auth,
-                        security: request.security,
-                        proxy: request.proxy,
+                .then(adaptedRequest => {
+                    // CRITICAL FIX: Create request structure that matches the plugin's Request interface
+                    // The plugin will handle the conversion to Rust RequestWithMetadata format
+                    const pluginRequest: Request = {
+                        id: adaptedRequest.id,
+                        url: adaptedRequest.url,
+                        method: adaptedRequest.method,
+                        version: adaptedRequest.version,
+                        headers: adaptedRequest.headers,
+                        params: adaptedRequest.params,
+                        content: adaptedRequest.content,
+                        auth: adaptedRequest.auth,
+                        security: adaptedRequest.security,
+                        proxy: adaptedRequest.proxy,
+                        // CRITICAL: Add the options property that contains followRedirects
+                        ...(adaptedRequest as any).options && { options: (adaptedRequest as any).options },
+                        // CRITICAL: Also add follow_redirects at top level for Rust compatibility
+                        ...(adaptedRequest as any).options?.followRedirects !== undefined && {
+                            follow_redirects: (adaptedRequest as any).options.followRedirects
+                        },
                     }
 
                     return execute(pluginRequest)
diff --git a/packages/hoppscotch-kernel/src/relay/impl/web/v/1.ts b/packages/hoppscotch-kernel/src/relay/impl/web/v/1.ts
index f7244494659..1a0078399e5 100644
--- a/packages/hoppscotch-kernel/src/relay/impl/web/v/1.ts
+++ b/packages/hoppscotch-kernel/src/relay/impl/web/v/1.ts
@@ -55,7 +55,7 @@ export const implementation: VersionedAPI<RelayV1> = {
       auth: new Set(["basic", "bearer", "apikey", "aws"]),
       security: new Set([]),
       proxy: new Set([]),
-      advanced: new Set([]),
+      advanced: new Set(["redirects"]),
     },
 
     canHandle(request: RelayRequest) {
@@ -128,7 +128,7 @@ export const implementation: VersionedAPI<RelayV1> = {
               headers: request.headers,
               params: request.params,
               data: request.content?.content,
-              maxRedirects: request.meta?.options?.maxRedirects,
+              maxRedirects: request.options?.followRedirects ? 10 : 0,
               timeout: request.meta?.options?.timeout,
               decompress: request.meta?.options?.decompress ?? true,
               validateStatus: null,
@@ -136,76 +136,6 @@ export const implementation: VersionedAPI<RelayV1> = {
               responseType: "arraybuffer",
             }
 
-            // The following code is temporarily commented out because the auth has been pre-processed in EffectiveURL.ts and added in header
-            // and preprocessing here will cause the environment variables not parsed since the auth object only has the raw value
-
-            // if (request.auth) {
-            //   switch (request.auth.kind) {
-            //     case "basic":
-            //       config.auth = {
-            //         username: request.auth.username,
-            //         password: request.auth.password,
-            //       }
-            //       break
-            //     case "bearer":
-            //       config.headers = {
-            //         ...config.headers,
-            //         Authorization: `Bearer ${request.auth.token}`,
-            //       }
-            //       break
-            //     case "apikey":
-            //       if (request.auth.in === "header") {
-            //         config.headers = {
-            //           ...config.headers,
-            //           [request.auth.key]: request.auth.value,
-            //         }
-            //       } else {
-            //         config.params = {
-            //           ...config.params,
-            //           [request.auth.key]: request.auth.value,
-            //         }
-            //       }
-            //       break
-            //     case "aws": {
-            //       const {
-            //         accessKey,
-            //         secretKey,
-            //         region,
-            //         service,
-            //         sessionToken,
-            //         in: location,
-            //       } = request.auth
-            //       const signer = new AwsV4Signer({
-            //         url: request.url,
-            //         method: request.method,
-            //         accessKeyId: accessKey,
-            //         secretAccessKey: secretKey,
-            //         region,
-            //         service,
-            //         sessionToken,
-            //         datetime: new Date()
-            //           .toISOString()
-            //           .replace(/[:-]|\.\d{3}/g, ""),
-            //         signQuery: false,
-            //       })
-            //       const signed = await signer.sign()
-            //       if (location === "query") {
-            //         config.url = signed.url.toString()
-            //       } else {
-            //         const headers: Record<string, string> = {}
-            //         signed.headers.forEach((value, key) => {
-            //           headers[key] = value
-            //         })
-            //         config.headers = {
-            //           ...config.headers,
-            //           ...headers,
-            //         }
-            //       }
-            //       break
-            //     }
-            //   }
-            // }
-
             const axiosResponse = await axios(config)
             const endTime = Date.now()
 
diff --git a/packages/hoppscotch-kernel/src/relay/v/1.ts b/packages/hoppscotch-kernel/src/relay/v/1.ts
index cef85bb82b1..11db4658db6 100644
--- a/packages/hoppscotch-kernel/src/relay/v/1.ts
+++ b/packages/hoppscotch-kernel/src/relay/v/1.ts
@@ -338,6 +338,18 @@ export interface RelayRequest {
     content?: ContentType
     auth?: AuthType
 
+    // Add options at the top level for easier access
+    options?: {
+        timeout?: number
+        followRedirects?: boolean
+        maxRedirects?: number
+        decompress?: boolean
+        cookies?: boolean
+        keepAlive?: boolean
+        tcpNoDelay?: boolean
+        ipVersion?: "v4" | "v6" | "any"
+    }
+
     security?: {
         certificates?: {
             client?: CertificateType
@@ -349,6 +361,7 @@ export interface RelayRequest {
 
     proxy?: {
         url: string
+        no_proxy: string
         auth?: {
             username: string
             password: string
@@ -369,6 +382,7 @@ export interface RelayRequest {
             count: number
             delay: number
         }
+        // Keep the nested options for backward compatibility
         options?: {
             timeout?: number
             followRedirects?: boolean
diff --git a/packages/hoppscotch-relay/src/interop.rs b/packages/hoppscotch-relay/src/interop.rs
index f893dcb2cb8..cbc0a2b579e 100644
--- a/packages/hoppscotch-relay/src/interop.rs
+++ b/packages/hoppscotch-relay/src/interop.rs
@@ -40,6 +40,7 @@ pub struct RequestWithMetadata {
     pub root_cert_bundle_files: Vec<Vec<u8>>,
     pub client_cert: Option<ClientCertDef>,
     pub proxy: Option<ProxyConfig>,
+    pub follow_redirects: bool,
 }
 
 impl RequestWithMetadata {
@@ -53,6 +54,7 @@ impl RequestWithMetadata {
         root_cert_bundle_files: Vec<Vec<u8>>,
         client_cert: Option<ClientCertDef>,
         proxy: Option<ProxyConfig>,
+        follow_redirects: bool,
     ) -> Self {
         Self {
             req_id,
@@ -64,6 +66,7 @@ impl RequestWithMetadata {
             root_cert_bundle_files,
             client_cert,
             proxy,
+            follow_redirects,
         }
     }
 }
diff --git a/packages/hoppscotch-relay/src/relay.rs b/packages/hoppscotch-relay/src/relay.rs
index b1bfdb5a578..93a9bff761e 100644
--- a/packages/hoppscotch-relay/src/relay.rs
+++ b/packages/hoppscotch-relay/src/relay.rs
@@ -18,12 +18,13 @@ pub fn run_request_task(
     cancel_token: CancellationToken,
 ) -> Result<ResponseWithMetadata, RelayError> {
     log::info!(
-        "Starting request task: [Method: {}] [URL: {}] [Validate Certs: {}] [Has Body: {}] [Proxy Enabled: {}]",
+        "Starting request task: [Method: {}] [URL: {}] [Validate Certs: {}] [Has Body: {}] [Proxy Enabled: {}] [Follow Redirects: {}]",
         req.method,
         req.endpoint,
         req.validate_certs,
         req.body.is_some(),
-        req.proxy.is_some()
+        req.proxy.is_some(),
+        req.follow_redirects
     );
 
     let mut curl_handle = Easy::new();
@@ -143,6 +144,54 @@ pub fn run_request_task(
     }
     log::debug!("Proxy configuration applied successfully");
 
+    // Configure redirect handling BEFORE setting up the transfer
+    // This must be done early in the curl configuration
+    log::info!("Configuring redirect behavior: follow_redirects={}", req.follow_redirects);
+
+    match curl_handle.follow_location(req.follow_redirects) {
+        Ok(_) => log::info!(
+            "✓ Redirect handling successfully configured: follow_redirects={}",
+            req.follow_redirects
+        ),
+        Err(err) => {
+            log::error!(
+                "✗ CRITICAL: Failed to configure redirect handling: {}\nRequested setting: {}",
+                err,
+                req.follow_redirects
+            );
+            return Err(RelayError::RequestRunError(format!(
+                "Failed to configure redirect handling: {}",
+                err.description()
+            )));
+        }
+    }
+
+    // Configure additional redirect settings when following redirects
+    if req.follow_redirects {
+        // Set maximum number of redirects to prevent infinite loops
+        match curl_handle.max_redirections(10) {
+            Ok(_) => log::info!("✓ Maximum redirections set to 10"),
+            Err(err) => {
+                log::error!("✗ Failed to set maximum redirections: {}", err);
+                return Err(RelayError::RequestRunError(format!(
+                    "Failed to set maximum redirections: {}",
+                    err.description()
+                )));
+            }
+        }
+
+        // Ensure we follow redirects even for POST requests
+        match curl_handle.post_redirections(true) {
+            Ok(_) => log::info!("✓ POST redirect following enabled"),
+            Err(err) => {
+                log::warn!("⚠ Could not enable POST redirects: {}", err);
+                // Don't fail the request for this, as it's not critical
+            }
+        }
+    } else {
+        log::info!("✓ Redirects disabled - will return redirect responses as-is");
+    }
+
     let mut response_body = Vec::new();
     let mut response_headers = Vec::new();
     let (start_time_ms, end_time_ms) = {
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
index 6ac112e47ab..937c5d8c7b0 100644
--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
@@ -56,3 +56,7 @@ winver = "1"
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
+
+[profile.release.package.wry]
+debug = true
+debug-assertions = true
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json b/packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json
index f8055664d51..80799c80a40 100644
--- a/packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json
+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json
@@ -49,7 +49,8 @@
       "targets": "all"
     },
     "security": {
-      "csp": null
+      "dangerousDisableAssetCspModification":true,
+      "csp":"default-srcblob:data:filesystem:ws:wss:http:https:tauri:'unsafe-eval''unsafe-inline''self'img-src:'self'"
     },
     "updater": {
       "active": false
diff --git a/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue b/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue
index 0b2cc69ad5e..3f81dbaf77e 100644
--- a/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue
+++ b/packages/hoppscotch-selfhost-desktop/src/components/settings/NativeInterceptor.vue
@@ -47,6 +47,15 @@
         :label="'Proxy URL'"
         input-styles="input floating-input"
       />
+      <HoppSmartInput
+        v-if="allowProxy"
+        v-model="noProxy"
+        :autofocus="false"
+        styles="flex-1"
+        placeholder=" "
+        :label="'Proxy Bypass (Enter comma separated values to bypass proxy settings. Example: localhost, .example.com)'"
+        input-styles="input floating-input"
+      />
 
       <p class="my-1 text-secondaryLight">
         Hoppscotch native interceptor supports HTTP/HTTPS/SOCKS proxies along with NTLM and Basic Auth in those proxies. Include the username and password for the proxy authentication in the URL itself.
@@ -75,12 +84,18 @@ const showClientCertificatesModal = ref(false)
 
 const allowProxy = ref(false)
 const proxyURL = ref("")
+const noProxy = ref("")
+
+const noProxyArray = computed(() => {
+  return noProxy.value.split(",").map(item => item.trim())
+})
 
 const proxyInfo = computed<RequestProxyInfo>({
   get() {
     if (allowProxy.value) {
       return {
         url: proxyURL.value,
+        no_proxy: noProxyArray.value,
       }
     }
 
@@ -90,6 +105,7 @@ const proxyInfo = computed<RequestProxyInfo>({
     if (newData) {
       allowProxy.value = true
       proxyURL.value = newData.url
+      noProxy.value = newData.no_proxy.join(", ")
     } else {
       allowProxy.value = false
     }
diff --git a/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.ts b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.ts
index e2d271becbb..6821da1f520 100644
--- a/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.ts
+++ b/packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native/index.ts
@@ -5,10 +5,11 @@ import { cloneDeep } from "lodash-es"
 import { invoke } from "@tauri-apps/api/tauri"
 import * as E from "fp-ts/Either"
 import SettingsNativeInterceptor from "../../../components/settings/NativeInterceptor.vue"
-import { ref, watch } from "vue"
-import { z } from "zod"
-import { PersistenceService } from "@hoppscotch/common/services/persistence"
-import { CACertStore, ClientCertsStore, ClientCertStore, StoredClientCert } from "./persisted-data"
+import {ref, watch} from "vue"
+import {z} from "zod"
+import {PersistenceService} from "@hoppscotch/common/services/persistence"
+import {CACertStore, ClientCertsStore, ClientCertStore, StoredClientCert} from "./persisted-data"
+import { settingsStore } from "@hoppscotch/common/newstore/settings"
 
 
 type KeyValuePair = {
@@ -19,12 +20,12 @@ type KeyValuePair = {
 type FormDataValue =
   | { Text: string }
   | {
-      File: {
-        filename: string,
-        data: number[],
-        mime: string
-      }
-    }
+  File: {
+    filename: string,
+    data: number[],
+    mime: string
+  }
+}
 
 type FormDataEntry = {
   key: string,
@@ -38,17 +39,17 @@ type BodyDef =
 
 type ClientCertDef =
   | {
-      PEMCert: {
-        certificate_pem: number[],
-        key_pem: number[]
-      },
-    }
+  PEMCert: {
+    certificate_pem: number[],
+    key_pem: number[]
+  },
+}
   | {
-      PFXCert: {
-        certificate_pfx: number[],
-        password: string
-      }
-    }
+  PFXCert: {
+    certificate_pfx: number[],
+    password: string
+  }
+}
 
 // TODO: Figure out a way to autogen this from the interceptor definition on the Rust side
 export type RequestDef = {
@@ -65,8 +66,10 @@ export type RequestDef = {
   validate_certs: boolean,
   root_cert_bundle_files: number[],
   client_cert: ClientCertDef | null
+  follow_redirects: boolean
 
   proxy?: {
+    no_proxy: string[];
     url: string
   }
 }
@@ -90,6 +93,18 @@ export const preProcessRequest = (
 ): AxiosRequestConfig => {
   const reqClone = cloneDeep(req)
 
+  // Configure axios to NOT interfere with redirect handling
+  // The Rust backend will handle all redirect logic properly
+
+  // Always set maxRedirects to 0 for axios to prevent interference
+  // Our Rust backend will handle redirects based on the follow_redirects flag
+  reqClone.maxRedirects = 0
+
+  // Accept all status codes so redirects reach our Rust backend
+  reqClone.validateStatus = (status: number) => {
+    return status >= 200 && status < 600
+  }
+
   // If the parameters are URLSearchParams, inject them to URL instead
   // This prevents issues of marshalling the URLSearchParams to the proxy
   if (reqClone.params instanceof URLSearchParams) {
@@ -177,38 +192,96 @@ function convertClientCertToDefCert(cert: ClientCertificateEntry): ClientCertDef
 }
 
 async function convertToRequestDef(
-  axiosReq: AxiosRequestConfig,
+  relayReq: any, // This should be RelayRequest but using any to avoid import issues
   reqID: number,
   caCertificates: CACertificateEntry[],
   clientCertificates: Map<string, ClientCertificateEntry>,
   validateCerts: boolean,
   proxyInfo: RequestDef["proxy"]
 ): Promise<RequestDef> {
-  const clientCertDomain = getURLDomain(axiosReq.url!)
 
-  const clientCert = clientCertDomain ? clientCertificates.get(clientCertDomain) : null
+  const clientCertDomain = getURLDomain(relayReq.url!);
+  const clientCert = clientCertDomain ? clientCertificates.get(clientCertDomain) : null;
+  const useProxy = proxyInfo && (!proxyInfo.no_proxy || (proxyInfo.no_proxy.filter(domain => domain.trim().length > 0).length === 0 || shouldUseProxy(relayReq.url!, proxyInfo.no_proxy.map(domain => domain.trim()))));
+
+  // Extract followRedirects from RelayRequest options
+  const followRedirects = relayReq.options?.followRedirects ?? settingsStore.value.FOLLOW_REDIRECTS;
+
+  // Convert headers from RelayRequest format
+  const headers = Object.entries(relayReq.headers ?? {})
+    .filter(([key, value]) =>
+      !(key.toLowerCase() === "content-type" &&
+        typeof value === "string" &&
+        value.toLowerCase().includes("multipart/form-data"))
+    )
+    .map(([key, value]): KeyValuePair => ({key, value: String(value)}));
+
+  // Convert params from RelayRequest format
+  const parameters = Object.entries(relayReq.params ?? {})
+    .map(([key, value]): KeyValuePair => ({key, value: String(value)}));
+
+  // Process body from RelayRequest content
+  let body: BodyDef | null = null;
+  if (relayReq.content) {
+    switch (relayReq.content.kind) {
+      case "text":
+        body = { Text: relayReq.content.content };
+        break;
+      case "json":
+        body = { Text: typeof relayReq.content.content === "string"
+            ? relayReq.content.content
+            : JSON.stringify(relayReq.content.content) };
+        break;
+      case "urlencoded":
+        body = { Text: relayReq.content.content };
+        break;
+      case "multipart":
+        if (relayReq.content.content instanceof FormData) {
+          const entries: FormDataEntry[] = [];
+          // @ts-expect-error FormData entries iteration
+          for (const [key, value] of relayReq.content.content.entries()) {
+            if (typeof value === "string") {
+              entries.push({ key, value: { Text: value } });
+            } else if (value instanceof File || value instanceof Blob) {
+              const buffer = await value.arrayBuffer();
+              entries.push({
+                key,
+                value: {
+                  File: {
+                    filename: value instanceof File ? value.name : "unknown",
+                    data: Array.from(new Uint8Array(buffer)),
+                    mime: value.type || "application/octet-stream",
+                  }
+                }
+              });
+            }
+          }
+          body = { FormData: entries };
+        }
+        break;
+    }
+  }
 
-  return {
+  const requestDef = {
     req_id: reqID,
-    method: axiosReq.method ?? "GET",
-    endpoint: axiosReq.url ?? "",
-    headers: Object.entries(axiosReq.headers ?? {})
-      .filter(
-        ([key, value]) =>
-          !(
-            key.toLowerCase() === "content-type" &&
-            value.toLowerCase() === "multipart/form-data"
-          )
-      ) // Removing header, because this header will be set by relay.
-      .map(([key, value]): KeyValuePair => ({ key, value })),
-    parameters: Object.entries(axiosReq.params as Record<string, string> ?? {})
-      .map(([key, value]): KeyValuePair => ({ key, value })),
-    body: await processBody(axiosReq),
+    method: relayReq.method ?? "GET",
+    endpoint: relayReq.url ?? "",
+    headers,
+    parameters,
+    body,
     root_cert_bundle_files: caCertificates.map((cert) => Array.from(cert.certificate)),
     validate_certs: validateCerts,
     client_cert: clientCert ? convertClientCertToDefCert(clientCert) : null,
-    proxy: proxyInfo
-  }
+    proxy: useProxy ? proxyInfo : undefined,
+    follow_redirects: followRedirects
+  };
+
+  return requestDef;
+}
+
+function shouldUseProxy(url: string, noProxyList: string[]): boolean {
+  const hostname = new URL(url).hostname.toLowerCase();
+  return !noProxyList.some(domain => hostname.endsWith(domain.toLowerCase().trim()));
 }
 
 export const CACertificateEntry = z.object({
@@ -339,38 +412,38 @@ export class NativeInterceptorService extends Service implements Interceptor {
         Object.entries(
           clientCertStoreDataParseResult.value.clientCerts
         )
-        .map(([domain, cert]) => {
-          if ("PFXCert" in cert.cert) {
-            const newCert = <ClientCertificateEntry>{
-              ...cert,
-              cert: {
-                PFXCert: {
-                  certificate_pfx: new Uint8Array(cert.cert.PFXCert.certificate_pfx),
-                  certificate_filename: cert.cert.PFXCert.certificate_filename,
-
-                  password: cert.cert.PFXCert.password
+          .map(([domain, cert]) => {
+            if ("PFXCert" in cert.cert) {
+              const newCert = <ClientCertificateEntry>{
+                ...cert,
+                cert: {
+                  PFXCert: {
+                    certificate_pfx: new Uint8Array(cert.cert.PFXCert.certificate_pfx),
+                    certificate_filename: cert.cert.PFXCert.certificate_filename,
+
+                    password: cert.cert.PFXCert.password
+                  }
                 }
               }
-            }
 
-            return [domain, newCert]
-          } else {
-            const newCert = <ClientCertificateEntry>{
-              ...cert,
-              cert: {
-                PEMCert: {
-                  certificate_pem: new Uint8Array(cert.cert.PEMCert.certificate_pem),
-                  certificate_filename: cert.cert.PEMCert.certificate_filename,
-
-                  key_pem: new Uint8Array(cert.cert.PEMCert.key_pem),
-                  key_filename: cert.cert.PEMCert.key_filename
+              return [domain, newCert]
+            } else {
+              const newCert = <ClientCertificateEntry>{
+                ...cert,
+                cert: {
+                  PEMCert: {
+                    certificate_pem: new Uint8Array(cert.cert.PEMCert.certificate_pem),
+                    certificate_filename: cert.cert.PEMCert.certificate_filename,
+
+                    key_pem: new Uint8Array(cert.cert.PEMCert.key_pem),
+                    key_filename: cert.cert.PEMCert.key_filename
+                  }
                 }
               }
-            }
 
-            return [domain, newCert]
-          }
-        })
+              return [domain, newCert]
+            }
+          })
       )
     }
 
@@ -427,6 +500,8 @@ export class NativeInterceptorService extends Service implements Interceptor {
   }
 
   public runRequest(req: AxiosRequestConfig): RequestRunResult<InterceptorError> {
+    const isRelayRequest = req && typeof req === 'object' && 'method' in req && 'version' in req;
+
     const processedReq = preProcessRequest(req)
 
     const relevantCookies = this.cookieJarService.getCookiesForURL(
@@ -446,8 +521,10 @@ export class NativeInterceptorService extends Service implements Interceptor {
         invoke("plugin:hopp_native_interceptor|cancel_request", { reqId: reqID });
       },
       response: (async () => {
+        const requestForConversion = isRelayRequest ? req : processedReq;
+
         const requestDef = await convertToRequestDef(
-          processedReq,
+          requestForConversion,
           reqID,
           this.caCertificates.value,
           this.clientCertificates.value,

From 735ed910ea7b03323e994e769d5616d18af4959e Mon Sep 17 00:00:00 2001
From: dyoganan_ford <dyoganan@ford.com>
Date: Mon, 8 Sep 2025 21:00:45 +0530
Subject: [PATCH 2/4] Workflow build for windows and mac

---
 .../workflows/build-hoppscotch-desktop.yml    | 112 +-----------------
 1 file changed, 6 insertions(+), 106 deletions(-)

diff --git a/.github/workflows/build-hoppscotch-desktop.yml b/.github/workflows/build-hoppscotch-desktop.yml
index 606e34cee3d..d4af8df7a60 100644
--- a/.github/workflows/build-hoppscotch-desktop.yml
+++ b/.github/workflows/build-hoppscotch-desktop.yml
@@ -8,11 +8,11 @@ on:
       repository:
         description: Repository to checkout
         required: false
-        default: "hoppscotch/hoppscotch"
+        default: "Ford/hoppscotch"
       branch:
         description: Branch to checkout
         required: false
-        default: "main"
+        default: "FS-Changes"
       tag:
         description: Tag to checkout (takes precedence over branch if provided)
         required: false
@@ -33,106 +33,6 @@ env:
   DESKTOP_PATH: ${{ github.workspace }}/packages/hoppscotch-desktop
   BUNDLER_PATH: ${{ github.workspace }}/packages/hoppscotch-desktop/crates/webapp-bundler
 jobs:
-  build-linux:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: ${{ inputs.repository }}
-          ref: ${{ inputs.tag != '' && inputs.tag || inputs.branch }}
-          token: ${{ secrets.CHECKOUT_GITHUB_TOKEN }}
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10.2.1
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
-      - name: Install additional tools
-        run: |
-          curl -LO "https://github.com/tauri-apps/tauri/releases/download/tauri-cli-v2.2.0/cargo-tauri-x86_64-unknown-linux-gnu.tgz"
-          tar -xzf cargo-tauri-x86_64-unknown-linux-gnu.tgz
-          chmod +x cargo-tauri
-          sudo mv cargo-tauri /usr/local/bin/tauri
-      - name: Install system dependencies
-        run: |
-          sudo apt update;
-          sudo apt install -y \
-            build-essential \
-            curl \
-            wget \
-            file \
-            libssl-dev \
-            libgtk-3-dev \
-            libappindicator3-dev \
-            librsvg2-dev;
-
-          sudo apt install -y \
-            libwebkit2gtk-4.1-0=2.44.0-2 \
-            libwebkit2gtk-4.1-dev=2.44.0-2 \
-            libjavascriptcoregtk-4.1-0=2.44.0-2 \
-            libjavascriptcoregtk-4.1-dev=2.44.0-2 \
-            gir1.2-javascriptcoregtk-4.1=2.44.0-2 \
-            gir1.2-webkit2-4.1=2.44.0-2;
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: Setup environment
-        run: |
-          if [ ! -z "${{ secrets.ENV_FILE_CONTENT }}" ]; then
-            echo "${{ secrets.ENV_FILE_CONTENT }}" > ${{ env.WORKSPACE_PATH }}/.env
-            echo "Created .env file from repository secret"
-          elif [ -f "${{ env.WORKSPACE_PATH }}/.env" ]; then
-            echo "Using existing .env file found in repository"
-          else
-            cp ${{ env.WORKSPACE_PATH }}/.env.example ${{ env.WORKSPACE_PATH }}/.env
-            echo "No .env found, copied from .env.example template"
-          fi
-          pnpm install --dir ${{ env.DESKTOP_PATH }}
-      - name: Build web app
-        run: |
-          pnpm install --dir ${{ env.WEB_PATH }}
-          pnpm --dir ${{ env.WEB_PATH }} generate
-      - name: Build and run webapp-bundler
-        run: |
-          cargo build --release --manifest-path ${{ env.BUNDLER_PATH }}/Cargo.toml
-          ${{ env.BUNDLER_PATH }}/target/release/webapp-bundler \
-            --input ${{ env.WEB_PATH }}/dist \
-            --output ${{ env.DESKTOP_PATH }}/bundle.zip \
-            --manifest ${{ env.DESKTOP_PATH }}/manifest.json
-      - name: Build AppImage
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          RUST_LOG: debug
-        run: pnpm --dir ${{ env.DESKTOP_PATH }} tauri build --verbose -b appimage -b updater
-      - name: Build DEB
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          RUST_LOG: debug
-        run: pnpm --dir ${{ env.DESKTOP_PATH }} tauri build --verbose -b deb -b updater
-      - name: Prepare artifacts
-        run: |
-          ls -lahR ${{ env.DESKTOP_PATH }}/src-tauri/target/release/bundle/
-          mkdir -p dist
-          cp ${{ env.DESKTOP_PATH }}/src-tauri/target/release/bundle/appimage/*.AppImage dist/Hoppscotch_SelfHost_linux_x64.AppImage
-          cp ${{ env.DESKTOP_PATH }}/src-tauri/target/release/bundle/appimage/*.AppImage.sig dist/Hoppscotch_SelfHost_linux_x64.AppImage.sig
-          cp ${{ env.DESKTOP_PATH }}/src-tauri/target/release/bundle/deb/*.deb dist/Hoppscotch_SelfHost_linux_x64.deb
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux
-          path: dist/*
   build-windows:
     runs-on: windows-latest
     steps:
@@ -151,7 +51,7 @@ jobs:
           node-version: 20
       - uses: pnpm/action-setup@v4
         with:
-          version: 10.2.1
+          version: 10.15.0
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
@@ -253,7 +153,7 @@ jobs:
           node-version: 20
       - uses: pnpm/action-setup@v4
         with:
-          version: 10.2.1
+          version: 10.15.0
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
@@ -349,7 +249,7 @@ jobs:
           node-version: 20
       - uses: pnpm/action-setup@v4
         with:
-          version: 10.2.1
+          version: 10.15.0
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
@@ -433,7 +333,7 @@ jobs:
           name: macos-aarch64
           path: dist/*
   create-update-manifest:
-    needs: [build-linux, build-windows, build-macos-x64, build-macos-arm64]
+    needs: [build-windows, build-macos-x64, build-macos-arm64]
     runs-on: ubuntu-latest
     steps:
       - name: Download all artifacts

From 531c954bb9c3c3544458bb05988203e40180e727 Mon Sep 17 00:00:00 2001
From: Manohar-ford <mravic11@ford.com>
Date: Tue, 9 Sep 2025 16:07:22 +0530
Subject: [PATCH 3/4] Update tauri.conf.json

---
 packages/hoppscotch-desktop/src-tauri/tauri.conf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/hoppscotch-desktop/src-tauri/tauri.conf.json b/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
index 2a2405ad179..15f13c2f73d 100644
--- a/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
+++ b/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
@@ -35,7 +35,7 @@
   "bundle": {
     "active": true,
     "targets": "all",
-    "createUpdaterArtifacts": false,
+    "createUpdaterArtifacts": true,
     "icon": [
       "icons/32x32.png",
       "icons/128x128.png",

From b21cf74009af98ceef660923327a99dd4172b23d Mon Sep 17 00:00:00 2001
From: dyoganan_ford <dyoganan@ford.com>
Date: Tue, 30 Sep 2025 16:49:12 +0530
Subject: [PATCH 4/4] Fix CLI: Handle undefined response duration to prevent
 test failure.

---
 .gitignore                                    |  3 +
 packages/hoppscotch-cli/package.json          |  6 +-
 packages/hoppscotch-cli/src/utils/request.ts  | 67 +++++++++++++------
 packages/hoppscotch-cli/src/utils/test.ts     |  1 +
 .../src/node/test-runner/index.ts             |  8 ++-
 .../hoppscotch-js-sandbox/src/types/index.ts  |  2 +
 6 files changed, 65 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 packages/hoppscotch-cli/package.json

diff --git a/.gitignore b/.gitignore
index 68c412619ab..d904cecfd30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,9 @@ web_modules/
 .env
 .env.*
 
+# npm configuration files (contains sensitive registry credentials)
+.npmrc
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache
diff --git a/packages/hoppscotch-cli/package.json b/packages/hoppscotch-cli/package.json
old mode 100644
new mode 100755
index 6cc16921bb2..01dd5c3261b
--- a/packages/hoppscotch-cli/package.json
+++ b/packages/hoppscotch-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devenap/hoppscotch-cli",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "A CLI to run Hoppscotch test scripts in CI environments.",
   "homepage": "https://hoppscotch.io",
   "type": "module",
@@ -52,7 +52,9 @@
     "qs": "6.14.0",
     "verzod": "0.4.0",
     "xmlbuilder2": "3.1.1",
-    "zod": "3.25.32"
+    "zod": "3.25.32",
+    "form-data": "4.0.0",
+    "proxy-agent": "6.4.0"
   },
   "devDependencies": {
     "@hoppscotch/data": "workspace:^",
diff --git a/packages/hoppscotch-cli/src/utils/request.ts b/packages/hoppscotch-cli/src/utils/request.ts
index 485a336090c..9c0a33260c5 100644
--- a/packages/hoppscotch-cli/src/utils/request.ts
+++ b/packages/hoppscotch-cli/src/utils/request.ts
@@ -4,7 +4,7 @@ import {
   HoppRESTRequest,
   RESTReqSchemaVersion,
 } from "@hoppscotch/data";
-import axios, { AxiosInstance,Method } from "axios";
+import axios, { Method } from "axios";
 import * as A from "fp-ts/Array";
 import * as E from "fp-ts/Either";
 import * as T from "fp-ts/Task";
@@ -102,7 +102,7 @@ export const createRequest = (req: EffectiveHoppRESTRequest): RequestConfig => {
  */
 export const requestRunner =
   (
-    requestConfig: RequestConfig, axiosInstance: AxiosInstance
+    requestConfig: RequestConfig
   ): TE.TaskEither<HoppCLIError, RequestRunnerResponse> =>
   async () => {
     const start = hrtime();
@@ -111,25 +111,38 @@ export const requestRunner =
       // NOTE: Temporary parsing check for request endpoint.
       requestConfig.url = new URL(requestConfig.url ?? "").toString();
 
-      let status: number;
-      const baseResponse = await axiosInstance(requestConfig);
+      const baseResponse = await axios(requestConfig);
       const { config } = baseResponse;
-      // PR-COMMENT: type error
+
+      const end = hrtime(start);
+      const duration = getDurationInSeconds(end);
+      const responseTime = duration * 1000; // Convert seconds to milliseconds
+
+      // Transform axios headers to required format
+      const transformedHeaders: { key: string; value: string }[] = [];
+      if (baseResponse.headers) {
+        for (const [key, value] of Object.entries(baseResponse.headers)) {
+          if (value !== undefined) {
+            transformedHeaders.push({
+              key,
+              value: Array.isArray(value) ? value.join(", ") : String(value),
+            });
+          }
+        }
+      }
+
       const runnerResponse: RequestRunnerResponse = {
-        ...baseResponse,
         endpoint: getRequest.endpoint(config.url),
         method: getRequest.method(config.method),
         body: baseResponse.data,
-        duration: 0,
+        duration: responseTime, // Use responseTime (in milliseconds) for duration to match GUI behavior
+        status: baseResponse.status,
+        statusText: baseResponse.statusText,
+        headers: transformedHeaders,
       };
 
-      const end = hrtime(start);
-      const duration = getDurationInSeconds(end);
-      runnerResponse.duration = duration;
-
       return E.right(runnerResponse);
     } catch (e) {
-      let status: number;
       const runnerResponse: RequestRunnerResponse = {
         endpoint: "",
         method: "GET",
@@ -148,14 +161,30 @@ export const requestRunner =
           runnerResponse.body = data;
           runnerResponse.statusText = statusText;
           runnerResponse.status = status;
-          runnerResponse.headers = headers;
+
+          // Transform axios headers to required format
+          const transformedHeaders: { key: string; value: string }[] = [];
+          if (headers) {
+            for (const [key, value] of Object.entries(headers)) {
+              if (value !== undefined) {
+                transformedHeaders.push({
+                  key,
+                  value: Array.isArray(value)
+                    ? value.join(", ")
+                    : String(value),
+                });
+              }
+            }
+          }
+          runnerResponse.headers = transformedHeaders;
         } else if (e.request) {
           return E.left(error({ code: "REQUEST_ERROR", data: E.toError(e) }));
         }
 
         const end = hrtime(start);
         const duration = getDurationInSeconds(end);
-        runnerResponse.duration = duration;
+        const responseTime = duration * 1000; // Convert to milliseconds
+        runnerResponse.duration = responseTime;
 
         return E.right(runnerResponse);
       }
@@ -199,7 +228,7 @@ const getRequest = {
  */
 export const processRequest =
   (
-    params: ProcessRequestParams, axiosInstance : AxiosInstance
+    params: ProcessRequestParams
   ): T.Task<{ envs: HoppEnvs; report: RequestReport }> =>
   async () => {
     const { envs, path, request, delay, legacySandbox, collectionVariables } =
@@ -237,7 +266,7 @@ export const processRequest =
     const preRequestRes = await preRequestScriptRunner(
       request,
       processedEnvs,
-      legacySandbox,
+      legacySandbox ?? false,
       collectionVariables
     )();
     if (E.isLeft(preRequestRes)) {
@@ -271,7 +300,7 @@ export const processRequest =
     // Executing request-runner.
     const requestRunnerRes = await delayPromiseFunction<
       E.Either<HoppCLIError, RequestRunnerResponse>
-    >(requestRunner(requestConfig ,axiosInstance), delay);
+    >(requestRunner(requestConfig), delay);
     if (E.isLeft(requestRunnerRes)) {
       // Updating report for errors & current result
       report.errors.push(requestRunnerRes.left);
@@ -289,9 +318,9 @@ export const processRequest =
     // Extracting test-script-runner parameters.
     const testScriptParams = getTestScriptParams(
       _requestRunnerRes,
-      request,
+      effectiveRequest,
       updatedEnvs,
-      legacySandbox
+      legacySandbox ?? false
     );
 
     // Executing test-runner.
diff --git a/packages/hoppscotch-cli/src/utils/test.ts b/packages/hoppscotch-cli/src/utils/test.ts
index 69815952167..adb2f086ff2 100644
--- a/packages/hoppscotch-cli/src/utils/test.ts
+++ b/packages/hoppscotch-cli/src/utils/test.ts
@@ -152,6 +152,7 @@ export const getTestScriptParams = (
       body: reqRunnerRes.body,
       status: reqRunnerRes.status,
       headers: reqRunnerRes.headers,
+      duration: reqRunnerRes.duration,
     },
     envs,
     legacySandbox,
diff --git a/packages/hoppscotch-js-sandbox/src/node/test-runner/index.ts b/packages/hoppscotch-js-sandbox/src/node/test-runner/index.ts
index 1f948982b4c..7c38353c4ea 100644
--- a/packages/hoppscotch-js-sandbox/src/node/test-runner/index.ts
+++ b/packages/hoppscotch-js-sandbox/src/node/test-runner/index.ts
@@ -12,7 +12,13 @@ export const runTestScript = (
   response: TestResponse,
   experimentalScriptingSandbox = true
 ): TE.TaskEither<string, TestResult> => {
-  const responseObjHandle = preventCyclicObjects<TestResponse>(response)
+  const headersArray = Array.isArray(response.headers)
+      ? response.headers
+      : Object.entries(response.headers).map(([key, value]) => ({
+        key,
+        value: String(value),
+      }))
+  const responseObjHandle = preventCyclicObjects<TestResponse>({ ...response, headers: headersArray })
 
   if (E.isLeft(responseObjHandle)) {
     return TE.left(`Response marshalling failed: ${responseObjHandle.left}`)
diff --git a/packages/hoppscotch-js-sandbox/src/types/index.ts b/packages/hoppscotch-js-sandbox/src/types/index.ts
index dff084d3c0b..16b14c081eb 100644
--- a/packages/hoppscotch-js-sandbox/src/types/index.ts
+++ b/packages/hoppscotch-js-sandbox/src/types/index.ts
@@ -12,6 +12,8 @@ export type TestResponse = {
    * Body of the response, this will be the JSON object if it is a JSON content type, else body string
    */
   body: string | object
+  /** Duration of the request in milliseconds */
+  duration: number
 }
 
 /**