Added Playwright-codegen setup

2026-07-03 17:38:36 +00:00 · 2025-04-01 17:58:35 +05:30
652 changed files with 10423 additions and 58892 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +0,0 @@
-* @helloanoop @maintainer-bruno @bijin-bruno @lohit-bruno @naman-bruno
--- a/.github/ISSUE_TEMPLATE/BugReport.yaml
+++ b/.github/ISSUE_TEMPLATE/BugReport.yaml
@@ -27,9 +27,7 @@ body:
          required: false
        - label: annoying
          required: false
-        - label: this feature was working in a previous version but is broken in the current release.
-          required: false
-
+          
  - type: input
    attributes:
      label: Bruno version
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,12 +28,6 @@ jobs:
          npm run build --workspace=packages/bruno-common
          npm run build --workspace=packages/bruno-query
          npm run sandbox:bundle-libraries --workspace=packages/bruno-js
-          npm run build --workspace=packages/bruno-converters
-          npm run build --workspace=packages/bruno-requests
-          npm run build --workspace=packages/bruno-filestore
-
-      - name: Lint Check
-        run: npm run lint

      # tests
      - name: Test Package bruno-js
@@ -51,8 +45,6 @@ jobs:
        run: npm run test --workspace=packages/bruno-app
      - name: Test Package bruno-common
        run: npm run test --workspace=packages/bruno-common
-      - name: Test Package bruno-converters
-        run: npm run test --workspace=packages/bruno-converters
      - name: Test Package bruno-electron
        run: npm run test --workspace=packages/bruno-electron

@@ -79,9 +71,6 @@ jobs:
          npm run build --workspace=packages/bruno-query
          npm run build --workspace=packages/bruno-common
          npm run sandbox:bundle-libraries --workspace=packages/bruno-js
-          npm run build --workspace=packages/bruno-converters
-          npm run build --workspace=packages/bruno-requests
-          npm run build --workspace=packages/bruno-filestore

      - name: Run tests
        run: |
@@ -93,48 +82,5 @@ jobs:
        uses: EnricoMi/publish-unit-test-result-action@v2
        if: always()
        with:
-          check_name: CLI Test Results
          files: packages/bruno-tests/collection/junit.xml
          comment_mode: always
-  e2e-test:
-    name: Playwright E2E Tests
-    timeout-minutes: 60
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: v22.11.x
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get --no-install-recommends install -y \
-          libglib2.0-0 libnss3 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libgtk-3-0 libasound2t64 \
-          xvfb
-        npm ci --legacy-peer-deps
-        sudo chown root /home/runner/work/bruno/bruno/node_modules/electron/dist/chrome-sandbox
-        sudo chmod 4755 /home/runner/work/bruno/bruno/node_modules/electron/dist/chrome-sandbox
-
-    - name: Install dependencies for test collection environment
-      run: |
-        npm ci --prefix packages/bruno-tests/collection
-
-    - name: Build libraries
-      run: |
-        npm run build:graphql-docs
-        npm run build:bruno-query
-        npm run build:bruno-common
-        npm run sandbox:bundle-libraries --workspace=packages/bruno-js
-        npm run build:bruno-converters
-        npm run build:bruno-requests
-        npm run build:bruno-filestore
-
-    - name: Run Playwright tests
-      run: |
-        xvfb-run npm run test:e2e
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() }}
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
--- a/.gitignore
+++ b/.gitignore
@@ -46,8 +46,4 @@ yarn-error.log*

 #dev editor
 bruno.iml
-.idea
-.vscode
-
-# Playwright
-/blob-report/
+.idea
--- a/contributing.md
+++ b/contributing.md
@@ -15,15 +15,15 @@
 | [正體中文](docs/contributing/contributing_zhtw.md)
 | [日本語](docs/contributing/contributing_ja.md)
 | [हिंदी](docs/contributing/contributing_hi.md)
-| [Dutch](docs/contributing/contributing_nl.md)
+| [Nederlands](docs/contributing/contributing_nl.md)

 ## Let's make Bruno better, together!!

-We are happy that you are looking to improve Bruno. Below are the guidelines to run Bruno on your computer.
+We are happy that you are looking to improve Bruno. Below are the guidelines to get started bringing up Bruno on your computer.

 ### Technology Stack

-Bruno is built using React and Electron.
+Bruno is built using Next.js and React. We also use electron to ship a desktop version (that supports local collections)

 Libraries we use

@@ -37,77 +37,38 @@ Libraries we use
 - Filesystem Watcher - chokidar
 - i18n - i18next

-> [!IMPORTANT]
-> You would need [Node v22.x or the latest LTS version](https://nodejs.org/en/). We use npm workspaces in the project
+### Dependencies
+
+You would need [Node v20.x or the latest LTS version](https://nodejs.org/en/) and npm 8.x. We use npm workspaces in the project

 ## Development

-Bruno is a desktop app. Below are the instructions to run Bruno.
+Bruno is being developed as a desktop app. You need to load the app by running the Next.js app in one terminal and then run the electron app in another terminal.

-> Note: We use React for the frontend and rsbuild for build and dev server.
-
-## Install Dependencies
+### Local Development

 ```bash
-# use nodejs 22 version
+# use nodejs 20 version
 nvm use

 # install deps
 npm i --legacy-peer-deps
-```

-### Local Development
-
-#### Build packages
-
-##### Option 1
-
-```bash
 # build packages
 npm run build:graphql-docs
 npm run build:bruno-query
 npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests
-npm run build:bruno-filestore

 # bundle js sandbox libraries
 npm run sandbox:bundle-libraries --workspace=packages/bruno-js
-```
-##### Option 2

-```bash
-# install dependencies and setup
-npm run setup
-```
-
-#### Run the app
-
-##### Option 1
-
-```bash
-# run react app (terminal 1)
+# run next app (terminal 1)
 npm run dev:web

 # run electron app (terminal 2)
 npm run dev:electron
 ```

-##### Option 2
-```bash
-# run electron and react app concurrently
-npm run dev
-```
-
-#### Customize Electron `userData` path
-If `ELECTRON_USER_DATA_PATH` env-variable is present and its development mode, then `userData` path is modified accordingly.
-
-e.g.
-```sh
-ELECTRON_USER_DATA_PATH=$(realpath ~/Desktop/bruno-test) npm run dev:electron
-```
-This will create a `bruno-test` folder on your Desktop and use it as the `userData` path.
-
 ### Troubleshooting

 You might encounter a `Unsupported platform` error when you run `npm install`. To fix this, you will need to delete `node_modules` and `package-lock.json` and run `npm install`. This should install all the necessary packages needed to run the app.
@@ -126,28 +87,7 @@ find . -type f -name "package-lock.json" -delete

 ```bash
 # run bruno-schema tests
-npm run test --workspace=packages/bruno-schema
-
-# run bruno-query tests
-npm run test --workspace=packages/bruno-query
-
-# run bruno-common tests
-npm run test --workspace=packages/bruno-common
-
-# run bruno-converters tests
-npm run test --workspace=packages/bruno-converters
-
-# run bruno-app tests
-npm run test --workspace=packages/bruno-app
-
-# run bruno-electron tests
-npm run test --workspace=packages/bruno-electron
-
-# run bruno-lang tests
-npm run test --workspace=packages/bruno-lang
-
-# run bruno-toml tests
-npm run test --workspace=packages/bruno-toml
+npm test --workspace=packages/bruno-schema

 # run tests over all workspaces
 npm test --workspaces --if-present
--- a/docs/contributing/contributing_de.md
+++ b/docs/contributing/contributing_de.md
@@ -21,7 +21,7 @@ Bibliotheken die wir benutzen

 ### Abhängigkeiten

-Du benötigst [Node v22.x oder die neuste LTS Version](https://nodejs.org/en/) und npm 8.x. Wir benutzen npm workspaces in dem Projekt.
+Du benötigst [Node v20.x oder die neuste LTS Version](https://nodejs.org/en/) und npm 8.x. Wir benutzen npm workspaces in dem Projekt.

 ### Lass uns coden

@@ -42,12 +42,12 @@ Bruno wird als Desktop-Anwendung entwickelt. Um die App zu starten, musst Du zue

 ### Abhängigkeiten

- NodeJS v22
+- NodeJS v18

 ### Lokales Entwickeln

 ```bash
-# use nodejs 22 version
+# use nodejs 18 version
 nvm use

 # install deps
--- a/docs/contributing/contributing_es.md
+++ b/docs/contributing/contributing_es.md
@@ -1,4 +1,4 @@
-[Inglés](../../contributing.md)
+[English](../../contributing.md)

 ## ¡Juntos, hagamos a Bruno mejor!

@@ -6,111 +6,58 @@ Estamos encantados de que quieras ayudar a mejorar Bruno. A continuación encont

 ### Tecnologías utilizadas

-Bruno está construido con React y Electron
+Bruno está construido con NextJs y React. También usamos electron para distribuir una versión de escritorio (que soporta colecciones locales).

 Librerías que utilizamos:

- CSS - Tailwind CSS
- Editores de código - CodeMirror
+- CSS - Tailwind
+- Editores de código - Codemirror
 - Manejo del estado - Redux
 - Íconos - Tabler Icons
 - Formularios - formik
 - Validación de esquemas - Yup
 - Cliente de peticiones - axios
 - Monitor del sistema de archivos - chokidar
- i18n (internacionalización) - i18next

 ### Dependencias

-> [!IMPORTANT]
-> Necesitarás [Node v22.x o la última versión LTS](https://nodejs.org/es/). Ten en cuenta que Bruno usa los espacios de trabajo de npm
+Necesitarás [Node v20.x o la última versión LTS](https://nodejs.org/es) y npm 8.x. Ten en cuenta que utilizamos espacios de trabajo de npm en el proyecto.

 ## Desarrollo

-Bruno es una aplicación de escritorio. A continuación se detallan las instrucciones paso a paso para ejecutar Bruno.
+Bruno está siendo desarrollado como una aplicación de escritorio. Para ejecutarlo, primero debes ejecutar la aplicación de nextjs en una terminal y luego ejecutar la aplicación de electron en otra terminal.

-> Nota: Utilizamos React para el frontend y rsbuild para el servidor de desarrollo.
+### Dependencias

-### Instalar dependencias
-
-```bash
-# Use la versión 22.x o LTS (Soporte a Largo Plazo) de Node.js
-nvm use 22.11.0
-
-# instalar las dependencias
-npm i --legacy-peer-deps
-```
-
-> ¿Por qué `--legacy-peer-deps`?: Fuerza la instalación ignorando conflictos en dependencias “peer”, evitando errores de árbol de dependencias.
+- NodeJS v18

 ### Desarrollo local

-#### Construir paquetes
-
-##### Opción 1
-
 ```bash
-# construir paquetes
+# Utiliza la versión 18 de nodejs
+nvm use
+
+# Instala las dependencias
+npm i --legacy-peer-deps
+
+# Construye la documentación de graphql
 npm run build:graphql-docs
+
+# Construye bruno-query
 npm run build:bruno-query
-npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests

-# empaquetar bibliotecas JavaScript del entorno de pruebas aislado
-npm run sandbox:bundle-libraries --workspace=packages/bruno-js
-```
-
-##### Opción 2
-
-```bash
-# instalar dependencias y configurar el entorno
-npm run setup
-```
-
-#### Ejecutar la aplicación
-
-```bash
-# ejecutar aplicación react (terminal 1)
+# Ejecuta la aplicación de nextjs (terminal 1)
 npm run dev:web

-# ejecutar aplicación electron (terminal 2)
+# Ejecuta la aplicación de electron (terminal 2)
 npm run dev:electron
 ```

-##### Opción 1
-
-```bash
-# ejecutar aplicación react (terminal 1)
-npm run dev:web
-
-# ejecutar aplicación electron (terminal 2)
-npm run dev:electron
-```
-
-##### Opción 2
-
-```bash
-# ejecutar aplicación electron y react de forma concurrente
-npm run dev
-```
-
-#### Personalizar la ruta `userData` de Electron
-
-Si la variable de entorno `ELECTRON_USER_DATA_PATH` está presente y se encuentra en modo de desarrollo, entonces la ruta `userData` se modifica en consecuencia.
-ejemplo:
-
-```sh
-ELECTRON_USER_DATA_PATH=$(realpath ~/Desktop/bruno-test) npm run dev:electron
-```
-
-Esto creará una carpeta llamada `bruno-test` en tu escritorio y la usará como la ruta userData.
-
 ### Solución de problemas

-Es posible que te encuentres con un error `Unsupported platform` cuando ejecutes `npm install`. Para solucionarlo, tendrás que eliminar las carpetas `node_modules` y el archivo `package-lock.json`, y luego volver a ejecutar `npm install`. Esto debería instalar todos los paquetes necesarios para que la aplicación funcione.
+Es posible que encuentres un error de `Unsupported platform` cuando ejecutes `npm install`. Para solucionarlo, debes eliminar la carpeta `node_modules` y el archivo `package-lock.json`, luego, ejecuta `npm install`. Lo anterior debería instalar todos los paquetes necesarios para ejecutar la aplicación.

-```sh
+```shell
 # Elimina la carpeta node_modules en los subdirectorios
 find ./ -type d -name "node_modules" -print0 | while read -d $'\0' dir; do
  rm -rf "$dir"
@@ -122,42 +69,10 @@ find . -type f -name "package-lock.json" -delete

 ### Pruebas

-#### Pruebas individuales
-
 ```bash
-# ejecutar pruebas de bruno-app
-npm run test --workspace=packages/bruno-app
+# ejecutar pruebas de esquema bruno
+npm test --workspace=packages/bruno-schema

-# ejecutar pruebas de bruno-electron
-npm run test --workspace=packages/bruno-electron
-
-# ejecutar pruebas de bruno-cli
-npm run test --workspace=packages/bruno-cli
-
-# ejecutar pruebas de bruno-common
-npm run test --workspace=packages/bruno-common
-
-# ejecutar pruebas de bruno-converters
-npm run test --workspace=packages/bruno-converters
-
-# ejecutar pruebas de bruno-schema
-npm run test --workspace=packages/bruno-schema
-
-# ejecutar pruebas de bruno-query
-npm run test --workspace=packages/bruno-query
-
-# ejecutar pruebas de bruno-js
-npm run test --workspace=packages/bruno-js
-
-# ejecutar pruebas de bruno-lang
-npm run test --workspace=packages/bruno-lang
-
-# ejecutar pruebas de bruno-toml
-npm run test --workspace=packages/bruno-toml
-```
-#### Pruebas en conjunto
-
-```bash
 # ejecutar pruebas en todos los espacios de trabajo
 npm test --workspaces --if-present
 ```
--- a/docs/contributing/contributing_hi.md
+++ b/docs/contributing/contributing_hi.md
@@ -40,8 +40,6 @@ npm i --legacy-peer-deps
 npm run build:graphql-docs
 npm run build:bruno-query
 npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests

 # Next.js ऐप चलाएँ (टर्मिनल 1 पर)
 npm run dev:web
--- a/docs/contributing/contributing_ja.md
+++ b/docs/contributing/contributing_ja.md
@@ -40,8 +40,6 @@ npm i --legacy-peer-deps
 npm run build:graphql-docs
 npm run build:bruno-query
 npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests

 # run next app (terminal 1)
 npm run dev:web
--- a/docs/contributing/contributing_kr.md
+++ b/docs/contributing/contributing_kr.md
@@ -40,8 +40,6 @@ npm i --legacy-peer-deps
 npm run build:graphql-docs
 npm run build:bruno-query
 npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests

 # next 앱 실행 (1번 터미널)
 npm run dev:web
--- a/docs/contributing/contributing_nl.md
+++ b/docs/contributing/contributing_nl.md
@@ -40,8 +40,6 @@ npm i --legacy-peer-deps
 npm run build:graphql-docs
 npm run build:bruno-query
 npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests

 # draai next app (terminal 1)
 npm run dev:web
--- a/docs/contributing/contributing_sk.md
+++ b/docs/contributing/contributing_sk.md
@@ -42,8 +42,6 @@ npm i --legacy-peer-deps
 npm run build:graphql-docs
 npm run build:bruno-query
 npm run build:bruno-common
-npm run build:bruno-converters
-npm run build:bruno-requests

 # spustite ďalšiu aplikáciu (terminál 1)
 npm run dev:web
--- a/docs/readme/readme_ar.md
+++ b/docs/readme/readme_ar.md
@@ -74,11 +74,12 @@ flatpak install com.usebruno.Bruno

 # على نظام Linux عبر Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt
 ```

 ### التشغيل عبر منصات متعددة 🖥️
--- a/docs/readme/readme_bn.md
+++ b/docs/readme/readme_bn.md
@@ -59,11 +59,12 @@ snap install bruno

 # Apt এর মাধ্যমে লিনাক্সে
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### একাধিক প্ল্যাটফর্মে চালান 🖥️
--- a/docs/readme/readme_cn.md
+++ b/docs/readme/readme_cn.md
@@ -63,11 +63,12 @@ snap install bruno

 # 在 Linux 上用 Apt 安装
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### 在 Mac 上通过 Homebrew 安装 🖥️
--- a/docs/readme/readme_de.md
+++ b/docs/readme/readme_de.md
@@ -78,11 +78,12 @@ flatpak install com.usebruno.Bruno

 # Auf Linux via Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Einsatz auf verschiedensten Plattformen 🖥️
--- a/docs/readme/readme_es.md
+++ b/docs/readme/readme_es.md
@@ -75,11 +75,12 @@ flatpak install com.usebruno.Bruno

 # En Linux con Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Ejecútalo en múltiples plataformas 🖥️
--- a/docs/readme/readme_fr.md
+++ b/docs/readme/readme_fr.md
@@ -63,11 +63,12 @@ snap install bruno

 # Linux via Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Fonctionne sur de multiples plateformes 🖥️
--- a/docs/readme/readme_hi.md
+++ b/docs/readme/readme_hi.md
@@ -1,151 +0,0 @@
-<br />
-<img src="../../assets/images/logo-transparent.png" width="80"/>
-
-### ब्रूनो - API इंटरफेस (API) का अन्वेषण और परीक्षण करने के लिए एक ओपन-सोर्स विकास वातावरण।
-
-[![GitHub संस्करण](https://badge.fury.io/gh/usebruno%2Fbruno.svg)](https://badge.fury.io/gh/usebruno%2Fbruno)
-[![CI](https://github.com/usebruno/bruno/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/usebruno/bruno/actions/workflows/tests.yml)
-[![कमिट गतिविधि](https://img.shields.io/github/commit-activity/m/usebruno/bruno)](https://github.com/usebruno/bruno/pulse)
-[![X](https://img.shields.io/twitter/follow/use_bruno?style=social&logo=x)](https://twitter.com/use_bruno)
-[![वेबसाइट](https://img.shields.io/badge/Website-Visit-blue)](https://www.usebruno.com)
-[![डाउनलोड](https://img.shields.io/badge/Download-Latest-brightgreen)](https://www.usebruno.com/downloads)
-
-[English](../../readme.md)
-| [Українська](./readme_ua.md)
-| [Русский](./readme_ru.md)
-| [Türkçe](./readme_tr.md)
-| [Deutsch](./readme_de.md)
-| [Français](./readme_fr.md)
-| [Português (BR)](./readme_pt_br.md)
-| [한국어](./readme_kr.md)
-| [বাংলা](./readme_bn.md)
-| [Español](./readme_es.md)
-| [Italiano](./readme_it.md)
-| [Română](./readme_ro.md)
-| [Polski](./readme_pl.md)
-| [简体中文](./readme_cn.md)
-| [正體中文](./readme_zhtw.md)
-| [العربية](./readme_ar.md)
-| [日本語](./readme_ja.md)
-| [ქართული](./readme_ka.md)
-| **हिन्दी**
-
-ब्रूनो एक नया और अभिनव API क्लाइंट है, जिसका उद्देश्य Postman और अन्य समान उपकरणों द्वारा प्रस्तुत स्थिति को बदलना है।
-
-ब्रूनो आपकी कलेक्शनों को सीधे आपकी फाइल सिस्टम के एक फ़ोल्डर में संग्रहीत करता है। हम API अनुरोधों के बारे में जानकारी सहेजने के लिए एक सामान्य टेक्स्ट मार्कअप भाषा, Bru, का उपयोग करते हैं।
-
-आप अपनी API कलेक्शनों पर सहयोग करने के लिए Git या अपनी पसंद के किसी भी संस्करण नियंत्रण प्रणाली का उपयोग कर सकते हैं।
-
-ब्रूनो केवल ऑफ़लाइन उपयोग के लिए है। ब्रूनो में कभी भी क्लाउड-सिंक जोड़ने की कोई योजना नहीं है। हम आपके डेटा की गोपनीयता को महत्व देते हैं और मानते हैं कि इसे आपके डिवाइस पर ही रहना चाहिए। हमारी दीर्घकालिक दृष्टि [यहाँ](https://github.com/usebruno/bruno/discussions/269) पढ़ें।
-
-📢 हमारे हालिया India FOSS 3.0 सम्मेलन में हमारे वार्तालाप को [यहाँ](https://www.youtube.com/watch?v=7bSMFpbcPiY) देखें।
-
-![bruno](/assets/images/landing-2.png) <br /><br />
-
-### गोल्डन संस्करण ✨
-
-हमारी अधिकांश सुविधाएँ मुफ्त और ओपन-सोर्स हैं।
-हम [पारदर्शिता और स्थिरता के सिद्धांतों](https://github.com/usebruno/bruno/discussions/269) के बीच एक सामंजस्यपूर्ण संतुलन प्राप्त करने का प्रयास करते हैं।
-
-[गोल्डन संस्करण](https://www.usebruno.com/pricing) के लिए खरीदारी जल्द ही $9 की कीमत पर उपलब्ध होगी! <br/>
-[यहाँ सदस्यता लें](https://usebruno.ck.page/4c65576bd4) ताकि आपको लॉन्च पर सूचनाएं मिलें।
-
-### स्थापना
-
-ब्रूनो Mac, Windows और Linux के लिए हमारे [वेबसाइट](https://www.usebruno.com/downloads) पर एक बाइनरी डाउनलोड के रूप में उपलब्ध है।
-
-आप ब्रूनो को Homebrew, Chocolatey, Scoop, Snap, Flatpak और Apt जैसे पैकेज प्रबंधकों के माध्यम से भी स्थापित कर सकते हैं।
-
-```sh
-# Mac पर Homebrew के माध्यम से
-brew install bruno
-
-# Windows पर Chocolatey के माध्यम से
-choco install bruno
-
-# Windows पर Scoop के माध्यम से
-scoop bucket add extras
-scoop install bruno
-
-# Linux पर Snap के माध्यम से
-snap install bruno
-
-# Linux पर Flatpak के माध्यम से
-flatpak install com.usebruno.Bruno
-
-# Linux पर Apt के माध्यम से
-sudo mkdir -p /etc/apt/keyrings
-sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-
-echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-
-sudo apt update
-sudo apt install bruno
-
-कई प्लेटफार्मों पर चलाएं 🖥️
-<br /><br />
-
-Git के माध्यम से सहयोग करें 👩‍💻🧑‍💻
-या अपनी पसंद के किसी भी संस्करण नियंत्रण प्रणाली का उपयोग करें
-
-<br /><br />
-
-महत्वपूर्ण लिंक 📌
-हमारी दीर्घकालिक दृष्टि
-
-रोडमैप
-
-प्रलेखन
-
-Stack Overflow
-
-वेबसाइट
-
-मूल्य निर्धारण
-
-डाउनलोड
-
-GitHub प्रायोजक
-
-प्रस्तुतियाँ 🎥
-प्रशंसापत्र
-
-ज्ञान केंद्र
-
-Scriptmania
-
-समर्थन ❤️
-यदि आप ब्रूनो को पसंद करते हैं और हमारे ओपन-सोर्स कार्य का समर्थन करना चाहते हैं, तो कृपया GitHub प्रायोजक के माध्यम से हमें प्रायोजित करने पर विचार करें।
-
-प्रशंसापत्र साझा करें 📣
-यदि ब्रूनो ने आपके और आपकी टीमों के लिए काम में मदद की है, तो कृपया हमारे GitHub चर्चा में अपने प्रशंसापत्र साझा करना न भूलें
-
-नए पैकेज प्रबंधकों में प्रकाशित करना
-अधिक जानकारी के लिए कृपया यहाँ देखें।
-
-हमसे संपर्क करें 🌐
-𝕏 (ट्विटर) <br />
-वेबसाइट <br />
-डिस्कॉर्ड <br />
-लिंक्डइन
-
-ट्रेडमार्क
-नाम
-
-ब्रूनो एक ट्रेडमार्क है जो अनूप एम डी के स्वामित्व में है।
-
-लोगो
-
-लोगो OpenMoji से लिया गया है। लाइसेंस: CC BY-SA 4.0
-
-योगदान 👩‍💻🧑‍💻
-हमें खुशी है कि आप ब्रूनो को बेहतर बनाने में रुचि रखते हैं। कृपया योगदान गाइड देखें।
-
-यदि आप सीधे कोड के माध्यम से योगदान नहीं कर सकते, तो भी कृपया बग्स की रिपोर्ट करने और उन सुविधाओं का अनुरोध करने में संकोच न करें जिन्हें आपकी स्थिति को हल करने के लिए लागू किया जाना चाहिए।
-
-लेखक
-<div align="center"> <a href="https://github.com/usebruno/bruno/graphs/contributors"> <img src="https://contrib.rocks/image?repo=usebruno/bruno" /> </a> </div>
-
-लाइसेंस 📄
-MIT
-
--- a/docs/readme/readme_it.md
+++ b/docs/readme/readme_it.md
@@ -59,11 +59,12 @@ snap install bruno

 # Su Linux tramite Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Funziona su diverse piattaforme 🖥️
--- a/docs/readme/readme_ja.md
+++ b/docs/readme/readme_ja.md
@@ -78,11 +78,12 @@ flatpak install com.usebruno.Bruno

 # LinuxでAptを使ってインストール
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### マルチプラットフォームでの実行に対応 🖥️
--- a/docs/readme/readme_kr.md
+++ b/docs/readme/readme_kr.md
@@ -59,11 +59,12 @@ snap install bruno

 # On Linux via Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### 여러 플랫폼에서 실행하세요. 🖥️
--- a/docs/readme/readme_pl.md
+++ b/docs/readme/readme_pl.md
@@ -69,11 +69,12 @@ flatpak install com.usebruno.Bruno

 # On Linux via Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
+
 echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Uruchom na wielu platformach 🖥️
--- a/docs/readme/readme_pt_br.md
+++ b/docs/readme/readme_pt_br.md
@@ -76,11 +76,12 @@ flatpak install com.usebruno.Bruno

 # No Linux via Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Execute em várias plataformas 🖥️
--- a/docs/readme/readme_ro.md
+++ b/docs/readme/readme_ro.md
@@ -59,11 +59,12 @@ snap install bruno

 # Pe Linux cu Apt
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Utilizați pe mai multe platforme 🖥️
--- a/docs/readme/readme_tr.md
+++ b/docs/readme/readme_tr.md
@@ -63,11 +63,12 @@ snap install bruno

 # Apt aracılığıyla Linux'ta
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### Birden fazla platformda çalıştırın 🖥️
--- a/docs/readme/readme_zhtw.md
+++ b/docs/readme/readme_zhtw.md
@@ -63,11 +63,12 @@ snap install bruno

 # 在 Linux 上使用 Apt 安裝
 sudo mkdir -p /etc/apt/keyrings
-sudo apt update && sudo apt install gpg
-sudo gpg --list-keys
 sudo gpg --no-default-keyring --keyring /etc/apt/keyrings/bruno.gpg --keyserver keyserver.ubuntu.com --recv-keys 9FA6017ECABE0266
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
-sudo apt update && sudo apt install bruno
+
+echo "deb [signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+
+sudo apt update
+sudo apt install bruno
 ```

 ### 跨多個平台運行 🖥️
--- a/e2e-tests/001-sanity-tests/001-home-screen.spec.ts
+++ b/e2e-tests/001-sanity-tests/001-home-screen.spec.ts
@@ -1,5 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test('Check if the logo on top left is visible', async ({ page }) => {
-  await expect(page.getByRole('button', { name: 'bruno' })).toBeVisible();
-});
--- a/e2e-tests/001-sanity-tests/002-create-new-collection-and-new-request.spec.ts
+++ b/e2e-tests/001-sanity-tests/002-create-new-collection-and-new-request.spec.ts
@@ -1,31 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test('Create new collection and add a simple HTTP request', async ({ page, createTmpDir }) => {
-  await page.getByLabel('Create Collection').click();
-  await page.getByLabel('Name').click();
-  await page.getByLabel('Name').fill('test-collection');
-  await page.getByLabel('Name').press('Tab');
-  await page.getByLabel('Location').fill(await createTmpDir('test-collection'));
-  await page.getByRole('button', { name: 'Create', exact: true }).click();
-  await page.getByText('test-collection').click();
-  await page.getByLabel('Safe Mode').check();
-  await page.getByRole('button', { name: 'Save' }).click();
-  await page.locator('#create-new-tab').getByRole('img').click();
-  await page.getByPlaceholder('Request Name').fill('r1');
-  await page.locator('#new-request-url .CodeMirror').click();
-  await page.locator('textarea').fill('http://localhost:8081');
-  await page.getByRole('button', { name: 'Create' }).click();
-  await page.locator('#request-url .CodeMirror').click();
-  await page.locator('textarea').fill('/ping');
-  await page.locator('#send-request').getByRole('img').nth(2).click();
-
-  await expect(page.getByRole('main')).toContainText('200 OK');
-
-  await page.getByRole('tab', { name: 'GET r1' }).locator('circle').click();
-  await page.getByRole('button', { name: 'Save', exact: true }).click();
-  await page.getByText('GETr1').click();
-  await page.getByRole('button', { name: 'Clear response' }).click();
-  await page.locator('body').press('ControlOrMeta+Enter');
-
-  await expect(page.getByRole('main')).toContainText('200 OK');
-});
--- a/e2e-tests/002-cookies-tests/001-cookie-persistence.spec.ts
+++ b/e2e-tests/002-cookies-tests/001-cookie-persistence.spec.ts
@@ -1,43 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test('should persist cookies across app restarts', async ({ createTmpDir, launchElectronApp }) => {
-  // Create a temporary user-data directory so we control where the cookies store file is written.
-  const userDataPath = await createTmpDir('cookie-persistence');
-
-  const app1 = await launchElectronApp({ userDataPath });
-  const page1 = await app1.firstWindow();
-  await page1.waitForSelector('[data-trigger="cookies"]');
-
-  // Open Cookies modal via the status-bar button.
-  await page1.click('[data-trigger="cookies"]');
-
-  // When no cookies are present the modal shows a centred "Add Cookie" button.
-  await page1.getByRole('button', { name: /Add Cookie/i }).click();
-
-  // Fill out the form.
-  await page1.fill('input[name="domain"]', 'example.com');
-  await page1.fill('input[name="path"]', '/');
-  await page1.fill('input[name="key"]', 'session');
-  await page1.fill('input[name="value"]', 'abc123');
-  await page1.check('input[name="secure"]');
-  await page1.check('input[name="httpOnly"]');
-
-  await page1.getByRole('button', { name: 'Save' }).click();
-
-  await expect(page1.getByText('example.com')).toBeVisible();
-
-  await app1.close();
-
-  // Second launch – verify the cookie was persisted and re-loaded
-  const app2 = await launchElectronApp({ userDataPath });
-  const page2 = await app2.firstWindow();
-
-  // Open the Cookies modal again.
-  await page2.waitForSelector('[data-trigger="cookies"]');
-  await page2.click('[data-trigger="cookies"]');
-
-  // The domain we added earlier should still be present.
-  await expect(page2.getByText('example.com')).toBeVisible();
-
-  await app2.close();
-});
--- a/e2e-tests/002-cookies-tests/002-corrupted-passkey.spec.ts
+++ b/e2e-tests/002-cookies-tests/002-corrupted-passkey.spec.ts
@@ -1,47 +0,0 @@
-import { test, expect } from '../../playwright';
-import * as path from 'path';
-import * as fs from 'fs/promises';
-
-test('should handle corrupted passkey and still display saved cookie list', async ({ createTmpDir, launchElectronApp }) => {
-  const userDataPath = await createTmpDir('corrupted-passkey');
-
-  const app1 = await launchElectronApp({ userDataPath });
-  // 1. First run – add a cookie via the UI so `cookies.json` is created.
-  const page1 = await app1.firstWindow();
-
-  await page1.waitForSelector('[data-trigger="cookies"]');
-  await page1.click('[data-trigger="cookies"]');
-  await page1.getByRole('button', { name: /Add Cookie/i }).click();
-
-  await page1.fill('input[name="domain"]', 'example.com');
-  await page1.fill('input[name="path"]', '/');
-  await page1.fill('input[name="key"]', 'session');
-  await page1.fill('input[name="value"]', 'abc123');
-  await page1.check('input[name="secure"]');
-  await page1.check('input[name="httpOnly"]');
-
-  await page1.getByRole('button', { name: 'Save' }).click();
-
-  await expect(page1.getByText('example.com')).toBeVisible();
-  
-  await app1.close();
-
-  // 2. Corrupt the encryptedPasskey in cookies.json
-  const cookiesFilePath = path.join(userDataPath, 'cookies.json');
-  const raw = await fs.readFile(cookiesFilePath, 'utf-8');
-  const cookiesJson = JSON.parse(raw);
-  cookiesJson.encryptedPasskey = 'deadbeef'; // clearly invalid value
-  await fs.writeFile(cookiesFilePath, JSON.stringify(cookiesJson, null, 2));
-
-  // 3. Second run – Bruno should recover and still list the cookie domain
-  const app2 = await launchElectronApp({ userDataPath });
-  const page2 = await app2.firstWindow();
-
-  await page2.waitForSelector('[data-trigger="cookies"]');
-  await page2.click('[data-trigger="cookies"]');
-
-  // The domain row should still be visible (even if cookie values are blank).
-  await expect(page2.getByText('example.com')).toBeVisible();
-
-  await app2.close();
-});
--- a/e2e-tests/bruno-testbench/init-user-data/preferences.json
+++ b/e2e-tests/bruno-testbench/init-user-data/preferences.json
@@ -1,4 +0,0 @@
-{
-  "maximized": true,
-  "lastOpenedCollections": ["{{projectRoot}}/packages/bruno-tests/collection"]
-}
--- a/e2e-tests/bruno-testbench/run-testbench-requests.spec.ts
+++ b/e2e-tests/bruno-testbench/run-testbench-requests.spec.ts
@@ -1,49 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test.describe.parallel('Run Testbench Requests', () => {
-  test('Run bruno-testbench in Developer Mode', async ({ pageWithUserData: page }) => {
-    test.setTimeout(2 * 60 * 1000);
-
-    await page.getByText('bruno-testbench').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.locator('.environment-selector').nth(1).click();
-    await page.locator('.dropdown-item').getByText('Prod').click();
-    await page.locator('.collection-actions').hover();
-    await page.locator('.collection-actions .icon').click();
-    await page.getByText('Run', { exact: true }).click();
-    await page.getByRole('button', { name: 'Run Collection' }).click();
-    await page.getByRole('button', { name: 'Run Again' }).waitFor({ timeout: 2 * 60 * 1000 });
-
-    const result = await page.getByText('Total Requests: ').innerText();
-    const [totalRequests, passed, failed, skipped] = result
-      .match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/)
-      .slice(1);
-
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
-  });
-
-  test.fixme('Run bruno-testbench in Safe Mode', async ({ pageWithUserData: page }) => {
-    test.setTimeout(2 * 60 * 1000);
-
-    await page.getByText('bruno-testbench').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.locator('.environment-selector').nth(1).click();
-    await page.locator('.dropdown-item').getByText('Prod').click();
-    await page.locator('.collection-actions').hover();
-    await page.locator('.collection-actions .icon').click();
-    await page.getByText('Run', { exact: true }).click();
-    await page.getByRole('button', { name: 'Run Collection' }).click();
-    await page.getByRole('button', { name: 'Run Again' }).waitFor({ timeout: 2 * 60 * 1000 });
-
-    const result = await page.getByText('Total Requests: ').innerText();
-    const [totalRequests, passed, failed, skipped] = result
-      .match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/)
-      .slice(1);
-
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
-  });
-});
--- a/e2e-tests/persistent-env-tests/001-persistent-env-test.spec.ts
+++ b/e2e-tests/persistent-env-tests/001-persistent-env-test.spec.ts
@@ -1,33 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test.describe.serial('Persistent Environment Test', () => {
-  test.setTimeout(2 * 10 * 1000);
-
-  test('add env using script', async ({ pageWithUserData: page, restartApp }) => {
-    await page.locator('#sidebar-collection-name').click();
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByText('ping', { exact: true }).click();
-    await page.getByText('No Environment').click();
-    await page.getByRole('tooltip').locator('div').filter({ hasText: 'Env' }).nth(3).click();
-    await page.locator('#send-request').getByRole('img').nth(2).click();
-    await page.waitForTimeout(1000);
-    await page.locator('div').filter({ hasText: /^Env$/ }).nth(3).click();
-    await page.getByText('Configure', { exact: true }).click();
-    await expect(page.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).toBeVisible();
-    await page.getByText('×').click();
-
-    const newApp = await restartApp();
-    const newPage = await newApp.firstWindow();
-    await newPage.locator('#sidebar-collection-name').click();
-    await newPage.getByRole('button', { name: 'Save' }).click();
-    await newPage.getByText('ping', { exact: true }).click();
-    await newPage.getByText('No Environment').click();
-    await newPage.getByRole('tooltip').locator('div').filter({ hasText: 'Env' }).nth(3).click();
-    await newPage.locator('div').filter({ hasText: /^Env$/ }).nth(3).click();
-    await newPage.getByText('Configure', { exact: true }).click();
-    await expect(newPage.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).toBeVisible();
-    await newPage.getByText('×').click();
-    await newPage.waitForTimeout(1000);
-    await newPage.close();
-  });
-});
--- a/e2e-tests/persistent-env-tests/002-env-test-without-persistence.spec.ts
+++ b/e2e-tests/persistent-env-tests/002-env-test-without-persistence.spec.ts
@@ -1,40 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test.describe.serial('Persistent Environment Test', () => {
-  test.setTimeout(2 * 10 * 1000);
-
-  test('add env using script', async ({ pageWithUserData: page, restartApp }) => {
-    await page.locator('#sidebar-collection-name').click();
-    await page.getByText('ping2', { exact: true }).click();
-    await page.getByText('Env', { exact: true }).click();
-    await page.getByText('Stage', { exact: true }).click();
-    await page.locator('#send-request').getByRole('img').nth(2).click();
-    await page.waitForTimeout(1000);
-    await page
-      .locator('div')
-      .filter({ hasText: /^Stage$/ })
-      .nth(3)
-      .click();
-    await page.getByText('Configure', { exact: true }).click();
-    await expect(page.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).toBeVisible();
-    await page.getByText('×').click();
-
-    const newApp = await restartApp();
-    const newPage = await newApp.firstWindow();
-    await newPage.locator('#sidebar-collection-name').click();
-    await newPage.getByRole('button', { name: 'Save' }).click();
-    await newPage.getByText('ping2', { exact: true }).click();
-    await newPage.getByText('No Environment').click();
-    await newPage.getByText('Stage').click();
-    await newPage
-      .locator('div')
-      .filter({ hasText: /^Stage$/ })
-      .nth(3)
-      .click();
-    await newPage.getByText('Configure', { exact: true }).click();
-    await expect(newPage.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).not.toBeVisible();
-    await newPage.getByText('×').click();
-    await newPage.waitForTimeout(1000);
-    await newPage.close();
-  });
-});
--- a/e2e-tests/persistent-env-tests/collection/bruno.json
+++ b/e2e-tests/persistent-env-tests/collection/bruno.json
@@ -1,5 +0,0 @@
-{
-    "version": "1",
-    "name": "collection",
-    "type": "collection"
-}
--- a/e2e-tests/persistent-env-tests/collection/collection.bru
+++ b/e2e-tests/persistent-env-tests/collection/collection.bru
--- a/e2e-tests/persistent-env-tests/collection/environments/Env.bru
+++ b/e2e-tests/persistent-env-tests/collection/environments/Env.bru
@@ -1,4 +0,0 @@
-vars {
-  host: https://testbench-sanity.usebruno.com
-  persistent-env-test: persistent-env-test-value
-}
--- a/e2e-tests/persistent-env-tests/collection/environments/Stage.bru
+++ b/e2e-tests/persistent-env-tests/collection/environments/Stage.bru
@@ -1,3 +0,0 @@
-vars {
-  host: https://testbench-sanity.usebruno.com
-}
--- a/e2e-tests/persistent-env-tests/collection/persist-env-request.bru
+++ b/e2e-tests/persistent-env-tests/collection/persist-env-request.bru
@@ -1,15 +0,0 @@
-meta {
-  name: ping2
-  type: http
-  seq: 1
-}
-
-get {
-  url: {{host}}/ping
-  body: none
-  auth: none
-}
-
-script:pre-request {
-  bru.setEnvVar("persistent-env-test", "persistent-env-test-value");
-}
--- a/e2e-tests/persistent-env-tests/collection/request.bru
+++ b/e2e-tests/persistent-env-tests/collection/request.bru
@@ -1,15 +0,0 @@
-meta {
-  name: ping
-  type: http
-  seq: 1
-}
-
-get {
-  url: {{host}}/ping
-  body: none
-  auth: none
-}
-
-script:pre-request {
-  bru.setEnvVar("persistent-env-test", "persistent-env-test-value", { persist: true });
-}
--- a/e2e-tests/persistent-env-tests/init-user-data/preferences.json
+++ b/e2e-tests/persistent-env-tests/init-user-data/preferences.json
@@ -1,6 +0,0 @@
-{
-    "maximized": true,
-    "lastOpenedCollections": [
-        "{{projectRoot}}/e2e-tests/persistent-env-tests/collection"
-    ]
-}
--- a/e2e-tests/preferences/verify-support-links-in-preferences.spec.js
+++ b/e2e-tests/preferences/verify-support-links-in-preferences.spec.js
@@ -1,27 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test('Should verify all support links with correct URL in preference > Support tab', async ({ page }) => {
-
-   // Open Preferences
-   await page.getByLabel('Open Preferences').click();
-   
-   // Verify Support tab
-   await page.getByRole('tab', { name: 'Support' }).click();
-
-   const locator_twitter = page.getByRole('link', { name: 'Twitter' });
-   expect(await locator_twitter.getAttribute('href')).toEqual('https://twitter.com/use_bruno');
-
-   const locator_github = page.getByRole('link', { name: 'GitHub', exact: true });
-   expect(await locator_github.getAttribute('href')).toEqual('https://github.com/usebruno/bruno');
-
-   const locator_discord = page.getByRole('link', { name: 'Discord', exact: true });
-   expect(await locator_discord.getAttribute('href')).toEqual('https://discord.com/invite/KgcZUncpjq');
-
-   const locator_reportissues = page.getByRole('link', { name: 'Report Issues', exact: true });
-   expect(await locator_reportissues.getAttribute('href')).toEqual('https://github.com/usebruno/bruno/issues');
-
-   const locator_documentation = page.getByRole('link', { name: 'Documentation', exact: true });
-   expect(await locator_documentation.getAttribute('href')).toEqual('https://docs.usebruno.com');
-
-  
-});
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,200 +0,0 @@
-// eslint.config.js
-const { defineConfig } = require("eslint/config");
-const globals = require("globals");
-
-module.exports = defineConfig([
-  {
-    files: ["packages/bruno-app/**/*.{js,jsx,ts}"],
-    ignores: ["**/*.config.js", "**/public/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.jest,
-        global: false,
-        require: false,
-        Buffer: false,
-        process: false,
-        ipcRenderer: false
-      },
-      parserOptions: {
-        ecmaFeatures: {
-          jsx: true,
-        },
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    // It prevents lint errors when using CommonJS exports (module.exports) in Jest mocks.
-    files: ["packages/bruno-app/src/test-utils/mocks/codemirror.js"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-cli/**/*.js"],
-    ignores: ["**/*.config.js"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parserOptions: {
-        ecmaVersion: "latest"
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-common/**/*.ts"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parser: require("@typescript-eslint/parser"),
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-        project: "./packages/bruno-common/tsconfig.json",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-converters/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-electron/**/*.js"],
-    ignores: ["**/*.config.js", "**/web/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-filestore/**/*.ts"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parser: require("@typescript-eslint/parser"),
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-        project: "./packages/bruno-filestore/tsconfig.json",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-js/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-        window: false,
-        self: false,
-        HTMLElement: false,
-        typeDetectGlobalObject: false
-      },
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-lang/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-requests/**/*.ts"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parser: require("@typescript-eslint/parser"),
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-        project: "./packages/bruno-requests/tsconfig.json",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-  {
-    files: ["packages/bruno-requests/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
-    },
-    rules: {
-      "no-undef": "error",
-    },
-  },
-]);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,34 +6,24 @@
    "packages/bruno-electron",
    "packages/bruno-cli",
    "packages/bruno-common",
-    "packages/bruno-converters",
    "packages/bruno-schema",
    "packages/bruno-query",
    "packages/bruno-js",
    "packages/bruno-lang",
    "packages/bruno-tests",
    "packages/bruno-toml",
-    "packages/bruno-graphql-docs",
-    "packages/bruno-requests",
-    "packages/bruno-filestore"
+    "packages/bruno-graphql-docs"
  ],
  "homepage": "https://usebruno.com",
  "devDependencies": {
    "@faker-js/faker": "^7.6.0",
    "@jest/globals": "^29.2.0",
-    "@playwright/test": "^1.51.1",
-    "@rollup/plugin-json": "^6.1.0",
+    "@playwright/test": "^1.27.1",
    "@types/jest": "^29.5.11",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
-    "@typescript-eslint/parser": "^8.39.0",
    "concurrently": "^8.2.2",
-    "eslint": "^9.26.0",
    "fs-extra": "^11.1.1",
-    "globals": "^16.1.0",
+    "husky": "^8.0.3",
    "jest": "^29.2.0",
-    "lodash-es": "^4.17.21",
-    "playwright": "^1.51.1",
    "pretty-quick": "^3.1.3",
    "randomstring": "^1.2.2",
    "rimraf": "^6.0.1",
@@ -41,19 +31,13 @@
  },
  "scripts": {
    "setup": "node ./scripts/setup.js",
-    "watch:converters": "npm run watch --workspace=packages/bruno-converters",
    "dev": "concurrently --kill-others \"npm run dev:web\" \"npm run dev:electron\"",
-    "watch": "npm run dev:watch",
-    "dev:watch": "node ./scripts/dev-hot-reload.js",
    "dev:web": "npm run dev --workspace=packages/bruno-app",
    "build:web": "npm run build --workspace=packages/bruno-app",
    "prettier:web": "npm run prettier --workspace=packages/bruno-app",
    "dev:electron": "npm run dev --workspace=packages/bruno-electron",
    "dev:electron:debug": "npm run debug --workspace=packages/bruno-electron",
    "build:bruno-common": "npm run build --workspace=packages/bruno-common",
-    "build:bruno-requests": "npm run build --workspace=packages/bruno-requests",
-    "build:bruno-filestore": "npm run build --workspace=packages/bruno-filestore",
-    "build:bruno-converters": "npm run build --workspace=packages/bruno-converters",
    "build:bruno-query": "npm run build --workspace=packages/bruno-query",
    "build:graphql-docs": "npm run build --workspace=packages/bruno-graphql-docs",
    "build:electron": "node ./scripts/build-electron.js",
@@ -63,18 +47,13 @@
    "build:electron:deb": "./scripts/build-electron.sh deb",
    "build:electron:rpm": "./scripts/build-electron.sh rpm",
    "build:electron:snap": "./scripts/build-electron.sh snap",
-    "watch:common": "npm run watch --workspace=packages/bruno-common",
-    "test:codegen": "node playwright/codegen.ts",
-    "test:e2e": "playwright test",
+    "test:codegen": "npm run dev:web & node ./scripts/playwright-codegen.js",
+    "test:e2e": "npx playwright test",
+    "test:report": "npx playwright show-report",
    "test:prettier:web": "npm run test:prettier --workspace=packages/bruno-app",
-    "lint": "node --max_old_space_size=4096 $(npx which eslint)"
+    "prepare": "husky install"
  },
  "overrides": {
-    "rollup": "3.29.5",
-    "electron-store": {
-      "conf": {
-        "json-schema-typed": "8.0.1"
-      }
-    }
+    "rollup": "3.29.5"
  }
 }
--- a/packages/bruno-app/.babelrc
+++ b/packages/bruno-app/.babelrc
@@ -1,4 +1,4 @@
 {
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "presets": ["@babel/preset-env"],
  "plugins": [["styled-components", { "ssr": true }]]
 }
--- a/packages/bruno-app/babel.config.js
+++ b/packages/bruno-app/babel.config.js
@@ -1,9 +0,0 @@
-module.exports = {
-  presets: [
-    '@babel/preset-env',
-    ['@babel/preset-react', {
-      runtime: 'automatic'
-    }]
-  ],
-  plugins: ['babel-plugin-styled-components']
-};
--- a/packages/bruno-app/jest.config.js
+++ b/packages/bruno-app/jest.config.js
@@ -1,11 +1,5 @@
 module.exports = {
  rootDir: '.',
-  transform: {
-    '^.+\\.[jt]sx?$': 'babel-jest',
-  },
-  transformIgnorePatterns: [
-    "/node_modules/(?!strip-json-comments|nanoid|xml-formatter)/",
-  ],
  moduleNameMapper: {
    '^assets/(.*)$': '<rootDir>/src/assets/$1',
    '^components/(.*)$': '<rootDir>/src/components/$1',
@@ -14,17 +8,9 @@ module.exports = {
    '^api/(.*)$': '<rootDir>/src/api/$1',
    '^pageComponents/(.*)$': '<rootDir>/src/pageComponents/$1',
    '^providers/(.*)$': '<rootDir>/src/providers/$1',
-    '^utils/(.*)$': '<rootDir>/src/utils/$1',
-    '^test-utils/(.*)$': '<rootDir>/src/test-utils/$1'
+    '^utils/(.*)$': '<rootDir>/src/utils/$1'
  },
  clearMocks: true,
  moduleDirectories: ['node_modules', 'src'],
-  testEnvironment: 'jsdom',
-  setupFilesAfterEnv: ['@testing-library/jest-dom'],
-  setupFiles: [
-    '<rootDir>/jest.setup.js',
-  ],
-  testMatch: [
-    '<rootDir>/src/**/*.spec.[jt]s?(x)'
-  ]
-};
+  testEnvironment: 'node'
+};
--- a/packages/bruno-app/jest.setup.js
+++ b/packages/bruno-app/jest.setup.js
@@ -1,11 +0,0 @@
-jest.mock('nanoid', () => {
-  return {
-    nanoid: () => {}
-  };
-});
-
-jest.mock('strip-json-comments', () => {
-  return {
-    stripJsonComments: (str) => str
-  };
-});
--- a/packages/bruno-app/jsconfig.json
+++ b/packages/bruno-app/jsconfig.json
@@ -6,7 +6,6 @@
    "baseUrl": "./",
    "paths": {
      "assets/*": ["src/assets/*"],
-      "ui/*": ["src/ui/*"],
      "components/*": ["src/components/*"],
      "hooks/*": ["src/hooks/*"],
      "themes/*": ["src/themes/*"],
--- a/packages/bruno-app/package.json
+++ b/packages/bruno-app/package.json
@@ -1,7 +1,6 @@
 {
  "name": "@usebruno/app",
  "version": "2.0.0",
-  "license": "MIT",
  "private": true,
  "scripts": {
    "dev": "rsbuild dev",
@@ -12,6 +11,7 @@
    "prettier": "prettier --write \"./src/**/*.{js,jsx,json,ts,tsx}\""
  },
  "dependencies": {
+    "@babel/preset-env": "^7.26.0",
    "@fontsource/inter": "^5.0.15",
    "@prantlf/jsonlint": "^16.0.0",
    "@reduxjs/toolkit": "^1.8.0",
@@ -67,54 +67,39 @@
    "react-hot-toast": "^2.4.0",
    "react-i18next": "^15.0.1",
    "react-inspector": "^6.0.2",
-    "react-json-view": "^1.21.3",
    "react-pdf": "9.1.1",
    "react-player": "^2.16.0",
    "react-redux": "^7.2.9",
    "react-tooltip": "^5.5.2",
    "sass": "^1.46.0",
    "semver": "^7.7.1",
-    "shell-quote": "^1.8.3",
    "strip-json-comments": "^5.0.1",
    "styled-components": "^5.3.3",
    "system": "^2.0.1",
    "url": "^0.11.3",
    "xml-formatter": "^3.5.0",
+    "yargs-parser": "^21.1.1",
    "yup": "^0.32.11"
  },
  "devDependencies": {
-    "@babel/core": "^7.27.1",
-    "@babel/preset-env": "^7.27.2",
-    "@babel/preset-react": "^7.27.1",
    "@rsbuild/core": "^1.1.2",
    "@rsbuild/plugin-babel": "^1.0.3",
    "@rsbuild/plugin-node-polyfill": "^1.2.0",
    "@rsbuild/plugin-react": "^1.0.7",
    "@rsbuild/plugin-sass": "^1.1.0",
    "@rsbuild/plugin-styled-components": "1.1.0",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.3.0",
    "autoprefixer": "10.4.20",
-    "babel-jest": "^29.7.0",
    "babel-plugin-react-compiler": "19.0.0-beta-a7bf2bd-20241110",
-    "babel-plugin-styled-components": "^2.1.4",
    "cross-env": "^7.0.3",
    "css-loader": "7.1.2",
    "file-loader": "^6.2.0",
    "html-loader": "^3.0.1",
    "html-webpack-plugin": "^5.5.0",
-    "jest-environment-jsdom": "^29.7.0",
    "mini-css-extract-plugin": "^2.4.5",
    "postcss": "8.4.47",
    "style-loader": "^3.3.1",
    "tailwindcss": "^3.4.1",
    "webpack": "^5.64.4",
    "webpack-cli": "^4.9.1"
-  },
-  "overrides": {
-    "httpsnippet": {
-      "form-data": "4.0.4"
-    }
  }
 }
--- a/packages/bruno-app/rsbuild.config.mjs
+++ b/packages/bruno-app/rsbuild.config.mjs
@@ -19,12 +19,7 @@ export default defineConfig({
    })
  ],
  source: {
-    tsconfigPath: './jsconfig.json', // Specifies the path to the JavaScript/TypeScript configuration file,
-    exclude: [
-      '**/test-utils/**',
-      '**/*.test.*',
-      '**/*.spec.*'
-    ]
+    tsconfigPath: './jsconfig.json', // Specifies the path to the JavaScript/TypeScript configuration file
  },
  html: {
    title: 'Bruno'
@@ -39,16 +34,6 @@ export default defineConfig({
          },
        },
      },
-      ignoreWarnings: [
-        (warning) =>  warning.message.includes('Critical dependency: the request of a dependency is an expression') && warning?.moduleDescriptor?.name?.includes('flow-parser')
-      ],
-      // Add externals configuration to exclude Node.js libraries
-      externals: {
-        // List specific Node.js modules you want to exclude
-        // Format: 'module-name': 'commonjs module-name'
-        'worker_threads': 'commonjs worker_threads',
-        // 'path': 'commonjs path'
-      }
    },
  }
 });
--- a/packages/bruno-app/src/components/BulkEditor/index.js
+++ b/packages/bruno-app/src/components/BulkEditor/index.js
@@ -1,40 +0,0 @@
-import React, { useMemo } from 'react';
-import CodeEditor from 'components/CodeEditor';
-import { useTheme } from 'providers/Theme';
-import { useSelector } from 'react-redux';
-import { parseBulkKeyValue, serializeBulkKeyValue } from 'utils/common/bulkKeyValueUtils';
-
-const BulkEditor = ({ params, onChange, onToggle, onSave, onRun }) => {
-  const preferences = useSelector((state) => state.app.preferences);
-  const { displayedTheme } = useTheme();
-
-  const parsedParams = useMemo(() => serializeBulkKeyValue(params), [params]);
-
-  const handleEdit = (value) => {
-    const parsed = parseBulkKeyValue(value);
-    onChange(parsed);
-  };
-
-  return (
-    <>
-      <div className="h-[200px]">
-        <CodeEditor
-          mode="text/plain"
-          theme={displayedTheme}
-          font={preferences.codeFont || 'default'}
-          value={parsedParams}
-          onEdit={handleEdit}
-          onSave={onSave}
-          onRun={onRun}
-        />
-      </div>
-      <div className="flex btn-action justify-between items-center mt-3">
-        <button className="text-link select-none ml-auto" onClick={onToggle}>
-          Key/Value Edit
-        </button>
-      </div>
-    </>
-  );
-};
-
-export default BulkEditor;
--- a/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
@@ -102,13 +102,6 @@ const StyledWrapper = styled.div`
  .cm-s-default span.cm-variable {
    color: #397d13 !important;
  }
-  
-  //matching bracket fix
-  .CodeMirror-matchingbracket {
-    background: #5cc0b48c !important;
-    text-decoration:unset;
-  }
-
 `;

 export default StyledWrapper;
--- a/packages/bruno-app/src/components/CodeEditor/index.js
+++ b/packages/bruno-app/src/components/CodeEditor/index.js
@@ -8,19 +8,116 @@
 import React from 'react';
 import { isEqual, escapeRegExp } from 'lodash';
 import { defineCodeMirrorBrunoVariablesMode } from 'utils/common/codemirror';
-import { setupAutoComplete } from 'utils/codemirror/autocomplete';
 import StyledWrapper from './StyledWrapper';
 import * as jsonlint from '@prantlf/jsonlint';
 import { JSHINT } from 'jshint';
 import stripJsonComments from 'strip-json-comments';
 import { getAllVariables } from 'utils/collections';

-const CodeMirror = require('codemirror');
-window.jsonlint = jsonlint;
-window.JSHINT = JSHINT;
-
+let CodeMirror;
+const SERVER_RENDERED = typeof window === 'undefined' || global['PREVENT_CODEMIRROR_RENDER'] === true;
 const TAB_SIZE = 2;

+if (!SERVER_RENDERED) {
+  CodeMirror = require('codemirror');
+  window.jsonlint = jsonlint;
+  window.JSHINT = JSHINT;
+  //This should be done dynamically if possible
+  const hintWords = [
+    'res',
+    'res.status',
+    'res.statusText',
+    'res.headers',
+    'res.body',
+    'res.responseTime',
+    'res.getStatus()',
+    'res.getStatusText()',
+    'res.getHeader(name)',
+    'res.getHeaders()',
+    'res.getBody()',
+    'res.getResponseTime()',
+    'req',
+    'req.url',
+    'req.method',
+    'req.headers',
+    'req.body',
+    'req.timeout',
+    'req.getUrl()',
+    'req.setUrl(url)',
+    'req.getMethod()',
+    'req.getAuthMode()',
+    'req.setMethod(method)',
+    'req.getHeader(name)',
+    'req.getHeaders()',
+    'req.setHeader(name, value)',
+    'req.setHeaders(data)',
+    'req.getBody()',
+    'req.setBody(data)',
+    'req.setMaxRedirects(maxRedirects)',
+    'req.getTimeout()',
+    'req.setTimeout(timeout)',
+    'req.getExecutionMode()',
+    'bru',
+    'bru.cwd()',
+    'bru.getEnvName()',
+    'bru.getProcessEnv(key)',
+    'bru.hasEnvVar(key)',
+    'bru.getEnvVar(key)',
+    'bru.getFolderVar(key)',
+    'bru.getCollectionVar(key)',
+    'bru.setEnvVar(key,value)',
+    'bru.deleteEnvVar(key)',
+    'bru.hasVar(key)',
+    'bru.getVar(key)',
+    'bru.setVar(key,value)',
+    'bru.deleteVar(key)',
+    'bru.deleteAllVars()',
+    'bru.setNextRequest(requestName)',
+    'req.disableParsingResponseJson()',
+    'bru.getRequestVar(key)',
+    'bru.runRequest(requestPathName)',
+    'bru.getAssertionResults()',
+    'bru.getTestResults()',
+    'bru.sleep(ms)',
+    'bru.getGlobalEnvVar(key)',
+    'bru.setGlobalEnvVar(key, value)',
+    'bru.runner',
+    'bru.runner.setNextRequest(requestName)',
+    'bru.runner.skipRequest()',
+    'bru.runner.stopExecution()'
+  ];
+  CodeMirror.registerHelper('hint', 'brunoJS', (editor, options) => {
+    const cursor = editor.getCursor();
+    const currentLine = editor.getLine(cursor.line);
+    let startBru = cursor.ch;
+    let endBru = startBru;
+    while (endBru < currentLine.length && /[\w.]/.test(currentLine.charAt(endBru))) ++endBru;
+    while (startBru && /[\w.]/.test(currentLine.charAt(startBru - 1))) --startBru;
+    let curWordBru = startBru != endBru && currentLine.slice(startBru, endBru);
+
+    let start = cursor.ch;
+    let end = start;
+    while (end < currentLine.length && /[\w]/.test(currentLine.charAt(end))) ++end;
+    while (start && /[\w]/.test(currentLine.charAt(start - 1))) --start;
+    const jsHinter = CodeMirror.hint.javascript;
+    let result = jsHinter(editor) || { list: [] };
+    result.to = CodeMirror.Pos(cursor.line, end);
+    result.from = CodeMirror.Pos(cursor.line, start);
+    if (curWordBru) {
+      hintWords.forEach((h) => {
+        if (h.includes('.') == curWordBru.includes('.') && h.startsWith(curWordBru)) {
+          result.list.push(curWordBru.includes('.') ? h.split('.')?.at(-1) : h);
+        }
+      });
+      result.list?.sort();
+    }
+    return result;
+  });
+  CodeMirror.commands.autocomplete = (cm, hint, options) => {
+    cm.showHint({ hint, ...options });
+  };
+}
+
 export default class CodeEditor extends React.Component {
  constructor(props) {
    super(props);
@@ -40,17 +137,12 @@ export default class CodeEditor extends React.Component {
  }

  componentDidMount() {
-    const variables = getAllVariables(this.props.collection, this.props.item);
-
    const editor = (this.editor = CodeMirror(this._node, {
      value: this.props.value || '',
      lineNumbers: true,
      lineWrapping: true,
      tabSize: TAB_SIZE,
      mode: this.props.mode || 'application/ld+json',
-      brunoVarInfo: {
-        variables
-      },
      keyMap: 'sublime',
      autoCloseBrackets: true,
      matchBrackets: true,
@@ -182,24 +274,30 @@ export default class CodeEditor extends React.Component {
      }
      return found;
    });
-    
    if (editor) {
      editor.setOption('lint', this.props.mode && editor.getValue().trim().length > 0 ? this.lintOptions : false);
      editor.on('change', this._onEdit);
      this.addOverlay();
-
-      const getAllVariablesHandler = () => getAllVariables(this.props.collection, this.props.item);
-      
-      // Setup AutoComplete Helper for all modes
-      const autoCompleteOptions = {
-        showHintsFor: this.props.showHintsFor,
-        getAllVariables: getAllVariablesHandler
-      };
-
-      this.brunoAutoCompleteCleanup = setupAutoComplete(
-        editor,
-        autoCompleteOptions
-      );
+    }
+    if (this.props.mode == 'javascript') {
+      editor.on('keyup', function (cm, event) {
+        const cursor = editor.getCursor();
+        const currentLine = editor.getLine(cursor.line);
+        let start = cursor.ch;
+        let end = start;
+        while (end < currentLine.length && /[^{}();\s\[\]\,]/.test(currentLine.charAt(end))) ++end;
+        while (start && /[^{}();\s\[\]\,]/.test(currentLine.charAt(start - 1))) --start;
+        let curWord = start != end && currentLine.slice(start, end);
+        // Qualify if autocomplete will be shown
+        if (
+          /^(?!Shift|Tab|Enter|Escape|ArrowUp|ArrowDown|ArrowLeft|ArrowRight|Meta|Alt|Home|End\s)\w*/.test(event.key) &&
+          curWord.length > 0 &&
+          !/\/\/|\/\*|.*{{|`[^$]*{|`[^{]*$/.test(currentLine.slice(0, end)) &&
+          /(?<!\d)[a-zA-Z\._]$/.test(curWord)
+        ) {
+          CodeMirror.commands.autocomplete(cm, CodeMirror.hint.brunoJS, { completeSingle: false });
+        }
+      });
    }
  }

@@ -240,9 +338,6 @@ export default class CodeEditor extends React.Component {
    }

    this._unbindSearchHandler();
-    if (this.brunoAutoCompleteCleanup) {
-      this.brunoAutoCompleteCleanup();
-    }
  }

  render() {
@@ -267,7 +362,7 @@ export default class CodeEditor extends React.Component {
    let variables = getAllVariables(this.props.collection, this.props.item);
    this.variables = variables;

-    defineCodeMirrorBrunoVariablesMode(variables, mode, false, this.props.enableVariableHighlighting);
+    defineCodeMirrorBrunoVariablesMode(variables, mode);
    this.editor.setOption('mode', 'brunovariables');
  };

--- a/packages/bruno-app/src/components/CodeEditor/index.spec.js
+++ b/packages/bruno-app/src/components/CodeEditor/index.spec.js
@@ -1,51 +0,0 @@
-import React from 'react';
-import { render, act } from '@testing-library/react';
-import CodeEditor from './index';
-import { ThemeProvider } from 'styled-components';
-
-jest.mock('codemirror', () => {
-  const codemirror = require('test-utils/mocks/codemirror');
-  return codemirror;
-});
-
-const MOCK_THEME = {
-  codemirror: {
-    bg: "#1e1e1e",
-    border: "#333",
-  },
-  textLink: "#007acc",
-};
-
-const setupEditorState = (editor, { value, cursorPosition }) => {
-  editor._currentValue = value;
-  editor.getCursor.mockReturnValue({ line: 0, ch: cursorPosition });
-  editor.getRange.mockImplementation((from, to) => {
-    if (from.line === 0 && from.ch === 0 && to.line === 0 && to.ch === cursorPosition) {
-      return value;
-    }
-    return editor._currentValue.slice(from.ch, to.ch);
-  });
-
-  editor.state = {
-    completionActive: null,
-  }
-};
-
-const setupEditorWithRef = () => {
-  const ref = React.createRef();
-  const { rerender } = render(
-    <ThemeProvider theme={MOCK_THEME}>
-      <CodeEditor ref={ref} />
-    </ThemeProvider>
-  );
-  return { ref, rerender };
-};
-
-describe('CodeEditor', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.resetModules();
-  });
-
-  it("add CodeEditor related tests here", () => {});
-});
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/index.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { useDetectSensitiveField } from 'hooks/useDetectSensitiveField';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
@@ -14,8 +12,6 @@ const AwsV4Auth = ({ collection }) => {
  const { storedTheme } = useTheme();

  const awsv4Auth = get(collection, 'root.request.auth.awsv4', {});
-  const { isSensitive } = useDetectSensitiveField(collection);
-  const { showWarning, warningMessage } = isSensitive(awsv4Auth?.secretAccessKey);

  const handleSave = () => dispatch(saveCollectionRoot(collection.uid));

@@ -25,12 +21,12 @@ const AwsV4Auth = ({ collection }) => {
        mode: 'awsv4',
        collectionUid: collection.uid,
        content: {
-          accessKeyId: accessKeyId || '',
-          secretAccessKey: awsv4Auth.secretAccessKey || '',
-          sessionToken: awsv4Auth.sessionToken || '',
-          service: awsv4Auth.service || '',
-          region: awsv4Auth.region || '',
-          profileName: awsv4Auth.profileName || ''
+          accessKeyId: accessKeyId,
+          secretAccessKey: awsv4Auth.secretAccessKey,
+          sessionToken: awsv4Auth.sessionToken,
+          service: awsv4Auth.service,
+          region: awsv4Auth.region,
+          profileName: awsv4Auth.profileName
        }
      })
    );
@@ -42,12 +38,12 @@ const AwsV4Auth = ({ collection }) => {
        mode: 'awsv4',
        collectionUid: collection.uid,
        content: {
-          accessKeyId: awsv4Auth.accessKeyId || '',
-          secretAccessKey: secretAccessKey || '',
-          sessionToken: awsv4Auth.sessionToken || '',
-          service: awsv4Auth.service || '',
-          region: awsv4Auth.region || '',
-          profileName: awsv4Auth.profileName || ''
+          accessKeyId: awsv4Auth.accessKeyId,
+          secretAccessKey: secretAccessKey,
+          sessionToken: awsv4Auth.sessionToken,
+          service: awsv4Auth.service,
+          region: awsv4Auth.region,
+          profileName: awsv4Auth.profileName
        }
      })
    );
@@ -59,12 +55,12 @@ const AwsV4Auth = ({ collection }) => {
        mode: 'awsv4',
        collectionUid: collection.uid,
        content: {
-          accessKeyId: awsv4Auth.accessKeyId || '',
-          secretAccessKey: awsv4Auth.secretAccessKey || '',
-          sessionToken: sessionToken || '',
-          service: awsv4Auth.service || '',
-          region: awsv4Auth.region || '',
-          profileName: awsv4Auth.profileName || ''
+          accessKeyId: awsv4Auth.accessKeyId,
+          secretAccessKey: awsv4Auth.secretAccessKey,
+          sessionToken: sessionToken,
+          service: awsv4Auth.service,
+          region: awsv4Auth.region,
+          profileName: awsv4Auth.profileName
        }
      })
    );
@@ -76,12 +72,12 @@ const AwsV4Auth = ({ collection }) => {
        mode: 'awsv4',
        collectionUid: collection.uid,
        content: {
-          accessKeyId: awsv4Auth.accessKeyId || '',
-          secretAccessKey: awsv4Auth.secretAccessKey || '',
-          sessionToken: awsv4Auth.sessionToken || '',
-          service: service || '',
-          region: awsv4Auth.region || '',
-          profileName: awsv4Auth.profileName || ''
+          accessKeyId: awsv4Auth.accessKeyId,
+          secretAccessKey: awsv4Auth.secretAccessKey,
+          sessionToken: awsv4Auth.sessionToken,
+          service: service,
+          region: awsv4Auth.region,
+          profileName: awsv4Auth.profileName
        }
      })
    );
@@ -93,12 +89,12 @@ const AwsV4Auth = ({ collection }) => {
        mode: 'awsv4',
        collectionUid: collection.uid,
        content: {
-          accessKeyId: awsv4Auth.accessKeyId || '',
-          secretAccessKey: awsv4Auth.secretAccessKey || '',
-          sessionToken: awsv4Auth.sessionToken || '',
-          service: awsv4Auth.service || '',
-          region: region || '',
-          profileName: awsv4Auth.profileName || ''
+          accessKeyId: awsv4Auth.accessKeyId,
+          secretAccessKey: awsv4Auth.secretAccessKey,
+          sessionToken: awsv4Auth.sessionToken,
+          service: awsv4Auth.service,
+          region: region,
+          profileName: awsv4Auth.profileName
        }
      })
    );
@@ -110,12 +106,12 @@ const AwsV4Auth = ({ collection }) => {
        mode: 'awsv4',
        collectionUid: collection.uid,
        content: {
-          accessKeyId: awsv4Auth.accessKeyId || '',
-          secretAccessKey: awsv4Auth.secretAccessKey || '',
-          sessionToken: awsv4Auth.sessionToken || '',
-          service: awsv4Auth.service || '',
-          region: awsv4Auth.region || '',
-          profileName: profileName || ''
+          accessKeyId: awsv4Auth.accessKeyId,
+          secretAccessKey: awsv4Auth.secretAccessKey,
+          sessionToken: awsv4Auth.sessionToken,
+          service: awsv4Auth.service,
+          region: awsv4Auth.region,
+          profileName: profileName
        }
      })
    );
@@ -135,7 +131,7 @@ const AwsV4Auth = ({ collection }) => {
      </div>

      <label className="block font-medium mb-2">Secret Access Key</label>
-      <div className="single-line-editor-wrapper mb-2 flex items-center">
+      <div className="single-line-editor-wrapper mb-2">
        <SingleLineEditor
          value={awsv4Auth.secretAccessKey || ''}
          theme={storedTheme}
@@ -144,7 +140,6 @@ const AwsV4Auth = ({ collection }) => {
          collection={collection}
          isSecret={true}
        />
-        {showWarning && <SensitiveFieldWarning fieldName="awsv4-secret-access-key" warningMessage={warningMessage} />}
      </div>

      <label className="block font-medium mb-2">Session Token</label>
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/index.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { useDetectSensitiveField } from 'hooks/useDetectSensitiveField';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
@@ -14,8 +12,6 @@ const BasicAuth = ({ collection }) => {
  const { storedTheme } = useTheme();

  const basicAuth = get(collection, 'root.request.auth.basic', {});
-  const { isSensitive } = useDetectSensitiveField(collection);
-  const { showWarning, warningMessage } = isSensitive(basicAuth?.password);

  const handleSave = () => dispatch(saveCollectionRoot(collection.uid));

@@ -25,8 +21,8 @@ const BasicAuth = ({ collection }) => {
        mode: 'basic',
        collectionUid: collection.uid,
        content: {
-          username: username || '',
-          password: basicAuth.password || ''
+          username: username,
+          password: basicAuth.password
        }
      })
    );
@@ -38,8 +34,8 @@ const BasicAuth = ({ collection }) => {
        mode: 'basic',
        collectionUid: collection.uid,
        content: {
-          username: basicAuth.username || '',
-          password: password || ''
+          username: basicAuth.username,
+          password: password
        }
      })
    );
@@ -59,7 +55,7 @@ const BasicAuth = ({ collection }) => {
      </div>

      <label className="block font-medium mb-2">Password</label>
-      <div className="single-line-editor-wrapper flex items-center">
+      <div className="single-line-editor-wrapper">
        <SingleLineEditor
          value={basicAuth.password || ''}
          theme={storedTheme}
@@ -68,7 +64,6 @@ const BasicAuth = ({ collection }) => {
          collection={collection}
          isSecret={true}
        />
-        {showWarning && <SensitiveFieldWarning fieldName="basic-password" warningMessage={warningMessage} />}
      </div>
    </StyledWrapper>
  );
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/index.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { useDetectSensitiveField } from 'hooks/useDetectSensitiveField';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
@@ -14,8 +12,6 @@ const BearerAuth = ({ collection }) => {
  const { storedTheme } = useTheme();

  const bearerToken = get(collection, 'root.request.auth.bearer.token', '');
-  const { isSensitive } = useDetectSensitiveField(collection);
-  const { showWarning, warningMessage } = isSensitive(bearerToken);

  const handleSave = () => dispatch(saveCollectionRoot(collection.uid));

@@ -34,7 +30,7 @@ const BearerAuth = ({ collection }) => {
  return (
    <StyledWrapper className="mt-2 w-full">
      <label className="block font-medium mb-2">Token</label>
-      <div className="single-line-editor-wrapper flex items-center">
+      <div className="single-line-editor-wrapper">
        <SingleLineEditor
          value={bearerToken}
          theme={storedTheme}
@@ -43,7 +39,6 @@ const BearerAuth = ({ collection }) => {
          collection={collection}
          isSecret={true}
        />
-        {showWarning && <SensitiveFieldWarning fieldName="bearer-token" warningMessage={warningMessage} />}
      </div>
    </StyledWrapper>
  );
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/index.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { useDetectSensitiveField } from 'hooks/useDetectSensitiveField';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
@@ -14,8 +12,6 @@ const DigestAuth = ({ collection }) => {
  const { storedTheme } = useTheme();

  const digestAuth = get(collection, 'root.request.auth.digest', {});
-  const { isSensitive } = useDetectSensitiveField(collection);
-  const { showWarning, warningMessage } = isSensitive(digestAuth?.password);

  const handleSave = () => dispatch(saveCollectionRoot(collection.uid));

@@ -25,8 +21,8 @@ const DigestAuth = ({ collection }) => {
        mode: 'digest',
        collectionUid: collection.uid,
        content: {
-          username: username || '',
-          password: digestAuth.password || ''
+          username: username,
+          password: digestAuth.password
        }
      })
    );
@@ -38,8 +34,8 @@ const DigestAuth = ({ collection }) => {
        mode: 'digest',
        collectionUid: collection.uid,
        content: {
-          username: digestAuth.username || '',
-          password: password || ''
+          username: digestAuth.username,
+          password: password
        }
      })
    );
@@ -59,7 +55,7 @@ const DigestAuth = ({ collection }) => {
      </div>

      <label className="block font-medium mb-2">Password</label>
-      <div className="single-line-editor-wrapper flex items-center">
+      <div className="single-line-editor-wrapper">
        <SingleLineEditor
          value={digestAuth.password || ''}
          theme={storedTheme}
@@ -68,7 +64,6 @@ const DigestAuth = ({ collection }) => {
          collection={collection}
          isSecret={true}
        />
-        {showWarning && <SensitiveFieldWarning fieldName="digest-password" warningMessage={warningMessage} />}
      </div>
    </StyledWrapper>
  );
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { useDetectSensitiveField } from 'hooks/useDetectSensitiveField';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
@@ -20,8 +18,6 @@ const NTLMAuth = ({ collection }) => {
  const { storedTheme } = useTheme();

  const ntlmAuth = get(collection, 'root.request.auth.ntlm', {});
-  const { isSensitive } = useDetectSensitiveField(collection);
-  const { showWarning, warningMessage } = isSensitive(ntlmAuth?.password);

  const handleSave = () => dispatch(saveCollectionRoot(collection.uid));

@@ -32,9 +28,9 @@ const NTLMAuth = ({ collection }) => {
        mode: 'ntlm',
        collectionUid: collection.uid,
        content: {
-          username: username || '',
-          password: ntlmAuth.password || '',
-          domain: ntlmAuth.domain || ''
+          username: username,
+          password: ntlmAuth.password,
+          domain: ntlmAuth.domain

        }
      })
@@ -47,9 +43,9 @@ const NTLMAuth = ({ collection }) => {
        mode: 'ntlm',
        collectionUid: collection.uid,
        content: {
-          username: ntlmAuth.username || '',
-          password: password || '',
-          domain: ntlmAuth.domain || ''
+          username: ntlmAuth.username,
+          password: password,
+          domain: ntlmAuth.domain
        }
      })
    );
@@ -61,9 +57,9 @@ const NTLMAuth = ({ collection }) => {
        mode: 'ntlm',
        collectionUid: collection.uid,
        content: {
-          username: ntlmAuth.username || '',
-          password: ntlmAuth.password || '',
-          domain: domain || ''
+          username: ntlmAuth.username,
+          password: ntlmAuth.password,
+          domain: domain
        }
      })
    );
@@ -86,7 +82,7 @@ const NTLMAuth = ({ collection }) => {
      </div>

      <label className="block font-medium mb-2">Password</label>
-      <div className="single-line-editor-wrapper flex items-center">
+      <div className="single-line-editor-wrapper">
        <SingleLineEditor
          value={ntlmAuth.password || ''}
          theme={storedTheme}
@@ -95,7 +91,6 @@ const NTLMAuth = ({ collection }) => {
          collection={collection}
          isSecret={true}
        />
-        {showWarning && <SensitiveFieldWarning fieldName="ntlm-password" warningMessage={warningMessage} />}
      </div>

      <label className="block font-medium mb-2">Domain</label>
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js
@@ -7,7 +7,6 @@ import { updateCollectionAuth } from 'providers/ReduxStore/slices/collections/in
 import { useDispatch } from 'react-redux';
 import OAuth2PasswordCredentials from 'components/RequestPane/Auth/OAuth2/PasswordCredentials/index';
 import OAuth2ClientCredentials from 'components/RequestPane/Auth/OAuth2/ClientCredentials/index';
-import OAuth2Implicit from 'components/RequestPane/Auth/OAuth2/Implicit/index';
 import GrantTypeSelector from 'components/RequestPane/Auth/OAuth2/GrantTypeSelector/index';

 const GrantTypeComponentMap = ({collection }) => {
@@ -30,9 +29,6 @@ const GrantTypeComponentMap = ({collection }) => {
    case 'client_credentials':
      return <OAuth2ClientCredentials save={save} request={request} updateAuth={updateCollectionAuth} collection={collection} />;
      break;
-    case 'implicit':
-      return <OAuth2Implicit save={save} request={request} updateAuth={updateCollectionAuth} collection={collection} />;
-      break;
    default:
      return <div>TBD</div>;
      break;
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/index.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { useDetectSensitiveField } from 'hooks/useDetectSensitiveField';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
@@ -14,8 +12,6 @@ const WsseAuth = ({ collection }) => {
  const { storedTheme } = useTheme();

  const wsseAuth = get(collection, 'root.request.auth.wsse', {});
-  const { isSensitive } = useDetectSensitiveField(collection);
-  const { showWarning, warningMessage } = isSensitive(wsseAuth?.password);

  const handleSave = () => dispatch(saveCollectionRoot(collection.uid));

@@ -25,8 +21,8 @@ const WsseAuth = ({ collection }) => {
        mode: 'wsse',
        collectionUid: collection.uid,
        content: {
-          username: username || '',
-          password: wsseAuth.password || ''
+          username,
+          password: wsseAuth.password
        }
      })
    );
@@ -38,8 +34,8 @@ const WsseAuth = ({ collection }) => {
        mode: 'wsse',
        collectionUid: collection.uid,
        content: {
-          username: wsseAuth.username || '',
-          password: password || ''
+          username: wsseAuth.username,
+          password
        }
      })
    );
@@ -59,16 +55,14 @@ const WsseAuth = ({ collection }) => {
      </div>

      <label className="block font-medium mb-2">Password</label>
-      <div className="single-line-editor-wrapper flex items-center">
+      <div className="single-line-editor-wrapper">
        <SingleLineEditor
          value={wsseAuth.password || ''}
          theme={storedTheme}
          onSave={handleSave}
          onChange={(val) => handlePasswordChange(val)}
          collection={collection}
-          isSecret={true}
        />
-        {showWarning && <SensitiveFieldWarning fieldName="wsse-password" warningMessage={warningMessage} />}
      </div>
    </StyledWrapper>
  );
--- a/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/StyledWrapper.js
@@ -38,48 +38,6 @@ const StyledWrapper = styled.div`
      outline: none !important;
    }
  }
-
-  .protocol-placeholder {
-    height: 100%;
-    position: relative;
-    display: inline-block;
-    width: 60px;
-    overflow: hidden;
-  }
-
-  .protocol-https,
-  .protocol-grpcs {
-    position: absolute;
-    right: 8px;
-    top: 0;
-    bottom: 0;
-    transition: transform 0.3s ease-in-out;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .protocol-https {
-    animation: slideUpDown 6s infinite;
-    transform: translateY(0);
-  }
-
-  .protocol-grpcs {
-    animation: slideUpDown 6s infinite 3s;
-    transform: translateY(100%);
-  }
-
-  @keyframes slideUpDown {
-    0%, 45% {
-      transform: translateY(0);
-    }
-    50%, 95% {
-      transform: translateY(100%);
-    }
-    100% {
-      transform: translateY(0);
-    }
-  }
 `;

 export default StyledWrapper;
--- a/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js
@@ -132,10 +132,7 @@ const ClientCertSettings = ({ root, clientCertConfig, onUpdate, onRemove }) => {
          </label>
          <div className="relative flex items-center">
            <div className="absolute left-0 pl-2 text-gray-400 pointer-events-none flex items-center h-full">
-              <span className="protocol-placeholder">
-                <span className="protocol-https">https://</span>
-                <span className="protocol-grpcs">grpcs://</span>
-              </span>
+              https://
            </div>
            <input
              id="domain"
--- a/packages/bruno-app/src/components/CollectionSettings/Docs/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Docs/index.js
@@ -46,7 +46,7 @@ const Docs = ({ collection }) => {
  }

  return (
-    <StyledWrapper className="h-full w-full relative flex flex-col">
+    <StyledWrapper className="mt-1 h-full w-full relative flex flex-col">
      <div className='flex flex-row w-full justify-between items-center mb-4'>
        <div className='text-lg font-medium flex items-center gap-2'>
          <IconFileText size={20} strokeWidth={1.5} />
--- a/packages/bruno-app/src/components/CollectionSettings/Grpc/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Grpc/StyledWrapper.js
@@ -1,13 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  .available-certificates {
-    background-color: ${(props) => props.theme.requestTabPanel.url.bg};
-
-    button.remove-certificate {
-      color: ${(props) => props.theme.colors.text.danger};
-    }
-  }
-`;
-
-export default StyledWrapper; 
--- a/packages/bruno-app/src/components/CollectionSettings/Grpc/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Grpc/index.js
@@ -1,263 +0,0 @@
-import React, { useState, useRef, useEffect } from 'react';
-import { useFormik } from 'formik';
-import { useDispatch } from 'react-redux';
-import StyledWrapper from './StyledWrapper';
-import toast from 'react-hot-toast';
-import { updateBrunoConfig } from 'providers/ReduxStore/slices/collections/actions';
-import cloneDeep from 'lodash/cloneDeep';
-import { IconTrash, IconFile, IconFileImport, IconAlertCircle } from '@tabler/icons';
-import { getRelativePath, getBasename, getDirPath } from 'utils/common/path';
-import { Tooltip } from 'react-tooltip';
-import { existsSync, resolvePath } from '../../../utils/filesystem';
-
-const GrpcSettings = ({ collection }) => {
-  const dispatch = useDispatch();
-  const {
-    brunoConfig: { grpc: grpcConfig = {} }
-  } = collection;
-
-  const fileInputRef = useRef(null);
-  const [protoFileValidity, setProtoFileValidity] = useState({});
-
-  const formik = useFormik({
-    enableReinitialize: true,
-    initialValues: {
-      protoFiles: grpcConfig.protoFiles || []
-    },
-    onSubmit: (newGrpcConfig) => {
-      const brunoConfig = cloneDeep(collection.brunoConfig);
-      brunoConfig.grpc = newGrpcConfig;
-      dispatch(updateBrunoConfig(brunoConfig, collection.uid));
-      toast.success('gRPC settings updated');
-    }
-  });
-
-  // Get file path using the ipcRenderer
-  const getProtoFile = (event) => {
-    const files = event?.files;
-    if (files && files.length > 0) {
-      const newProtoFiles = [...formik.values.protoFiles];
-      
-      for (let i = 0; i < files.length; i++) {
-        const filePath = window?.ipcRenderer?.getFilePath(files[i]);
-        if (filePath) {
-          const relativePath = getRelativePath(filePath, collection.pathname);
-          const protoFileObj = {
-            path: relativePath,
-            type: 'file'
-          };
-          
-          // Check if this path already exists
-          const exists = newProtoFiles.some(pf => pf.path === protoFileObj.path);
-          if (!exists) {
-            newProtoFiles.push(protoFileObj);
-          }
-        }
-      }
-      
-      formik.setFieldValue('protoFiles', newProtoFiles);
-      // Reset the file input
-      if (fileInputRef.current) {
-        fileInputRef.current.value = '';
-      }
-    }
-  };
-
-  // Handler for removing a proto file
-  const handleRemoveProtoFile = (index) => {
-    const updatedProtoFiles = [...formik.values.protoFiles];
-    updatedProtoFiles.splice(index, 1);
-    formik.setFieldValue('protoFiles', updatedProtoFiles);
-  };
-
-  // Handle the browse button click
-  const handleBrowseClick = () => {
-    if (fileInputRef.current) {
-      fileInputRef.current.click();
-    }
-  };
-
-  // Check if a proto file path is valid
-  const isProtoFileValid = async (protoFile) => {
-    try {
-      const absolutePath = await resolvePath(protoFile.path, collection.pathname);
-      return await existsSync(absolutePath);
-    } catch (error) {
-      return false;
-    }
-  };
-
-  // Validate all proto files and update state
-  useEffect(() => {
-    const validateProtoFiles = async () => {
-      const validityMap = {};
-      for (const file of formik.values.protoFiles) {
-        validityMap[file.path] = await isProtoFileValid(file);
-      }
-      setProtoFileValidity(validityMap);
-    };
-
-    validateProtoFiles();
-  }, [formik.values.protoFiles, collection.pathname]);
-
-  // Handle replacing an invalid proto file
-  const handleReplaceProtoFile = (index) => {
-    if (fileInputRef.current) {
-      fileInputRef.current.click();
-      // Store the index to replace after file selection
-      fileInputRef.current.dataset.replaceIndex = index;
-    }
-  };
-
-  // Handle file input change
-  const handleFileInputChange = (e) => {
-    const replaceIndex = e.target.dataset.replaceIndex;
-    if (replaceIndex !== undefined) {
-      // Handle replacement
-      const files = e.target.files;
-      if (files && files.length > 0) {
-        const filePath = window?.ipcRenderer?.getFilePath(files[0]);
-        if (filePath) {
-          const relativePath = getRelativePath(filePath, collection.pathname);
-          const updatedProtoFiles = [...formik.values.protoFiles];
-          updatedProtoFiles[replaceIndex] = {
-            path: relativePath,
-            type: 'file'
-          };
-          formik.setFieldValue('protoFiles', updatedProtoFiles);
-        }
-      }
-      delete e.target.dataset.replaceIndex;
-    } else {
-      getProtoFile(e.target);
-    }
-  };
-
-  return (
-    <StyledWrapper className="h-full w-full">
-      <form className="bruno-form" onSubmit={formik.handleSubmit}>
-        <div className="mb-3">
-          <label className="font-semibold text-sm mb-3 flex items-center" htmlFor="protoFiles">
-            Add Proto Files
-            <span id="proto-files-tooltip" className="ml-2">
-              <IconAlertCircle size={16} className="text-gray-500 cursor-pointer" />
-            </span>
-            <Tooltip
-              anchorId="proto-files-tooltip"
-              className="tooltip-mod font-normal"
-              html="Keep your proto files within the collection folder or the corresponding git repository to ensure paths remain valid when sharing the collection."
-            />
-          </label>
-          <div className="flex flex-col">
-            {/* Hidden file input for file selection */}
-            <input
-              type="file"
-              ref={fileInputRef}
-              style={{ display: 'none' }}
-              accept=".proto"
-              multiple
-              onChange={handleFileInputChange}
-            />
-            
-            <div className="flex flex-col gap-3">
-              {/* File selection options */}
-              <div className="flex flex-col space-y-3">
-                <div className="flex items-center">
-                  <button
-                    type="button"
-                    className="btn btn-sm btn-secondary flex items-center"
-                    onClick={handleBrowseClick}
-                  >
-                    <IconFileImport size={16} strokeWidth={1.5} className="mr-1" />
-                    Browse for proto files
-                  </button>
-                </div>
-              </div>
-              
-              {/* Divider */}
-              <div className="border-t border-neutral-600 my-2"></div>
-              
-              {/* List of added proto files */}
-              <div>
-                <div className="text-sm font-semibold mb-2 flex items-center">
-                  <IconFile size={16} strokeWidth={1.5} className="mr-1" />
-                  Added Proto Files ({formik.values.protoFiles.length})
-                </div>
-                
-                {formik.values.protoFiles.length === 0 ? (
-                  <div className="text-neutral-500 text-sm italic">No proto files added yet</div>
-                ) : (
-                  <>
-                    {formik.values.protoFiles.some(file => !protoFileValidity[file.path]) && (
-                      <div className="text-xs text-red-500 mb-2 flex items-center bg-red-50 dark:bg-red-900/20 p-2 rounded">
-                        <IconAlertCircle size={14} className="mr-1" />
-                        Some proto files cannot be found at their specified paths. Use the "Replace" option to update their locations.
-                      </div>
-                    )}
-                    <ul className="mt-4">
-                      {formik.values.protoFiles.map((file, index) => {
-                        const isValid = protoFileValidity[file.path];
-                        return (
-                          <li key={index} className="flex items-center available-certificates p-2 rounded-lg mb-2">
-                            <div className="flex items-center w-full justify-between">
-                              <div className="flex w-full items-center">
-                                <IconFile className="mr-2" size={18} strokeWidth={1.5} />
-                                <div
-                                  className="overflow-hidden text-ellipsis whitespace-nowrap max-w-[300px] text-sm"
-                                  title={file.path}
-                                >
-                                  {getBasename(file.path)}
-                                  <span className="text-xs text-neutral-500 ml-2">
-                                    {getDirPath(file.path)}
-                                  </span>
-                                </div>
-                              </div>
-                              <div className="flex w-full items-center justify-end">
-                                {!isValid && (
-                                  <div className="flex items-center mr-2">
-                                    <IconAlertCircle
-                                      size={16}
-                                      className="text-red-500"
-                                      title="Proto file not found. Click to replace."
-                                    />
-                                    <button
-                                      type="button"
-                                      className="text-xs text-red-500 ml-1 hover:underline"
-                                      onClick={() => handleReplaceProtoFile(index)}
-                                    >
-                                      Replace
-                                    </button>
-                                  </div>
-                                )}
-                                <button
-                                  type="button"
-                                  className="remove-certificate ml-2"
-                                  onClick={() => handleRemoveProtoFile(index)}
-                                  title="Remove file"
-                                >
-                                  <IconTrash size={18} strokeWidth={1.5} />
-                                </button>
-                              </div>
-                            </div>
-                          </li>
-                        );
-                      })}
-                    </ul>
-                  </>
-                )}
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div className="mt-6">
-          <button type="submit" className="submit btn btn-sm btn-secondary">
-            Save
-          </button>
-        </div>
-      </form>
-    </StyledWrapper>
-  );
-};
-
-export default GrpcSettings; 
--- a/packages/bruno-app/src/components/CollectionSettings/Headers/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Headers/index.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import get from 'lodash/get';
 import cloneDeep from 'lodash/cloneDeep';
 import { IconTrash } from '@tabler/icons';
@@ -7,30 +7,19 @@ import { useTheme } from 'providers/Theme';
 import {
  addCollectionHeader,
  updateCollectionHeader,
-  deleteCollectionHeader,
-  setCollectionHeaders
+  deleteCollectionHeader
 } from 'providers/ReduxStore/slices/collections';
 import { saveCollectionRoot } from 'providers/ReduxStore/slices/collections/actions';
 import SingleLineEditor from 'components/SingleLineEditor';
 import StyledWrapper from './StyledWrapper';
 import { headers as StandardHTTPHeaders } from 'know-your-http-well';
 import { MimeTypes } from 'utils/codemirror/autocompleteConstants';
-import BulkEditor from 'components/BulkEditor/index';
 const headerAutoCompleteList = StandardHTTPHeaders.map((e) => e.header);

 const Headers = ({ collection }) => {
  const dispatch = useDispatch();
  const { storedTheme } = useTheme();
  const headers = get(collection, 'root.request.headers', []);
-  const [isBulkEditMode, setIsBulkEditMode] = useState(false);
-
-  const toggleBulkEditMode = () => {
-    setIsBulkEditMode(!isBulkEditMode);
-  };
-
-  const handleBulkHeadersChange = (newHeaders) => {
-    dispatch(setCollectionHeaders({ collectionUid: collection.uid, headers: newHeaders }));
-  };

  const addHeader = () => {
    dispatch(
@@ -74,22 +63,6 @@ const Headers = ({ collection }) => {
    );
  };

-  if (isBulkEditMode) {
-    return (
-      <StyledWrapper className="h-full w-full">
-        <div className="text-xs mb-4 text-muted">
-          Add request headers that will be sent with every request in this collection.
-        </div>
-        <BulkEditor
-          params={headers}
-          onChange={handleBulkHeadersChange}
-          onToggle={toggleBulkEditMode}
-          onSave={handleSave}
-        />
-      </StyledWrapper>
-    );
-  }
-
  return (
    <StyledWrapper className="h-full w-full">
      <div className="text-xs mb-4 text-muted">
@@ -168,14 +141,9 @@ const Headers = ({ collection }) => {
            : null}
        </tbody>
      </table>
-      <div className="flex justify-between mt-2">
-        <button className="btn-add-header text-link pr-2 py-3 select-none" onClick={addHeader}>
-          + Add Header
-        </button>
-        <button className="text-link select-none" onClick={toggleBulkEditMode}>
-          Bulk Edit
-        </button>
-      </div>
+      <button className="btn-add-header text-link pr-2 py-3 mt-2 select-none" onClick={addHeader}>
+        + Add Header
+      </button>

      <div className="mt-6">
        <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
--- a/packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js
@@ -53,7 +53,7 @@ const Info = ({ collection }) => {
            </div>
            <div className="ml-4">
              <div className="font-semibold text-sm">Requests</div>
-              <div className="mt-1 text-sm text-muted">
+              <div className="mt-1 text-sm text-muted font-mono">
                {
                  isCollectionLoading? `${totalItems - itemsLoadingCount} out of ${totalItems} requests in the collection loaded` : `${totalRequestsInCollection} request${totalRequestsInCollection !== 1 ? 's' : ''} in collection`
                }
@@ -72,7 +72,7 @@ const Info = ({ collection }) => {
              </div>
            </div>
          </div>
-          {showShareCollectionModal && <ShareCollection collectionUid={collection.uid} onClose={handleToggleShowShareCollectionModal(false)} />}
+          {showShareCollectionModal && <ShareCollection collection={collection} onClose={handleToggleShowShareCollectionModal(false)} />}
        </div>
      </div>
    </div>
--- a/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
@@ -1,15 +1,13 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useFormik } from 'formik';
 import { useDispatch } from 'react-redux';
 import StyledWrapper from './StyledWrapper';
 import toast from 'react-hot-toast';
 import { updateBrunoConfig } from 'providers/ReduxStore/slices/collections/actions';
 import cloneDeep from 'lodash/cloneDeep';
-import { useBetaFeature, BETA_FEATURES } from 'utils/beta-features';

 const PresetsSettings = ({ collection }) => {
  const dispatch = useDispatch();
-  const isGrpcEnabled = useBetaFeature(BETA_FEATURES.GRPC);
  const {
    brunoConfig: { presets: presets = {} }
  } = collection;
@@ -17,15 +15,10 @@ const PresetsSettings = ({ collection }) => {
  const formik = useFormik({
    enableReinitialize: true,
    initialValues: {
-      requestType: presets.requestType === 'grpc' && !isGrpcEnabled ? 'http' : presets.requestType || 'http',
+      requestType: presets.requestType || 'http',
      requestUrl: presets.requestUrl || ''
    },
    onSubmit: (newPresets) => {
-      // If gRPC is disabled but the preset is set to grpc, change it to http
-      if (!isGrpcEnabled && newPresets.requestType === 'grpc') {
-        newPresets.requestType = 'http';
-      }
-
      const brunoConfig = cloneDeep(collection.brunoConfig);
      brunoConfig.presets = newPresets;
      dispatch(updateBrunoConfig(brunoConfig, collection.uid));
@@ -69,23 +62,6 @@ const PresetsSettings = ({ collection }) => {
            <label htmlFor="graphql" className="ml-1 cursor-pointer select-none">
              GraphQL
            </label>
-
-            {isGrpcEnabled && (
-              <>
-                <input
-                  id="grpc"
-                  className="ml-4 cursor-pointer"
-                  type="radio"
-                  name="requestType"
-                  onChange={formik.handleChange}
-                  value="grpc"
-                  checked={formik.values.requestType === 'grpc'}
-                />
-                <label htmlFor="grpc" className="ml-1 cursor-pointer select-none">
-                  gRPC
-                </label>
-              </>
-            )}
          </div>
        </div>
        <div className="mb-3 flex items-center">
@@ -98,7 +74,7 @@ const PresetsSettings = ({ collection }) => {
                id="request-url"
                type="text"
                name="requestUrl"
-                placeholder="Request URL"
+                placeholder='Request URL'
                className="block textbox"
                autoComplete="off"
                autoCorrect="off"
@@ -111,7 +87,6 @@ const PresetsSettings = ({ collection }) => {
            </div>
          </div>
        </div>
-
        <div className="mt-6">
          <button type="submit" className="submit btn btn-sm btn-secondary">
            Save
--- a/packages/bruno-app/src/components/CollectionSettings/Script/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Script/index.js
@@ -53,7 +53,6 @@ const Script = ({ collection }) => {
          onSave={handleSave}
          font={get(preferences, 'font.codeFont', 'default')}
          fontSize={get(preferences, 'font.codeFontSize')}
-          showHintsFor={['req', 'bru']}
        />
      </div>
      <div className="flex-1 mt-6">
@@ -67,7 +66,6 @@ const Script = ({ collection }) => {
          onSave={handleSave}
          font={get(preferences, 'font.codeFont', 'default')}
          fontSize={get(preferences, 'font.codeFontSize')}
-          showHintsFor={['req', 'res', 'bru']}
        />
      </div>

--- a/packages/bruno-app/src/components/CollectionSettings/Tests/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Tests/index.js
@@ -37,7 +37,6 @@ const Tests = ({ collection }) => {
        onSave={handleSave}
        font={get(preferences, 'font.codeFont', 'default')}
        fontSize={get(preferences, 'font.codeFontSize')}
-        showHintsFor={['req', 'res', 'bru']}
      />

      <div className="mt-6">
--- a/packages/bruno-app/src/components/CollectionSettings/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/index.js
@@ -13,16 +13,21 @@ import Auth from './Auth';
 import Script from './Script';
 import Test from './Tests';
 import Presets from './Presets';
-import Grpc from './Grpc';
 import StyledWrapper from './StyledWrapper';
 import Vars from './Vars/index';
-import StatusDot from 'components/StatusDot';
+import DotIcon from 'components/Icons/Dot';
 import Overview from './Overview/index';
-import { useBetaFeature, BETA_FEATURES } from 'utils/beta-features';
+
+const ContentIndicator = () => {
+  return (
+    <sup className="ml-[.125rem] opacity-80 font-medium">
+      <DotIcon width="10"></DotIcon>
+    </sup>
+  );
+};

 const CollectionSettings = ({ collection }) => {
  const dispatch = useDispatch();
-  const isGrpcEnabled = useBetaFeature(BETA_FEATURES.GRPC);
  const tab = collection.settingsSelectedTab;
  const setTab = (tab) => {
    dispatch(
@@ -44,11 +49,11 @@ const CollectionSettings = ({ collection }) => {
  const requestVars = get(collection, 'root.request.vars.req', []);
  const responseVars = get(collection, 'root.request.vars.res', []);
  const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length;
-  const authMode = get(collection, 'root.request.auth', {}).mode || 'none';
+  const auth = get(collection, 'root.request.auth', {}).mode;

  const proxyConfig = get(collection, 'brunoConfig.proxy', {});
  const clientCertConfig = get(collection, 'brunoConfig.clientCertificates.certs', []);
-  const grpcConfig = get(collection, 'brunoConfig.grpc', {});
+

  const onProxySettingsUpdate = (config) => {
    const brunoConfig = cloneDeep(collection.brunoConfig);
@@ -125,9 +130,6 @@ const CollectionSettings = ({ collection }) => {
          />
        );
      }
-      case 'grpc': {
-        return <Grpc collection={collection} />;
-      }
    }
  };

@@ -138,9 +140,9 @@ const CollectionSettings = ({ collection }) => {
  };

  return (
-    <StyledWrapper className="flex flex-col h-full relative px-4 py-4 overflow-hidden">
+    <StyledWrapper className="flex flex-col h-full relative px-4 py-4">
      <div className="flex flex-wrap items-center tabs" role="tablist">
-        <div className={getTabClassname('overview')} role="tab" onClick={() => setTab('overview')}>
+      <div className={getTabClassname('overview')} role="tab" onClick={() => setTab('overview')}>
          Overview
        </div>
        <div className={getTabClassname('headers')} role="tab" onClick={() => setTab('headers')}>
@@ -153,35 +155,29 @@ const CollectionSettings = ({ collection }) => {
        </div>
        <div className={getTabClassname('auth')} role="tab" onClick={() => setTab('auth')}>
          Auth
-          {authMode !== 'none' && <StatusDot />}
+          {auth !== 'none' && <ContentIndicator />}
        </div>
        <div className={getTabClassname('script')} role="tab" onClick={() => setTab('script')}>
          Script
-          {hasScripts && <StatusDot />}
+          {hasScripts && <ContentIndicator />}
        </div>
        <div className={getTabClassname('tests')} role="tab" onClick={() => setTab('tests')}>
          Tests
-          {hasTests && <StatusDot />}
+          {hasTests && <ContentIndicator />}
        </div>
        <div className={getTabClassname('presets')} role="tab" onClick={() => setTab('presets')}>
          Presets
        </div>
        <div className={getTabClassname('proxy')} role="tab" onClick={() => setTab('proxy')}>
          Proxy
-          {Object.keys(proxyConfig).length > 0 && <StatusDot />}
+          {Object.keys(proxyConfig).length > 0  && <ContentIndicator />}
        </div>
        <div className={getTabClassname('clientCert')} role="tab" onClick={() => setTab('clientCert')}>
          Client Certificates
-          {clientCertConfig.length > 0 && <StatusDot />}
+          {clientCertConfig.length > 0 && <ContentIndicator />}
        </div>
-        {isGrpcEnabled && (
-          <div className={getTabClassname('grpc')} role="tab" onClick={() => setTab('grpc')}>
-            gRPC
-            {grpcConfig.protoFiles && grpcConfig.protoFiles.length > 0 && <StatusDot />}
-          </div>
-        )}
      </div>
-      <section className="mt-4 h-full overflow-auto">{getTabPanel(tab)}</section>
+      <section className="mt-4 h-full">{getTabPanel(tab)}</section>
    </StyledWrapper>
  );
 };
--- a/packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js
@@ -1,163 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  background: ${(props) => props.theme.console.contentBg};
-  overflow: hidden;
-
-  .debug-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .debug-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
-    font-weight: 500;
-
-    .error-count {
-      color: ${(props) => props.theme.console.countColor};
-      font-size: 12px;
-      font-weight: 400;
-    }
-  }
-
-  .debug-controls {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-  }
-
-  .control-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 28px;
-    height: 28px;
-    background: transparent;
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-  }
-
-  .debug-content {
-    flex: 1;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-  }
-
-  .debug-empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    color: ${(props) => props.theme.console.emptyColor};
-    text-align: center;
-    gap: 8px;
-    padding: 40px 20px;
-
-    p {
-      margin: 0;
-      font-size: 14px;
-      font-weight: 500;
-    }
-
-    span {
-      font-size: 12px;
-      opacity: 0.7;
-    }
-  }
-
-  .errors-container {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-    min-height: 0;
-  }
-
-  .errors-header {
-    display: grid;
-    grid-template-columns: 1fr 200px 120px;
-    gap: 12px;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 11px;
-    font-weight: 600;
-    color: ${(props) => props.theme.console.titleColor};
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    flex-shrink: 0;
-  }
-
-  .errors-list {
-    flex: 1;
-    overflow-y: auto;
-    overflow-x: hidden;
-    min-height: 0;
-  }
-
-  .error-row {
-    display: grid;
-    grid-template-columns: 1fr 200px 120px;
-    gap: 12px;
-    padding: 8px 16px;
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    cursor: pointer;
-    transition: background-color 0.1s ease;
-    font-size: 12px;
-    align-items: center;
-
-    &:hover {
-      background: ${(props) => props.theme.console.logHoverBg};
-    }
-
-    &.selected {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      border-left: 3px solid ${(props) => props.theme.console.checkboxColor};
-    }
-  }
-
-  .error-message {
-    color: ${(props) => props.theme.console.messageColor};
-    font-weight: 500;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-  }
-
-  .error-location {
-    color: ${(props) => props.theme.console.messageColor};
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
-  }
-
-  .error-time {
-    color: ${(props) => props.theme.console.timestampColor};
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
-    text-align: right;
-  }
-`;
-
-export default StyledWrapper; 
--- a/packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js
@@ -1,106 +0,0 @@
-import React from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { IconBug } from '@tabler/icons';
-import { 
-  setSelectedError,
-  clearDebugErrors
-} from 'providers/ReduxStore/slices/logs';
-import StyledWrapper from './StyledWrapper';
-
-const ErrorRow = ({ error, isSelected, onClick }) => {
-  const formatTime = (timestamp) => {
-    const date = new Date(timestamp);
-    return date.toLocaleTimeString('en-US', { 
-      hour12: false, 
-      hour: '2-digit', 
-      minute: '2-digit', 
-      second: '2-digit',
-      fractionalSecondDigits: 3
-    });
-  };
-
-  const getShortMessage = (message, maxLength = 80) => {
-    if (!message) return 'Unknown error';
-    return message.length > maxLength ? message.substring(0, maxLength) + '...' : message;
-  };
-
-  const getLocation = (error) => {
-    if (error.filename) {
-      const filename = error.filename.split('/').pop(); // Get just the filename
-      if (error.lineno && error.colno) {
-        return `${filename}:${error.lineno}:${error.colno}`;
-      } else if (error.lineno) {
-        return `${filename}:${error.lineno}`;
-      }
-      return filename;
-    }
-    return '-';
-  };
-
-  return (
-    <div 
-      className={`error-row ${isSelected ? 'selected' : ''}`}
-      onClick={onClick}
-    >
-      <div className="error-message" title={error.message}>
-        {getShortMessage(error.message)}
-      </div>
-      
-      <div className="error-location" title={error.filename}>
-        {getLocation(error)}
-      </div>
-      
-      <div className="error-time">
-        {formatTime(error.timestamp)}
-      </div>
-    </div>
-  );
-};
-
-const DebugTab = () => {
-  const dispatch = useDispatch();
-  const { debugErrors, selectedError } = useSelector(state => state.logs);
-
-  const handleErrorClick = (error) => {
-    dispatch(setSelectedError(error));
-  };
-
-  const handleClearErrors = () => {
-    dispatch(clearDebugErrors());
-  };
-
-  return (
-    <StyledWrapper>
-      <div className="debug-content">
-        {debugErrors.length === 0 ? (
-          <div className="debug-empty">
-            <IconBug size={48} strokeWidth={1} />
-            <p>No errors</p>
-            <span>console.error() calls will appear here</span>
-          </div>
-        ) : (
-          <div className="errors-container">
-            <div className="errors-header">
-              <div>Message</div>
-              <div>Location</div>
-              <div className="text-right">Time</div>
-            </div>
-            
-            <div className="errors-list">
-              {debugErrors.map((error, index) => (
-                <ErrorRow
-                  key={error.id}
-                  error={error}
-                  isSelected={selectedError?.id === error.id}
-                  onClick={() => handleErrorClick(error)}
-                />
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default DebugTab; 
--- a/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js
@@ -1,228 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  background: ${(props) => props.theme.console.contentBg};
-  border-left: 1px solid ${(props) => props.theme.console.border};
-  min-width: 400px;
-  max-width: 600px;
-  width: 40%;
-  overflow: hidden;
-
-  .panel-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .panel-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
-    font-weight: 500;
-
-    .error-time {
-      color: ${(props) => props.theme.console.countColor};
-      font-size: 11px;
-      font-weight: 400;
-    }
-  }
-
-  .close-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 24px;
-    height: 24px;
-    background: transparent;
-    border: none;
-    border-radius: 4px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-  }
-
-  .panel-tabs {
-    display: flex;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .tab-button {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 8px 16px;
-    background: transparent;
-    border: none;
-    border-bottom: 2px solid transparent;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-    font-size: 12px;
-    font-weight: 500;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-
-    &.active {
-      color: ${(props) => props.theme.console.checkboxColor};
-      border-bottom-color: ${(props) => props.theme.console.checkboxColor};
-      background: ${(props) => props.theme.console.contentBg};
-    }
-  }
-
-  .panel-content {
-    flex: 1;
-    overflow-y: auto;
-    overflow-x: hidden;
-    background: ${(props) => props.theme.console.contentBg};
-    min-height: 0;
-  }
-
-  .tab-content {
-    padding: 16px;
-    height: 100%;
-    overflow-y: auto;
-  }
-
-  .section {
-    margin-bottom: 24px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    h4 {
-      margin: 0 0 12px 0;
-      font-size: 13px;
-      font-weight: 600;
-      color: ${(props) => props.theme.console.titleColor};
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-    }
-  }
-
-  .info-grid {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-  }
-
-  .info-item {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-
-    label {
-      font-size: 11px;
-      font-weight: 600;
-      color: ${(props) => props.theme.console.titleColor};
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-    }
-
-    span {
-      font-size: 12px;
-      color: ${(props) => props.theme.console.messageColor};
-      font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-      word-break: break-all;
-      line-height: 1.4;
-    }
-  }
-
-  .error-message-full {
-    color: ${(props) => props.theme.console.messageColor} !important;
-    background: ${(props) => props.theme.console.headerBg};
-    padding: 8px 12px;
-    border-radius: 4px;
-    border: 1px solid ${(props) => props.theme.console.border};
-  }
-
-  .file-path {
-    color: ${(props) => props.theme.console.checkboxColor} !important;
-    font-weight: 500 !important;
-  }
-
-  .report-section {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-
-    p {
-      margin: 0;
-      font-size: 12px;
-      color: ${(props) => props.theme.console.messageColor};
-      line-height: 1.4;
-    }
-  }
-
-  .report-button {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.buttonHoverBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 6px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-    font-size: 12px;
-    font-weight: 500;
-    text-decoration: none;
-    align-self: flex-start;
-
-    &:hover {
-      background: ${(props) => props.theme.console.checkboxColor};
-      color: white;
-      border-color: ${(props) => props.theme.console.checkboxColor};
-    }
-
-    span {
-      font-family: inherit;
-    }
-  }
-
-  .stack-trace-container,
-  .arguments-container {
-    background: ${(props) => props.theme.console.headerBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 6px;
-    overflow: hidden;
-  }
-
-  .stack-trace,
-  .arguments {
-    margin: 0;
-    padding: 16px;
-    font-size: 11px;
-    line-height: 1.5;
-    color: ${(props) => props.theme.console.messageColor};
-    background: transparent;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    white-space: pre-wrap;
-    word-break: break-word;
-    overflow-x: auto;
-    max-height: 400px;
-    overflow-y: auto;
-  }
-`;
-
-export default StyledWrapper; 
--- a/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js
@@ -1,268 +0,0 @@
-import React, { useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { 
-  IconX,
-  IconBug,
-  IconFileText,
-  IconCode,
-  IconStack,
-  IconBrandGithub
-} from '@tabler/icons';
-import { clearSelectedError } from 'providers/ReduxStore/slices/logs';
-import { useApp } from 'providers/App';
-import platformLib from 'platform';
-import StyledWrapper from './StyledWrapper';
-
-const ErrorInfoTab = ({ error }) => {
-  const { version } = useApp();
-  
-  const formatTimestamp = (timestamp) => {
-    const date = new Date(timestamp);
-    return date.toLocaleString();
-  };
-
-  const generateGitHubIssueUrl = () => {
-    const title = `Bug: ${error.message.substring(0, 50)}${error.message.length > 50 ? '...' : ''}`;
-    
-    const body = `## Bug Report
-
-### Error Details
- **Message**: ${error.message}
- **File**: ${error.filename || 'Unknown'}
- **Line**: ${error.lineno || 'Unknown'}:${error.colno || 'Unknown'}
- **Timestamp**: ${formatTimestamp(error.timestamp)}
-
-### Environment
- **Bruno Version**: ${version}
- **OS**: ${platformLib.os.family} ${platformLib.os.version || ''}
- **Browser**: ${platformLib.name} ${platformLib.version || ''}
-
-### Stack Trace
-\`\`\`
-${error.stack || 'No stack trace available'}
-\`\`\`
-
-### Arguments
-\`\`\`
-${error.args ? error.args.map((arg, index) => {
-  if (arg && typeof arg === 'object' && arg.__type === 'Error') {
-    return `[${index}]: Error: ${arg.message}`;
-  }
-  return `[${index}]: ${typeof arg === 'object' ? JSON.stringify(arg, null, 2) : String(arg)}`;
-}).join('\n') : 'No arguments'}
-\`\`\`
-
-### Steps to Reproduce
-1. 
-2. 
-3. 
-
-### Expected Behavior
-
-
-### Additional Context
-
-`;
-
-    const encodedTitle = encodeURIComponent(title);
-    const encodedBody = encodeURIComponent(body);
-    
-    return `https://github.com/usebruno/bruno/issues/new?template=BLANK_ISSUE&title=${encodedTitle}&body=${encodedBody}`;
-  };
-
-  const handleReportIssue = () => {
-    const url = generateGitHubIssueUrl();
-    window.open(url, '_blank');
-  };
-
-  return (
-    <div className="tab-content">
-      <div className="section">
-        <h4>Error Information</h4>
-        <div className="info-grid">
-          <div className="info-item">
-            <label>Message:</label>
-            <span className="error-message-full">{error.message || 'No message available'}</span>
-          </div>
-          
-          {error.filename && (
-            <div className="info-item">
-              <label>File:</label>
-              <span className="file-path">{error.filename}</span>
-            </div>
-          )}
-          
-          {error.lineno && (
-            <div className="info-item">
-              <label>Line:</label>
-              <span>{error.lineno}{error.colno ? `:${error.colno}` : ''}</span>
-            </div>
-          )}
-          
-          <div className="info-item">
-            <label>Timestamp:</label>
-            <span>{formatTimestamp(error.timestamp)}</span>
-          </div>
-        </div>
-      </div>
-      
-      <div className="section">
-        <h4>Report Issue</h4>
-        <div className="report-section">
-          <p>Found a bug? Help us improve Bruno by reporting this error on GitHub.</p>
-          <button 
-            className="report-button"
-            onClick={handleReportIssue}
-            title="Report this error on GitHub"
-          >
-            <IconBrandGithub size={16} strokeWidth={1.5} />
-            <span>Report Issue on GitHub</span>
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const StackTraceTab = ({ error }) => {
-  const formatStackTrace = (stack) => {
-    if (!stack) return 'Stack trace not available';
-    
-    return stack
-      .split('\n')
-      .map(line => line.trim())
-      .filter(line => line.length > 0)
-      .join('\n');
-  };
-
-  return (
-    <div className="tab-content">
-      <div className="section">
-        <h4>Stack Trace</h4>
-        <div className="stack-trace-container">
-          <pre className="stack-trace">
-            {formatStackTrace(error.stack)}
-          </pre>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const ArgumentsTab = ({ error }) => {
-  const formatArguments = (args) => {
-    if (!args || args.length === 0) return 'No arguments available';
-    
-    try {
-      return args.map((arg, index) => {
-        // Handle special Error object format
-        if (arg && typeof arg === 'object' && arg.__type === 'Error') {
-          return `[${index}]: Error: ${arg.message}\n  Name: ${arg.name}\n  Stack: ${arg.stack || 'No stack trace'}`;
-        }
-        
-        if (typeof arg === 'object' && arg !== null) {
-          return `[${index}]: ${JSON.stringify(arg, null, 2)}`;
-        }
-        
-        return `[${index}]: ${String(arg)}`;
-      }).join('\n\n');
-    } catch (e) {
-      return 'Arguments could not be formatted';
-    }
-  };
-
-  return (
-    <div className="tab-content">
-      <div className="section">
-        <h4>Arguments</h4>
-        <div className="arguments-container">
-          <pre className="arguments">
-            {formatArguments(error.args)}
-          </pre>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const ErrorDetailsPanel = () => {
-  const dispatch = useDispatch();
-  const { selectedError } = useSelector(state => state.logs);
-  const [activeTab, setActiveTab] = useState('info');
-
-  if (!selectedError) return null;
-
-  const handleClose = () => {
-    dispatch(clearSelectedError());
-  };
-
-  const formatTime = (timestamp) => {
-    const date = new Date(timestamp);
-    return date.toLocaleString();
-  };
-
-  const getTabContent = () => {
-    switch (activeTab) {
-      case 'info':
-        return <ErrorInfoTab error={selectedError} />;
-      case 'stack':
-        return <StackTraceTab error={selectedError} />;
-      case 'args':
-        return <ArgumentsTab error={selectedError} />;
-      default:
-        return <ErrorInfoTab error={selectedError} />;
-    }
-  };
-
-  return (
-    <StyledWrapper>
-      <div className="panel-header">
-        <div className="panel-title">
-          <IconBug size={16} strokeWidth={1.5} />
-          <span>Error Details</span>
-          <span className="error-time">({formatTime(selectedError.timestamp)})</span>
-        </div>
-        
-        <button 
-          className="close-button"
-          onClick={handleClose}
-          title="Close details panel"
-        >
-          <IconX size={16} strokeWidth={1.5} />
-        </button>
-      </div>
-
-      <div className="panel-tabs">
-        <button 
-          className={`tab-button ${activeTab === 'info' ? 'active' : ''}`}
-          onClick={() => setActiveTab('info')}
-        >
-          <IconFileText size={14} strokeWidth={1.5} />
-          Info
-        </button>
-        
-        <button 
-          className={`tab-button ${activeTab === 'stack' ? 'active' : ''}`}
-          onClick={() => setActiveTab('stack')}
-        >
-          <IconStack size={14} strokeWidth={1.5} />
-          Stack
-        </button>
-        
-        <button 
-          className={`tab-button ${activeTab === 'args' ? 'active' : ''}`}
-          onClick={() => setActiveTab('args')}
-        >
-          <IconCode size={14} strokeWidth={1.5} />
-          Args
-        </button>
-      </div>
-
-      <div className="panel-content">
-        {getTabContent()}
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default ErrorDetailsPanel; 
--- a/packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js
@@ -1,293 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  background: ${(props) => props.theme.console.contentBg};
-  overflow: hidden;
-
-  .network-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .network-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
-    font-weight: 500;
-
-    .request-count {
-      color: ${(props) => props.theme.console.countColor};
-      font-size: 12px;
-      font-weight: 400;
-    }
-  }
-
-  .network-controls {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-  }
-
-  .network-content {
-    flex: 1;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-    min-height: 0; /* Important for proper flex behavior */
-  }
-
-  .network-empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    color: ${(props) => props.theme.console.emptyColor};
-    text-align: center;
-    gap: 8px;
-    padding: 40px 20px;
-
-    p {
-      margin: 0;
-      font-size: 14px;
-      font-weight: 500;
-    }
-
-    span {
-      font-size: 12px;
-      opacity: 0.7;
-    }
-  }
-
-  .requests-container {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-    min-height: 0; /* Important for proper flex behavior */
-  }
-
-  .requests-header {
-    display: grid;
-    grid-template-columns: 80px 80px 150px 1fr 100px 80px 80px;
-    gap: 12px;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 11px;
-    font-weight: 600;
-    color: ${(props) => props.theme.console.titleColor};
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    flex-shrink: 0;
-  }
-
-  .requests-list {
-    flex: 1;
-    overflow-y: auto;
-    overflow-x: hidden;
-    min-height: 0; /* Important for proper scrolling */
-  }
-
-  .request-row {
-    display: grid;
-    grid-template-columns: 80px 80px 150px 1fr 100px 80px 80px;
-    gap: 12px;
-    padding: 6px 16px;
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    cursor: pointer;
-    transition: background-color 0.1s ease;
-    font-size: 12px;
-    align-items: center;
-
-    &:hover {
-      background: ${(props) => props.theme.console.logHoverBg};
-    }
-
-    &.selected {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      border-left: 3px solid ${(props) => props.theme.console.checkboxColor};
-    }
-  }
-
-  .method-badge {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    padding: 2px 6px;
-    border-radius: 4px;
-    font-size: 10px;
-    font-weight: 600;
-    color: white;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    min-width: 45px;
-  }
-
-  .status-badge {
-    font-weight: 600;
-    font-size: 12px;
-  }
-
-  .request-domain {
-    color: ${(props) => props.theme.console.messageColor};
-    font-weight: 500;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .request-path {
-    color: ${(props) => props.theme.console.messageColor};
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-  }
-
-  .request-time {
-    color: ${(props) => props.theme.console.timestampColor};
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
-  }
-
-  .request-duration {
-    color: ${(props) => props.theme.console.messageColor};
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
-    text-align: right;
-  }
-
-  .request-size {
-    color: ${(props) => props.theme.console.messageColor};
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
-    text-align: right;
-  }
-
-  .filter-dropdown {
-    position: relative;
-  }
-
-  .filter-dropdown-trigger {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 6px 8px;
-    background: transparent;
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-    font-size: 12px;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-
-    .filter-summary {
-      font-weight: 500;
-      min-width: 24px;
-      text-align: center;
-    }
-  }
-
-  .filter-dropdown-menu {
-    position: absolute;
-    top: calc(100% + 4px);
-    right: 0;
-    min-width: 200px;
-    max-width: 250px;
-    background: ${(props) => props.theme.console.dropdownBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 6px;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
-    z-index: 1000;
-    overflow: hidden;
-  }
-
-  .filter-dropdown-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 12px;
-    background: ${(props) => props.theme.console.dropdownHeaderBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 12px;
-    font-weight: 500;
-    color: ${(props) => props.theme.console.titleColor};
-  }
-
-  .filter-toggle-all {
-    background: transparent;
-    border: none;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    font-size: 11px;
-    font-weight: 500;
-    padding: 2px 4px;
-    border-radius: 2px;
-    transition: all 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-    }
-  }
-
-  .filter-dropdown-options {
-    padding: 4px 0;
-  }
-
-  .filter-option {
-    display: flex;
-    align-items: center;
-    padding: 6px 12px;
-    cursor: pointer;
-    transition: background-color 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.optionHoverBg};
-    }
-
-    input[type="checkbox"] {
-      margin: 0 8px 0 0;
-      width: 14px;
-      height: 14px;
-      accent-color: ${(props) => props.theme.console.checkboxColor};
-    }
-  }
-
-  .filter-option-content {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    flex: 1;
-  }
-
-  .filter-option-label {
-    color: ${(props) => props.theme.console.optionLabelColor};
-    font-size: 12px;
-    font-weight: 400;
-  }
-
-  .filter-option-count {
-    color: ${(props) => props.theme.console.optionCountColor};
-    font-size: 11px;
-    font-weight: 400;
-    margin-left: auto;
-  }
-`;
-
-export default StyledWrapper; 
--- a/packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js
@@ -1,302 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { 
-  IconFilter,
-  IconChevronDown,
-  IconNetwork,
-} from '@tabler/icons';
-import { 
-  updateNetworkFilter, 
-  toggleAllNetworkFilters, 
-  setSelectedRequest
-} from 'providers/ReduxStore/slices/logs';
-import StyledWrapper from './StyledWrapper';
-
-const MethodBadge = ({ method }) => {
-  const getMethodColor = (method) => {
-    switch (method?.toUpperCase()) {
-      case 'GET': return '#10b981';
-      case 'POST': return '#8b5cf6';
-      case 'PUT': return '#f59e0b';
-      case 'DELETE': return '#ef4444';
-      case 'PATCH': return '#06b6d4';
-      case 'HEAD': return '#6b7280';
-      case 'OPTIONS': return '#84cc16';
-      default: return '#6b7280';
-    }
-  };
-
-  return (
-    <span 
-      className="method-badge" 
-      style={{ backgroundColor: getMethodColor(method) }}
-    >
-      {method?.toUpperCase() || 'GET'}
-    </span>
-  );
-};
-
-const StatusBadge = ({ status, statusCode }) => {
-  const getStatusColor = (code) => {
-    if (code >= 200 && code < 300) return '#10b981';
-    if (code >= 300 && code < 400) return '#f59e0b';
-    if (code >= 400 && code < 500) return '#ef4444';
-    if (code >= 500) return '#dc2626';
-    return '#6b7280';
-  };
-
-  const displayStatus = statusCode || status;
-  
-  return (
-    <span 
-      className="status-badge" 
-      style={{ color: getStatusColor(statusCode) }}
-    >
-      {displayStatus}
-    </span>
-  );
-};
-
-const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggleAll }) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const dropdownRef = useRef(null);
-
-  const allFiltersEnabled = Object.values(filters).every(f => f);
-  const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
-
-  useEffect(() => {
-    const handleClickOutside = (event) => {
-      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
-        setIsOpen(false);
-      }
-    };
-
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => document.removeEventListener('mousedown', handleClickOutside);
-  }, []);
-
-  return (
-    <div className="filter-dropdown" ref={dropdownRef}>
-      <button 
-        className="filter-dropdown-trigger"
-        onClick={() => setIsOpen(!isOpen)}
-        title="Filter requests by method"
-      >
-        <IconFilter size={16} strokeWidth={1.5} />
-        <span className="filter-summary">
-          {activeFilters.length === Object.keys(filters).length ? 'All' : `${activeFilters.length}/${Object.keys(filters).length}`}
-        </span>
-        <IconChevronDown size={14} strokeWidth={1.5} />
-      </button>
-      
-      {isOpen && (
-        <div className={`filter-dropdown-menu right`}>
-          <div className="filter-dropdown-header">
-            <span>Filter by Method</span>
-            <button 
-              className="filter-toggle-all"
-              onClick={() => onToggleAll(!allFiltersEnabled)}
-            >
-              {allFiltersEnabled ? 'Hide All' : 'Show All'}
-            </button>
-          </div>
-          
-          <div className="filter-dropdown-options">
-            {Object.keys(filters).map(method => (
-              <label key={method} className="filter-option">
-                <input
-                  type="checkbox"
-                  checked={filters[method]}
-                  onChange={(e) => onFilterToggle(method, e.target.checked)}
-                />
-                <div className="filter-option-content">
-                  <MethodBadge method={method} />
-                  <span className="filter-option-label">{method}</span>
-                  <span className="filter-option-count">({requestCounts[method] || 0})</span>
-                </div>
-              </label>
-            ))}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-const RequestRow = ({ request, isSelected, onClick }) => {
-  const { data } = request;
-  const { request: req, response: res, timestamp } = data;
-  
-  const formatTime = (timestamp) => {
-    const date = new Date(timestamp);
-    return date.toLocaleTimeString('en-US', { 
-      hour12: false, 
-      hour: '2-digit', 
-      minute: '2-digit', 
-      second: '2-digit',
-      fractionalSecondDigits: 3
-    });
-  };
-
-  const formatDuration = (duration) => {
-    if (!duration) return '-';
-    if (duration < 1000) return `${Math.round(duration)}ms`;
-    return `${(duration / 1000).toFixed(2)}s`;
-  };
-
-  const formatSize = (size) => {
-    if (!size) return '-';
-    if (size < 1024) return `${size}B`;
-    if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)}KB`;
-    return `${(size / (1024 * 1024)).toFixed(1)}MB`;
-  };
-
-  const getUrl = () => {
-    return req?.url || 'Unknown URL';
-  };
-
-  const getDomain = () => {
-    try {
-      const url = new URL(getUrl());
-      return url.hostname;
-    } catch {
-      return getUrl();
-    }
-  };
-
-  const getPath = () => {
-    try {
-      const url = new URL(getUrl());
-      return url.pathname + url.search;
-    } catch {
-      return getUrl();
-    }
-  };
-
-  return (
-    <div 
-      className={`request-row ${isSelected ? 'selected' : ''}`}
-      onClick={onClick}
-    >
-      <div className="request-method">
-        <MethodBadge method={req?.method} />
-      </div>
-      
-      <div className="request-status">
-        <StatusBadge status={res?.status} statusCode={res?.statusCode} />
-      </div>
-      
-      <div className="request-domain" title={getDomain()}>
-        {getDomain()}
-      </div>
-      
-      <div className="request-path" title={getPath()}>
-        {getPath()}
-      </div>
-      
-      <div className="request-time">
-        {formatTime(timestamp)}
-      </div>
-      
-      <div className="request-duration">
-        {formatDuration(res?.duration)}
-      </div>
-      
-      <div className="request-size">
-        {formatSize(res?.size)}
-      </div>
-    </div>
-  );
-};
-
-const NetworkTab = () => {
-  const dispatch = useDispatch();
-  const { networkFilters, selectedRequest } = useSelector(state => state.logs);
-  const collections = useSelector(state => state.collections.collections);
-
-  const allRequests = useMemo(() => {
-    const requests = [];
-    
-    collections.forEach(collection => {
-      if (collection.timeline) {
-        collection.timeline
-          .filter(entry => entry.type === 'request')
-          .forEach(entry => {
-            requests.push({
-              ...entry,
-              collectionName: collection.name,
-              collectionUid: collection.uid
-            });
-          });
-      }
-    });
-    
-    return requests.sort((a, b) => a.timestamp - b.timestamp);
-  }, [collections]);
-
-  const filteredRequests = useMemo(() => {
-    return allRequests.filter(request => {
-      const method = request.data?.request?.method?.toUpperCase() || 'GET';
-      return networkFilters[method];
-    });
-  }, [allRequests, networkFilters]);
-
-  const requestCounts = useMemo(() => {
-    return allRequests.reduce((counts, request) => {
-      const method = request.data?.request?.method?.toUpperCase() || 'GET';
-      counts[method] = (counts[method] || 0) + 1;
-      return counts;
-    }, {});
-  }, [allRequests]);
-
-  const handleFilterToggle = (method, enabled) => {
-    dispatch(updateNetworkFilter({ method, enabled }));
-  };
-
-  const handleToggleAllFilters = (enabled) => {
-    dispatch(toggleAllNetworkFilters(enabled));
-  };
-
-  const handleRequestClick = (request) => {
-    dispatch(setSelectedRequest(request));
-  };
-
-  return (
-    <StyledWrapper>
-      <div className="network-content">
-        {filteredRequests.length === 0 ? (
-          <div className="network-empty">
-            <IconNetwork size={48} strokeWidth={1} />
-            <p>No network requests</p>
-            <span>Requests will appear here as you make API calls</span>
-          </div>
-        ) : (
-          <div className="requests-container">
-            <div className="requests-header">
-              <div>Method</div>
-              <div>Status</div>
-              <div>Domain</div>
-              <div>Path</div>
-              <div>Time</div>
-              <div className="text-right">Duration</div>
-              <div className="text-right">Size</div>
-            </div>
-            
-            <div className="requests-list">
-              {filteredRequests.map((request, index) => (
-                <RequestRow
-                  key={`${request.collectionUid}-${request.itemUid}-${request.timestamp}-${index}`}
-                  request={request}
-                  isSelected={selectedRequest?.timestamp === request.timestamp && selectedRequest?.itemUid === request.itemUid}
-                  onClick={() => handleRequestClick(request)}
-                />
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default NetworkTab; 
--- a/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js
@@ -1,347 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  background: ${(props) => props.theme.console.contentBg};
-  border-left: 1px solid ${(props) => props.theme.console.border};
-  min-width: 400px;
-  max-width: 600px;
-  width: 40%;
-  overflow: hidden;
-
-  .panel-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .panel-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
-    font-weight: 500;
-
-    .request-time {
-      color: ${(props) => props.theme.console.countColor};
-      font-size: 11px;
-      font-weight: 400;
-    }
-  }
-
-  .close-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 24px;
-    height: 24px;
-    background: transparent;
-    border: none;
-    border-radius: 4px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-  }
-
-  .panel-tabs {
-    display: flex;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .tab-button {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 8px 16px;
-    background: transparent;
-    border: none;
-    border-bottom: 2px solid transparent;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-    font-size: 12px;
-    font-weight: 500;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-
-    &.active {
-      color: ${(props) => props.theme.console.checkboxColor};
-      border-bottom-color: ${(props) => props.theme.console.checkboxColor};
-      background: ${(props) => props.theme.console.contentBg};
-    }
-  }
-
-  .panel-content {
-    flex: 1;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 16px;
-    min-height: 0;
-    height: 0;
-  }
-
-  .tab-content {
-    display: flex;
-    flex-direction: column;
-    gap: 20px;
-    min-height: min-content;
-  }
-
-  .section {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-
-    h4 {
-      margin: 0;
-      font-size: 13px;
-      font-weight: 600;
-      color: ${(props) => props.theme.console.titleColor};
-      padding-bottom: 4px;
-      border-bottom: 1px solid ${(props) => props.theme.console.border};
-    }
-  }
-
-  .info-grid {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-  }
-
-  .info-item {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-
-    .label {
-      font-size: 11px;
-      font-weight: 600;
-      color: ${(props) => props.theme.console.countColor};
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-    }
-
-    .value {
-      font-size: 12px;
-      color: ${(props) => props.theme.console.messageColor};
-      font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-      word-break: break-all;
-      padding: 4px 8px;
-      background: ${(props) => props.theme.console.headerBg};
-      border-radius: 4px;
-      border: 1px solid ${(props) => props.theme.console.border};
-    }
-  }
-
-  .headers-table,
-  .timeline-table {
-    overflow: auto;
-    border-radius: 4px;
-    border: 1px solid ${(props) => props.theme.console.border};
-    max-height: 300px;
-
-    table {
-      width: 100%;
-      border-collapse: collapse;
-      font-size: 12px;
-      background: ${(props) => props.theme.console.headerBg};
-
-      thead {
-        background: ${(props) => props.theme.console.dropdownHeaderBg};
-        position: sticky;
-        top: 0;
-        z-index: 10;
-        
-        td {
-          padding: 8px 12px;
-          font-weight: 600;
-          color: ${(props) => props.theme.console.titleColor};
-          text-transform: uppercase;
-          font-size: 11px;
-          letter-spacing: 0.5px;
-          border-bottom: 1px solid ${(props) => props.theme.console.border};
-        }
-      }
-
-      tbody {
-        tr {
-          border-bottom: 1px solid ${(props) => props.theme.console.border};
-
-          &:last-child {
-            border-bottom: none;
-          }
-
-          &:nth-child(odd) {
-            background: ${(props) => props.theme.console.contentBg};
-          }
-
-          &:hover {
-            background: ${(props) => props.theme.console.logHoverBg};
-          }
-        }
-
-        td {
-          padding: 8px 12px;
-          vertical-align: top;
-          word-break: break-word;
-        }
-      }
-    }
-  }
-
-  .header-name,
-  .timeline-phase {
-    color: ${(props) => props.theme.console.countColor};
-    font-weight: 600;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    min-width: 120px;
-  }
-
-  .header-value,
-  .timeline-message {
-    color: ${(props) => props.theme.console.messageColor};
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    word-break: break-all;
-  }
-
-  .timeline-duration {
-    color: ${(props) => props.theme.console.timestampColor};
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    text-align: right;
-    min-width: 80px;
-  }
-
-  .code-block {
-    background: ${(props) => props.theme.console.headerBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    padding: 12px;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
-    line-height: 1.4;
-    color: ${(props) => props.theme.console.messageColor};
-    overflow: auto;
-    white-space: pre-wrap;
-    word-break: break-word;
-    max-height: 400px;
-    margin: 0;
-  }
-
-  .empty-state {
-    padding: 12px;
-    text-align: center;
-    color: ${(props) => props.theme.console.emptyColor};
-    font-style: italic;
-    font-size: 12px;
-    background: ${(props) => props.theme.console.headerBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-  }
-
-  .response-body-container {
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    overflow: hidden;
-    background: ${(props) => props.theme.console.headerBg};
-    height: 400px;
-    display: flex;
-    flex-direction: column;
-
-    .w-full.h-full.relative.flex {
-      height: 100% !important;
-      width: 100% !important;
-      background: ${(props) => props.theme.console.headerBg} !important;
-      display: flex !important;
-      flex-direction: column !important;
-    }
-
-    div[role="tablist"] {
-      background: ${(props) => props.theme.console.dropdownHeaderBg};
-      padding: 8px 12px;
-      border-bottom: 1px solid ${(props) => props.theme.console.border};
-      display: flex !important;
-      gap: 8px !important;
-      flex-wrap: wrap !important;
-      align-items: center !important;
-      min-height: 40px !important;
-      flex-shrink: 0 !important;
-      
-      > div {
-        color: ${(props) => props.theme.console.buttonColor};
-        font-size: 12px !important;
-        padding: 6px 12px !important;
-        border-radius: 4px;
-        transition: all 0.2s ease;
-        cursor: pointer;
-        border: 1px solid ${(props) => props.theme.console.border};
-        background: ${(props) => props.theme.console.contentBg};
-        white-space: nowrap !important;
-        min-width: auto !important;
-        height: auto !important;
-        line-height: 1.2 !important;
-        font-weight: 500 !important;
-
-        &:hover {
-          background: ${(props) => props.theme.console.buttonHoverBg};
-          color: ${(props) => props.theme.console.buttonHoverColor};
-          border-color: ${(props) => props.theme.console.buttonHoverBg};
-        }
-
-        &.active {
-          background: ${(props) => props.theme.console.checkboxColor};
-          color: white;
-          border-color: ${(props) => props.theme.console.checkboxColor};
-        }
-      }
-    }
-    .response-filter {
-      position: absolute !important;
-      bottom: 8px !important;
-      right: 8px !important;
-      left: 8px !important;
-      z-index: 10 !important;
-    }
-  }
-
-  .network-logs-container {
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    overflow: hidden;
-    background: ${(props) => props.theme.console.headerBg};
-    min-height: 200px;
-    max-height: 400px;
-
-    .network-logs {
-      background: ${(props) => props.theme.console.contentBg} !important;
-      color: ${(props) => props.theme.console.messageColor} !important;
-      height: 100% !important;
-      max-height: 400px !important;
-      
-      pre {
-        color: ${(props) => props.theme.console.messageColor} !important;
-        font-size: 11px !important;
-        line-height: 1.4 !important;
-        padding: 12px !important;
-      }
-    }
-  }
-`;
-
-export default StyledWrapper; 
--- a/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js
@@ -1,242 +0,0 @@
-import React, { useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { 
-  IconX,
-  IconFileText,
-  IconArrowRight,
-  IconNetwork
-} from '@tabler/icons';
-import { clearSelectedRequest } from 'providers/ReduxStore/slices/logs';
-import QueryResult from 'components/ResponsePane/QueryResult';
-import Network from 'components/ResponsePane/Timeline/TimelineItem/Network';
-import StyledWrapper from './StyledWrapper';
-import { uuid } from 'utils/common/index';
-
-const RequestTab = ({ request, response }) => {
-  const formatHeaders = (headers) => {
-    if (!headers) return [];
-    if (Array.isArray(headers)) return headers;
-    return Object.entries(headers).map(([key, value]) => ({ name: key, value }));
-  };
-
-  const formatBody = (body) => {
-    if (!body) return 'No body';
-    if (typeof body === 'string') return body;
-    return JSON.stringify(body, null, 2);
-  };
-
-  return (
-    <div className="tab-content">
-      <div className="section">
-        <h4>General</h4>
-        <div className="info-grid">
-          <div className="info-item">
-            <span className="label">Request URL:</span>
-            <span className="value">{request?.url || 'N/A'}</span>
-          </div>
-          <div className="info-item">
-            <span className="label">Request Method:</span>
-            <span className="value">{request?.method || 'GET'}</span>
-          </div>
-        </div>
-      </div>
-
-      <div className="section">
-        <h4>Request Headers</h4>
-        {formatHeaders(request?.headers).length > 0 ? (
-          <div className="headers-table">
-            <table>
-              <thead>
-                <tr>
-                  <td>Name</td>
-                  <td>Value</td>
-                </tr>
-              </thead>
-              <tbody>
-                {formatHeaders(request.headers).map((header, index) => (
-                  <tr key={index}>
-                    <td className="header-name">{header.name}</td>
-                    <td className="header-value">{header.value}</td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        ) : (
-          <div className="empty-state">No headers</div>
-        )}
-      </div>
-
-      {request?.body && (
-        <div className="section">
-          <h4>Request Body</h4>
-          <pre className="code-block">{formatBody(request.body)}</pre>
-        </div>
-      )}
-    </div>
-  );
-};
-
-const ResponseTab = ({ response, request, collection }) => {
-  const formatHeaders = (headers) => {
-    if (!headers) return [];
-    if (Array.isArray(headers)) return headers;
-    return Object.entries(headers).map(([key, value]) => ({ name: key, value }));
-  };
-
-  return (
-    <div className="tab-content">
-      <div className="section">
-        <h4>Response Headers</h4>
-        {formatHeaders(response?.headers).length > 0 ? (
-          <div className="headers-table">
-            <table>
-              <thead>
-                <tr>
-                  <td>Name</td>
-                  <td>Value</td>
-                </tr>
-              </thead>
-              <tbody>
-                {formatHeaders(response.headers).map((header, index) => (
-                  <tr key={index}>
-                    <td className="header-name">{header.name}</td>
-                    <td className="header-value">{header.value}</td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        ) : (
-          <div className="empty-state">No headers</div>
-        )}
-      </div>
-
-      <div className="section">
-        <h4>Response Body</h4>
-        <div className="response-body-container">
-          {response?.data || response?.dataBuffer ? (
-            <QueryResult
-              item={{ uid:  uuid()}}
-              collection={collection}
-              data={response.data}
-              dataBuffer={response.dataBuffer}
-              headers={response.headers}
-              error={response.error}
-              disableRunEventListener={true}
-            />
-          ) : (
-            <div className="empty-state">No response data</div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const NetworkTab = ({ response }) => {
-  const timeline = response?.timeline || [];
-
-  return (
-    <div className="tab-content">
-      <div className="section">
-        <h4>Network Logs</h4>
-        <div className="network-logs-container">
-          {timeline.length > 0 ? (
-            <Network logs={timeline} />
-          ) : (
-            <div className="empty-state">No network logs available</div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const RequestDetailsPanel = () => {
-  const dispatch = useDispatch();
-  const { selectedRequest } = useSelector(state => state.logs);
-  const collections = useSelector(state => state.collections.collections);
-  const [activeTab, setActiveTab] = useState('request');
-
-  if (!selectedRequest) return null;
-
-  const { data } = selectedRequest;
-  const { request, response } = data;
-
-  const collection = collections.find(c => c.uid === selectedRequest.collectionUid);
-
-  const handleClose = () => {
-    dispatch(clearSelectedRequest());
-  };
-
-  const formatTime = (timestamp) => {
-    const date = new Date(timestamp);
-    return date.toLocaleString();
-  };
-
-  const getTabContent = () => {
-    switch (activeTab) {
-      case 'request':
-        return <RequestTab request={request} response={response} />;
-      case 'response':
-        return <ResponseTab response={response} request={request} collection={collection} />;
-      case 'network':
-        return <NetworkTab response={response} />;
-      default:
-        return <RequestTab request={request} response={response} />;
-    }
-  };
-
-  return (
-    <StyledWrapper>
-      <div className="panel-header">
-        <div className="panel-title">
-          <IconFileText size={16} strokeWidth={1.5} />
-          <span>Request Details</span>
-          <span className="request-time">({formatTime(selectedRequest.timestamp)})</span>
-        </div>
-        
-        <button 
-          className="close-button"
-          onClick={handleClose}
-          title="Close details panel"
-        >
-          <IconX size={16} strokeWidth={1.5} />
-        </button>
-      </div>
-
-      <div className="panel-tabs">
-        <button 
-          className={`tab-button ${activeTab === 'request' ? 'active' : ''}`}
-          onClick={() => setActiveTab('request')}
-        >
-          <IconArrowRight size={14} strokeWidth={1.5} />
-          Request
-        </button>
-        
-        <button 
-          className={`tab-button ${activeTab === 'response' ? 'active' : ''}`}
-          onClick={() => setActiveTab('response')}
-        >
-          <IconFileText size={14} strokeWidth={1.5} />
-          Response
-        </button>
-        
-        <button 
-          className={`tab-button ${activeTab === 'network' ? 'active' : ''}`}
-          onClick={() => setActiveTab('network')}
-        >
-          <IconNetwork size={14} strokeWidth={1.5} />
-          Network
-        </button>
-      </div>
-
-      <div className="panel-content">
-        {getTabContent()}
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default RequestDetailsPanel; 
--- a/packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js
@@ -1,520 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  width: 100%;
-  height: 100%;
-  background: ${(props) => props.theme.console.bg};
-  border-top: 1px solid ${(props) => props.theme.console.border};
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-
-  .console-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-    position: relative;
-  }
-
-  .console-tabs {
-    display: flex;
-    align-items: center;
-    gap: 2px;
-  }
-
-  .console-tab {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 6px 12px;
-    background: transparent;
-    border: none;
-    border-bottom: 2px solid transparent;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-    font-size: 12px;
-    font-weight: 500;
-    border-radius: 4px 4px 0 0;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-
-    &.active {
-      color: ${(props) => props.theme.console.checkboxColor};
-      border-bottom-color: ${(props) => props.theme.console.checkboxColor};
-      background: ${(props) => props.theme.console.contentBg};
-    }
-  }
-
-  .console-controls {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-  }
-
-  .console-content {
-    flex: 1;
-    overflow: hidden;
-    background: ${(props) => props.theme.console.contentBg};
-    min-height: 0;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .tab-content {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-  }
-
-  .tab-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 16px;
-    background: ${(props) => props.theme.console.headerBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    flex-shrink: 0;
-  }
-
-  .tab-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
-    font-weight: 500;
-
-    .log-count {
-      color: ${(props) => props.theme.console.countColor};
-      font-size: 12px;
-      font-weight: 400;
-    }
-  }
-
-  .tab-controls {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-  }
-
-  .tab-content-area {
-    flex: 1;
-    overflow-y: auto;
-    background: ${(props) => props.theme.console.contentBg};
-    min-height: 0;
-  }
-
-  .network-with-details {
-    display: flex;
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .network-main {
-    flex: 1;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-  }
-
-  .debug-with-details {
-    display: flex;
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .debug-main {
-    flex: 1;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-  }
-
-  .filter-controls {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    margin-right: 8px;
-    padding-right: 8px;
-    border-right: 1px solid ${(props) => props.theme.console.border};
-  }
-
-  .action-controls {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-  }
-
-  .control-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 28px;
-    height: 28px;
-    background: transparent;
-    border: none;
-    border-radius: 4px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-    }
-
-    &.close-button:hover {
-      background: #e81123;
-      color: white;
-    }
-  }
-
-  .filter-dropdown {
-    position: relative;
-  }
-
-  .filter-dropdown-trigger {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 6px 8px;
-    background: transparent;
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 4px;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    transition: all 0.2s ease;
-    font-size: 12px;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-      color: ${(props) => props.theme.console.buttonHoverColor};
-      border-color: ${(props) => props.theme.console.border};
-    }
-
-    .filter-summary {
-      font-weight: 500;
-      min-width: 24px;
-      text-align: center;
-    }
-  }
-
-  .filter-dropdown-menu {
-    position: absolute;
-    top: calc(100% + 4px);
-    left: 0;
-    min-width: 200px;
-    max-width: 250px;
-    background: ${(props) => props.theme.console.dropdownBg};
-    border: 1px solid ${(props) => props.theme.console.border};
-    border-radius: 6px;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
-    z-index: 1000;
-    overflow: hidden;
-    
-    &.right {
-      left: auto;
-      right: 0;
-    }
-  }
-
-  .filter-dropdown-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 12px;
-    background: ${(props) => props.theme.console.dropdownHeaderBg};
-    border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 12px;
-    font-weight: 500;
-    color: ${(props) => props.theme.console.titleColor};
-  }
-
-  .filter-toggle-all {
-    background: transparent;
-    border: none;
-    color: ${(props) => props.theme.console.buttonColor};
-    cursor: pointer;
-    font-size: 11px;
-    font-weight: 500;
-    padding: 2px 4px;
-    border-radius: 2px;
-    transition: all 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.buttonHoverBg};
-    }
-  }
-
-  .filter-dropdown-options {
-    padding: 4px 0;
-  }
-
-  .filter-option {
-    display: flex;
-    align-items: center;
-    padding: 6px 12px;
-    cursor: pointer;
-    transition: background-color 0.2s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.optionHoverBg};
-    }
-
-    input[type="checkbox"] {
-      margin: 0 8px 0 0;
-      width: 14px;
-      height: 14px;
-      accent-color: ${(props) => props.theme.console.checkboxColor};
-    }
-  }
-
-  .filter-option-content {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    flex: 1;
-  }
-
-  .filter-option-label {
-    color: ${(props) => props.theme.console.optionLabelColor};
-    font-size: 12px;
-    font-weight: 400;
-  }
-
-  .filter-option-count {
-    color: ${(props) => props.theme.console.optionCountColor};
-    font-size: 11px;
-    font-weight: 400;
-    margin-left: auto;
-  }
-
-  .console-empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    color: ${(props) => props.theme.console.emptyColor};
-    text-align: center;
-    gap: 8px;
-    padding: 40px 20px;
-
-    p {
-      margin: 0;
-      font-size: 14px;
-      font-weight: 500;
-    }
-
-    span {
-      font-size: 12px;
-      opacity: 0.7;
-    }
-  }
-
-  .logs-container {
-    padding: 8px 0;
-  }
-    
-  .method-badge {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    padding: 2px 6px;
-    border-radius: 4px;
-    font-size: 10px;
-    font-weight: 600;
-    color: white;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    min-width: 45px;
-  }
-
-  .log-entry {
-    display: flex;
-    align-items: flex-start;
-    gap: 12px;
-    padding: 4px 16px;
-    font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 12px;
-    line-height: 1.4;
-    border-left: 2px solid transparent;
-    transition: background-color 0.1s ease;
-
-    &:hover {
-      background: ${(props) => props.theme.console.logHoverBg};
-    }
-
-    &.error {
-      border-left-color: #f14c4c;
-      
-      .log-level {
-        background: #f14c4c;
-        color: white;
-      }
-      
-      .log-icon {
-        color: #f14c4c;
-      }
-    }
-
-    &.warn {
-      border-left-color: #ffcc02;
-      
-      .log-level {
-        background: #ffcc02;
-        color: #000;
-      }
-      
-      .log-icon {
-        color: #ffcc02;
-      }
-    }
-
-    &.info {
-      border-left-color: #0078d4;
-      
-      .log-level {
-        background: #0078d4;
-        color: white;
-      }
-      
-      .log-icon {
-        color: #0078d4;
-      }
-    }
-
-    &.debug {
-      border-left-color: #9b59b6;
-      
-      .log-level {
-        background: #9b59b6;
-        color: white;
-      }
-      
-      .log-icon {
-        color: #9b59b6;
-      }
-    }
-
-    &.log {
-      border-left-color: #6a6a6a;
-      
-      .log-level {
-        background: #6a6a6a;
-        color: white;
-      }
-      
-      .log-icon {
-        color: #6a6a6a;
-      }
-    }
-  }
-
-  .log-meta {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    flex-shrink: 0;
-    min-width: 120px;
-  }
-
-  .log-timestamp {
-    color: ${(props) => props.theme.console.timestampColor};
-    font-size: 11px;
-    font-weight: 400;
-  }
-
-  .log-level {
-    font-size: 9px;
-    font-weight: 600;
-    padding: 2px 4px;
-    border-radius: 2px;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-  }
-
-  .log-icon {
-    flex-shrink: 0;
-  }
-
-  .log-message {
-    color: ${(props) => props.theme.console.messageColor};
-    white-space: pre-wrap;
-    word-break: break-word;
-    flex: 1;
-    
-    .log-object {
-      margin: 4px 0;
-      padding: 8px;
-      background: ${(props) => props.theme.console.headerBg};
-      border-radius: 4px;
-      border: 1px solid ${(props) => props.theme.console.border};
-      
-      .react-json-view {
-        background: transparent !important;
-        
-        .object-key-val {
-          font-size: 12px !important;
-        }
-        
-        .object-key {
-          color: ${(props) => props.theme.console.messageColor} !important;
-          font-weight: 500 !important;
-        }
-        
-        .object-value {
-          color: ${(props) => props.theme.console.messageColor} !important;
-        }
-        
-        .string-value {
-          color: ${(props) => props.theme.colors?.text?.green || (props.theme.console.messageColor)} !important;
-        }
-        
-        .number-value {
-          color: ${(props) => props.theme.colors?.text?.purple || (props.theme.console.messageColor)} !important;
-        }
-        
-        .boolean-value {
-          color: ${(props) => props.theme.colors?.text?.yellow || (props.theme.console.messageColor)} !important;
-        }
-        
-        .null-value {
-          color: ${(props) => props.theme.colors?.text?.danger || (props.theme.console.messageColor)} !important;
-        }
-        
-        .object-size {
-          color: ${(props) => props.theme.console.timestampColor} !important;
-        }
-        
-        .brace, .bracket {
-          color: ${(props) => props.theme.console.messageColor} !important;
-        }
-        
-        .collapsed-icon, .expanded-icon {
-          color: ${(props) => props.theme.console.checkboxColor} !important;
-        }
-        
-        .icon-container {
-          color: ${(props) => props.theme.console.checkboxColor} !important;
-        }
-        
-        .click-to-expand, .click-to-collapse {
-          color: ${(props) => props.theme.console.checkboxColor} !important;
-        }
-      }
-    }
-  }
-`;
-
-export default StyledWrapper; 
--- a/packages/bruno-app/src/components/Devtools/Console/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/index.js
@@ -1,531 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import ReactJson from 'react-json-view';
-import { useTheme } from 'providers/Theme';
-import { 
-  IconX, 
-  IconTrash, 
-  IconFilter,
-  IconAlertTriangle, 
-  IconAlertCircle, 
-  IconBug,
-  IconCode,
-  IconChevronDown,
-  IconTerminal2,
-  IconNetwork
-} from '@tabler/icons';
-import { 
-  closeConsole, 
-  clearLogs, 
-  updateFilter, 
-  toggleAllFilters,
-  setActiveTab,
-  clearDebugErrors,
-  updateNetworkFilter,
-  toggleAllNetworkFilters
-} from 'providers/ReduxStore/slices/logs';
-import NetworkTab from './NetworkTab';
-import RequestDetailsPanel from './RequestDetailsPanel';
-// import DebugTab from './DebugTab';
-import ErrorDetailsPanel from './ErrorDetailsPanel';
-import StyledWrapper from './StyledWrapper';
-
-const LogIcon = ({ type }) => {
-  const iconProps = { size: 16, strokeWidth: 1.5 };
-  
-  switch (type) {
-    case 'error':
-      return <IconAlertCircle className="log-icon error" {...iconProps} />;
-    case 'warn':
-      return <IconAlertTriangle className="log-icon warn" {...iconProps} />;
-    case 'info':
-      return <IconAlertTriangle className="log-icon info" {...iconProps} />;
-    // case 'debug':
-    //   return <IconBug className="log-icon debug" {...iconProps} />;
-    default:
-      return <IconCode className="log-icon log" {...iconProps} />;
-  }
-};
-
-const LogTimestamp = ({ timestamp }) => {
-  const date = new Date(timestamp);
-  const time = date.toLocaleTimeString('en-US', { 
-    hour12: false, 
-    hour: '2-digit', 
-    minute: '2-digit', 
-    second: '2-digit',
-    fractionalSecondDigits: 3
-  });
-  
-  return <span className="log-timestamp">{time}</span>;
-};
-
-const LogMessage = ({ message, args }) => {
-  const { displayedTheme } = useTheme();
-  
-  const formatMessage = (msg, originalArgs) => {
-    if (originalArgs && originalArgs.length > 0) {
-      return originalArgs.map((arg, index) => {
-        if (typeof arg === 'object' && arg !== null) {
-          return (
-            <div key={index} className="log-object">
-              <ReactJson
-                src={arg}
-                theme={displayedTheme === 'light' ? 'rjv-default' : 'monokai'}
-                iconStyle="triangle"
-                indentWidth={2}
-                collapsed={1}
-                displayDataTypes={false}
-                displayObjectSize={false}
-                enableClipboard={false}
-                name={false}
-                style={{
-                  backgroundColor: 'transparent',
-                  fontSize: '12px',
-                  fontFamily: 'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace'
-                }}
-              />
-            </div>
-          );
-        }
-        return String(arg);
-      });
-    }
-    return msg;
-  };
-
-  const formattedMessage = formatMessage(message, args);
-  
-  return (
-    <span className="log-message">
-      {Array.isArray(formattedMessage) ? formattedMessage.map((item, index) => (
-        <span key={index}>{item} </span>
-      )) : formattedMessage}
-    </span>
-  );
-};
-
-const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const dropdownRef = useRef(null);
-
-  const allFiltersEnabled = Object.values(filters).every(f => f);
-  const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
-
-  useEffect(() => {
-    const handleClickOutside = (event) => {
-      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
-        setIsOpen(false);
-      }
-    };
-
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => document.removeEventListener('mousedown', handleClickOutside);
-  }, []);
-
-  return (
-    <div className="filter-dropdown" ref={dropdownRef}>
-      <button 
-        className="filter-dropdown-trigger"
-        onClick={() => setIsOpen(!isOpen)}
-        title="Filter logs by type"
-      >
-        <IconFilter size={16} strokeWidth={1.5} />
-        <span className="filter-summary">
-          {activeFilters.length === Object.keys(filters).length ? 'All' : `${activeFilters.length}/${Object.keys(filters).length}`}
-        </span>
-        <IconChevronDown size={14} strokeWidth={1.5} />
-      </button>
-      
-      {isOpen && (
-        <div className={`filter-dropdown-menu right`}>
-          <div className="filter-dropdown-header">
-            <span>Filter by Type</span>
-            <button 
-              className="filter-toggle-all"
-              onClick={() => onToggleAll(!allFiltersEnabled)}
-            >
-              {allFiltersEnabled ? 'Hide All' : 'Show All'}
-            </button>
-          </div>
-          
-          <div className="filter-dropdown-options">
-            {Object.entries(filters).map(([filterType, enabled]) => (
-              <label key={filterType} className="filter-option">
-                <input
-                  type="checkbox"
-                  checked={enabled}
-                  onChange={(e) => onFilterToggle(filterType, e.target.checked)}
-                />
-                <div className="filter-option-content">
-                  <LogIcon type={filterType} />
-                  <span className="filter-option-label">{filterType}</span>
-                  <span className="filter-option-count">({logCounts[filterType] || 0})</span>
-                </div>
-              </label>
-            ))}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggleAll }) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const dropdownRef = useRef(null);
-
-  const allFiltersEnabled = Object.values(filters).every(f => f);
-  const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
-
-  const getMethodColor = (method) => {
-    switch (method?.toUpperCase()) {
-      case 'GET': return '#10b981';
-      case 'POST': return '#8b5cf6';
-      case 'PUT': return '#f59e0b';
-      case 'DELETE': return '#ef4444';
-      case 'PATCH': return '#06b6d4';
-      case 'HEAD': return '#6b7280';
-      case 'OPTIONS': return '#84cc16';
-      default: return '#6b7280';
-    }
-  };
-
-  useEffect(() => {
-    const handleClickOutside = (event) => {
-      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
-        setIsOpen(false);
-      }
-    };
-
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => document.removeEventListener('mousedown', handleClickOutside);
-  }, []);
-
-  return (
-    <div className="filter-dropdown" ref={dropdownRef}>
-      <button 
-        className="filter-dropdown-trigger"
-        onClick={() => setIsOpen(!isOpen)}
-        title="Filter requests by method"
-      >
-        <IconFilter size={16} strokeWidth={1.5} />
-        <span className="filter-summary">
-          {activeFilters.length === Object.keys(filters).length ? 'All' : `${activeFilters.length}/${Object.keys(filters).length}`}
-        </span>
-        <IconChevronDown size={14} strokeWidth={1.5} />
-      </button>
-      
-      {isOpen && (
-        <div className={`filter-dropdown-menu right`}>
-          <div className="filter-dropdown-header">
-            <span>Filter by Method</span>
-            <button 
-              className="filter-toggle-all"
-              onClick={() => onToggleAll(!allFiltersEnabled)}
-            >
-              {allFiltersEnabled ? 'Hide All' : 'Show All'}
-            </button>
-          </div>
-          
-          <div className="filter-dropdown-options">
-            {Object.entries(filters).map(([method, enabled]) => (
-              <label key={method} className="filter-option">
-                <input
-                  type="checkbox"
-                  checked={enabled}
-                  onChange={(e) => onFilterToggle(method, e.target.checked)}
-                />
-                <div className="filter-option-content">
-                  <span className="method-badge" style={{ backgroundColor: getMethodColor(method) }}>
-                    {method}
-                  </span>
-                  <span className="filter-option-label">{method}</span>
-                  <span className="filter-option-count">({requestCounts[method] || 0})</span>
-                </div>
-              </label>
-            ))}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-const ConsoleTab = ({ logs, filters, logCounts, onFilterToggle, onToggleAll, onClearLogs }) => {
-  const logsEndRef = useRef(null);
-  const prevLogsCountRef = useRef(0);
-  
-  useEffect(() => {
-    // Only scroll when new logs are added, not when switching tabs
-    if (logsEndRef.current && logs.length > prevLogsCountRef.current) {
-      logsEndRef.current.scrollIntoView({ behavior: 'auto' });
-    }
-    prevLogsCountRef.current = logs.length;
-  }, [logs]);
-
-  const filteredLogs = logs.filter(log => filters[log.type]);
-
-  return (
-    <div className="tab-content">
-      <div className="tab-content-area">
-        {filteredLogs.length === 0 ? (
-          <div className="console-empty">
-            <IconTerminal2 size={48} strokeWidth={1} />
-            <p>No logs to display</p>
-            <span>Logs will appear here as your application runs</span>
-          </div>
-        ) : (
-          <div className="logs-container">
-            {filteredLogs.map((log) => (
-              <div key={log.id} className={`log-entry ${log.type}`}>
-                <div className="log-meta">
-                  <LogTimestamp timestamp={log.timestamp} />
-                  <LogIcon type={log.type} />
-                </div>
-                <LogMessage message={log.message} args={log.args} />
-              </div>
-            ))}
-            <div ref={logsEndRef} />
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const Console = () => {
-  const dispatch = useDispatch();
-  const { logs, filters, activeTab, selectedRequest, selectedError, networkFilters, debugErrors } = useSelector(state => state.logs);
-  const collections = useSelector(state => state.collections.collections);
-  const consoleRef = useRef(null);
-
-  const logCounts = logs.reduce((counts, log) => {
-    counts[log.type] = (counts[log.type] || 0) + 1;
-    return counts;
-  }, {});
-
-  const allRequests = React.useMemo(() => {
-    const requests = [];
-    
-    collections.forEach(collection => {
-      if (collection.timeline) {
-        collection.timeline
-          .filter(entry => entry.type === 'request')
-          .forEach(entry => {
-            requests.push({
-              ...entry,
-              collectionName: collection.name,
-              collectionUid: collection.uid
-            });
-          });
-      }
-    });
-    
-    return requests.sort((a, b) => a.timestamp - b.timestamp);
-  }, [collections]);
-
-  const filteredLogs = logs.filter(log => filters[log.type]);
-  const filteredRequests = allRequests.filter(request => {
-    const method = request.data?.request?.method?.toUpperCase() || 'GET';
-    return networkFilters[method];
-  });
-
-  const requestCounts = allRequests.reduce((counts, request) => {
-    const method = request.data?.request?.method?.toUpperCase() || 'GET';
-    counts[method] = (counts[method] || 0) + 1;
-    return counts;
-  }, {});
-
-  const handleFilterToggle = (filterType, enabled) => {
-    dispatch(updateFilter({ filterType, enabled }));
-  };
-
-  const handleNetworkFilterToggle = (method, enabled) => {
-    dispatch(updateNetworkFilter({ method, enabled }));
-  };
-
-  const handleClearLogs = () => {
-    dispatch(clearLogs());
-  };
-
-  const handleClearDebugErrors = () => {
-    dispatch(clearDebugErrors());
-  };
-
-  const handlecloseConsole = () => {
-    dispatch(closeConsole());
-  };
-
-  const handleToggleAllFilters = (enabled) => {
-    dispatch(toggleAllFilters(enabled));
-  };
-
-  const handleToggleAllNetworkFilters = (enabled) => {
-    dispatch(toggleAllNetworkFilters(enabled));
-  };
-
-  const handleTabChange = (tab) => {
-    dispatch(setActiveTab(tab));
-  };
-
-  const renderTabContent = () => {
-    switch (activeTab) {
-      case 'console':
-        return (
-          <ConsoleTab
-            logs={logs}
-            filters={filters}
-            logCounts={logCounts}
-            onFilterToggle={handleFilterToggle}
-            onToggleAll={handleToggleAllFilters}
-            onClearLogs={handleClearLogs}
-          />
-        );
-      case 'network':
-        return <NetworkTab />;
-      // case 'debug':
-      //   return <DebugTab />;
-      default:
-        return (
-          <ConsoleTab
-            logs={logs}
-            filters={filters}
-            logCounts={logCounts}
-            onFilterToggle={handleFilterToggle}
-            onToggleAll={handleToggleAllFilters}
-            onClearLogs={handleClearLogs}
-          />
-        );
-    }
-  };
-
-  const renderTabControls = () => {
-    switch (activeTab) {
-      case 'console':
-        return (
-          <div className="tab-controls">
-            <div className="filter-controls">
-              <FilterDropdown
-                filters={filters}
-                logCounts={logCounts}
-                onFilterToggle={handleFilterToggle}
-                onToggleAll={handleToggleAllFilters}
-              />
-            </div>
-            <div className="action-controls">
-              <button 
-                className="control-button"
-                onClick={handleClearLogs}
-                title="Clear all logs"
-              >
-                <IconTrash size={16} strokeWidth={1.5} />
-              </button>
-            </div>
-          </div>
-        );
-      case 'network':
-        return (
-          <div className="tab-controls">
-            <div className="filter-controls">
-              <NetworkFilterDropdown
-                filters={networkFilters}
-                requestCounts={requestCounts}
-                onFilterToggle={handleNetworkFilterToggle}
-                onToggleAll={handleToggleAllNetworkFilters}
-              />
-            </div>
-          </div>
-        );
-      // case 'debug':
-      //   return (
-      //     <div className="tab-controls">
-      //       <div className="action-controls">
-      //         {debugErrors.length > 0 && (
-      //           <button 
-      //             className="control-button"
-      //             onClick={handleClearDebugErrors}
-      //             title="Clear all errors"
-      //           >
-      //             <IconTrash size={16} strokeWidth={1.5} />
-      //           </button>
-      //         )}
-      //       </div>
-      //     </div>
-      //   );
-      default:
-        return null;
-    }
-  };
-
-
-
-  return (
-    <StyledWrapper ref={consoleRef}>
-      <div 
-        className="console-resize-handle"
-      />
-      
-      <div className="console-header">
-        <div className="console-tabs">
-          <button 
-            className={`console-tab ${activeTab === 'console' ? 'active' : ''}`}
-            onClick={() => handleTabChange('console')}
-          >
-            <IconTerminal2 size={16} strokeWidth={1.5} />
-            <span>Console</span>
-          </button>
-          
-          <button 
-            className={`console-tab ${activeTab === 'network' ? 'active' : ''}`}
-            onClick={() => handleTabChange('network')}
-          >
-            <IconNetwork size={16} strokeWidth={1.5} />
-            <span>Network</span>
-          </button>
-          
-          {/* <button 
-            className={`console-tab ${activeTab === 'debug' ? 'active' : ''}`}
-            onClick={() => handleTabChange('debug')}
-          >
-            <IconBug size={16} strokeWidth={1.5} />
-            <span>Debug</span>
-          </button> */}
-        </div>
-
-        <div className="console-controls">
-          {renderTabControls()}
-          <button 
-            className="control-button close-button"
-            onClick={handlecloseConsole}
-            title="Close console"
-          >
-            <IconX size={16} strokeWidth={1.5} />
-          </button>
-        </div>
-      </div>
-
-      <div className="console-content">
-        {activeTab === 'network' && selectedRequest ? (
-          <div className="network-with-details">
-            <div className="network-main">
-              {renderTabContent()}
-            </div>
-            <RequestDetailsPanel />
-          </div>
-        ) : activeTab === 'debug' && selectedError ? (
-          <div className="debug-with-details">
-            <div className="debug-main">
-              {renderTabContent()}
-            </div>
-            <ErrorDetailsPanel />
-          </div>
-        ) : (
-          renderTabContent()
-        )}
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default Console; 
--- a/packages/bruno-app/src/components/Devtools/index.js
+++ b/packages/bruno-app/src/components/Devtools/index.js
@@ -1,88 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import Console from './Console';
-
-const MIN_DEVTOOLS_HEIGHT = 150;
-const MAX_DEVTOOLS_HEIGHT = window.innerHeight * 0.7;
-const DEFAULT_DEVTOOLS_HEIGHT = 300;
-
-const Devtools = ({ mainSectionRef }) => {
-  const isDevtoolsOpen = useSelector((state) => state.logs.isConsoleOpen);
-  const [devtoolsHeight, setDevtoolsHeight] = useState(DEFAULT_DEVTOOLS_HEIGHT);
-  const [isResizingDevtools, setIsResizingDevtools] = useState(false);
-
-  const handleDevtoolsResizeStart = useCallback((e) => {
-    e.preventDefault();
-    setIsResizingDevtools(true);
-  }, []);
-
-  const handleDevtoolsResize = useCallback((e) => {
-    if (!isResizingDevtools || !mainSectionRef.current) return;
-    
-    const windowHeight = window.innerHeight;
-    const statusBarHeight = 22;
-    const mouseY = e.clientY;
-    
-    // Calculate new devtools height - expanding upward from bottom
-    const newHeight = windowHeight - mouseY - statusBarHeight;
-    const clampedHeight = Math.min(MAX_DEVTOOLS_HEIGHT, Math.max(MIN_DEVTOOLS_HEIGHT, newHeight));
-    setDevtoolsHeight(clampedHeight);
-
-    // Update main section height
-    if (mainSectionRef.current) {
-      mainSectionRef.current.style.height = `calc(100vh - 22px - ${clampedHeight}px)`;
-    }
-  }, [isResizingDevtools, mainSectionRef]);
-
-  const handleDevtoolsResizeEnd = useCallback(() => {
-    setIsResizingDevtools(false);
-  }, []);
-
-  useEffect(() => {
-    if (isResizingDevtools) {
-      document.addEventListener('mousemove', handleDevtoolsResize);
-      document.addEventListener('mouseup', handleDevtoolsResizeEnd);
-      document.body.style.userSelect = 'none';
-      
-      return () => {
-        document.removeEventListener('mousemove', handleDevtoolsResize);
-        document.removeEventListener('mouseup', handleDevtoolsResizeEnd);
-        document.body.style.userSelect = '';
-      };
-    }
-  }, [isResizingDevtools, handleDevtoolsResize, handleDevtoolsResizeEnd]);
-
-  // Set initial height
-  useEffect(() => {
-    if (mainSectionRef.current && isDevtoolsOpen) {
-      mainSectionRef.current.style.height = `calc(100vh - 22px - ${devtoolsHeight}px)`;
-    }
-  }, [isDevtoolsOpen, devtoolsHeight, mainSectionRef]);
-
-  if (!isDevtoolsOpen) {
-    return null;
-  }
-
-  return (
-    <>
-      <div 
-        onMouseDown={handleDevtoolsResizeStart}
-        style={{
-          height: '4px',
-          cursor: 'row-resize',
-          backgroundColor: isResizingDevtools ? '#0078d4' : 'transparent',
-          transition: 'background-color 0.2s ease',
-          zIndex: 20,
-          position: 'relative'
-        }}
-        onMouseEnter={(e) => e.target.style.backgroundColor = '#0078d4'}
-        onMouseLeave={(e) => e.target.style.backgroundColor = isResizingDevtools ? '#0078d4' : 'transparent'}
-      />
-      <div style={{ height: `${devtoolsHeight}px`, overflow: 'hidden', position: 'relative' }}>
-        <Console />
-      </div>
-    </>
-  );
-};
-
-export default Devtools; 
--- a/packages/bruno-app/src/components/Dropdown/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Dropdown/StyledWrapper.js
@@ -16,7 +16,6 @@ const Wrapper = styled.div`
    border-radius: 3px;
    max-height: 90vh;
    overflow-y: auto;
-    max-width: unset !important;

    .tippy-content {
      padding-left: 0;
--- a/packages/bruno-app/src/components/Dropdown/index.js
+++ b/packages/bruno-app/src/components/Dropdown/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Tippy from '@tippyjs/react';
 import StyledWrapper from './StyledWrapper';

-const Dropdown = ({ icon, children, onCreate, placement, transparent, ...props }) => {
+const Dropdown = ({ icon, children, onCreate, placement, transparent }) => {
  return (
    <StyledWrapper className="dropdown" transparent={transparent}>
      <Tippy
@@ -14,7 +14,6 @@ const Dropdown = ({ icon, children, onCreate, placement, transparent, ...props }
        interactive={true}
        trigger="click"
        appendTo="parent"
-        {...props}
      >
        {icon}
      </Tippy>
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/constants.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/constants.js
@@ -1,11 +0,0 @@
-const sensitiveFields = [
-  'request.auth.oauth2.clientSecret',
-  'request.auth.basic.password',
-  'request.auth.digest.password',
-  'request.auth.wsse.password',
-  'request.auth.ntlm.password',
-  'request.auth.awsv4.secretAccessKey',
-  'request.auth.bearer.token'
-];
-
-export { sensitiveFields };
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
@@ -1,9 +1,8 @@
-import React, { useRef, useEffect, useMemo } from 'react';
+import React, { useRef, useEffect } from 'react';
 import cloneDeep from 'lodash/cloneDeep';
-import { get } from 'lodash';
 import { IconTrash, IconAlertCircle, IconDeviceFloppy, IconRefresh, IconCircleCheck } from '@tabler/icons';
 import { useTheme } from 'providers/Theme';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { selectEnvironment } from 'providers/ReduxStore/slices/collections/actions';
 import SingleLineEditor from 'components/SingleLineEditor';
 import StyledWrapper from './StyledWrapper';
@@ -14,64 +13,11 @@ import { variableNameRegex } from 'utils/common/regex';
 import { saveEnvironment } from 'providers/ReduxStore/slices/collections/actions';
 import toast from 'react-hot-toast';
 import { Tooltip } from 'react-tooltip';
-import SensitiveFieldWarning from 'components/SensitiveFieldWarning';
-import { getGlobalEnvironmentVariables, flattenItems, isItemARequest } from 'utils/collections';
-import { sensitiveFields } from './constants';

 const EnvironmentVariables = ({ environment, collection, setIsModified, originalEnvironmentVariables, onClose }) => {
  const dispatch = useDispatch();
  const { storedTheme } = useTheme();
  const addButtonRef = useRef(null);
-  const { globalEnvironments, activeGlobalEnvironmentUid } = useSelector((state) => state.globalEnvironments);
-
-  let _collection = cloneDeep(collection);
-  
-  const globalEnvironmentVariables = getGlobalEnvironmentVariables({ globalEnvironments, activeGlobalEnvironmentUid });
-  _collection.globalEnvironmentVariables = globalEnvironmentVariables;
-
-  const nonSecretSensitiveVarUsageMap = useMemo(() => {
-    const result = {};
-    if (!collection || !environment?.variables) {
-      return result;
-    }
-    const nonSecretVars = environment.variables.filter((v) => v.enabled && !v.secret && v.name);
-    if (!nonSecretVars.length) {
-      return result;
-    }
-    const varNames = new Set(nonSecretVars.map((v) => v.name));
-    
-    const checkSensitiveField = (obj, fieldPath) => {
-      const value = get(obj, fieldPath);
-      if (typeof value === 'string') {
-        varNames.forEach((varName) => {
-          if (new RegExp(`\{\{\s*${varName}\s*\}\}`).test(value)) {
-            result[varName] = true;
-          }
-        });
-      }
-    };
-
-    const getObjectToProcess = (item) => {
-      if (isItemARequest(item)) {
-        return item.draft || item;
-      }
-      return item.root;
-    };
-
-    const collectionObj = getObjectToProcess(collection);
-    sensitiveFields.forEach((fieldPath) => {
-      checkSensitiveField(collectionObj, fieldPath);
-    });
-    
-    const items = flattenItems(collection.items || []);
-    items.forEach((item) => {
-      const objToProcess = getObjectToProcess(item);
-      sensitiveFields.forEach((fieldPath) => {
-        checkSensitiveField(objToProcess, fieldPath);
-      });
-    });
-    return result;
-  }, [collection, environment]);

  const formik = useFormik({
    enableReinitialize: true,
@@ -108,8 +54,6 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
    }
  });

-  const hasSensitiveUsage = (name) => !!nonSecretSensitiveVarUsageMap[name];
-
  // Effect to track modifications.
  React.useEffect(() => {
    setIsModified(formik.dirty);
@@ -212,23 +156,17 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
                    <ErrorMessage name={`${index}.name`} />
                  </div>
                </td>
-                <td className="flex flex-row flex-nowrap items-center">
+                <td className="flex flex-row flex-nowrap">
                  <div className="overflow-hidden grow w-full relative">
                    <SingleLineEditor
                      theme={storedTheme}
-                      collection={_collection}
+                      collection={collection}
                      name={`${index}.value`}
                      value={variable.value}
                      isSecret={variable.secret}
                      onChange={(newValue) => formik.setFieldValue(`${index}.value`, newValue, true)}
                    />
                  </div>
-                  {!variable.secret && hasSensitiveUsage(variable.name) && (
-                    <SensitiveFieldWarning
-                      fieldName={variable.name}
-                      warningMessage="This variable is used in sensitive fields. Mark it as a secret for security"
-                    />
-                  )}
                </td>
                <td className="text-center">
                  <input
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/ImportEnvironment/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/ImportEnvironment/index.js
@@ -28,10 +28,7 @@ const ImportEnvironment = ({ collection, onClose }) => {
              .then(() => {
                toast.success('Environment imported successfully');
              })
-              .catch((error) => {
-                toast.error('An error occurred while importing the environment');
-                console.error(error);
-              });
+              .catch(() => toast.error('An error occurred while importing the environment'));
          });
      })
      .then(() => {
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/ManageSecrets/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/ManageSecrets/index.js
@@ -9,7 +9,7 @@ const ManageSecrets = ({ onClose }) => {
        <div>
          <p>In any collection, there are secrets that need to be managed.</p>
          <p className="mt-2">These secrets can be anything such as API keys, passwords, or tokens.</p>
-          <p className="mt-4">Bruno offers three approaches to manage secrets in collections.</p>
+          <p className="mt-4">Bruno offers two approaches to manage secrets in collections.</p>
          <p className="mt-2">
            Read more about it in our{' '}
            <a
--- a/packages/bruno-app/src/components/ErrorCapture/index.js
+++ b/packages/bruno-app/src/components/ErrorCapture/index.js
@@ -1,147 +0,0 @@
-import React, { Component, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { addDebugError } from 'providers/ReduxStore/slices/logs';
-
-class ErrorBoundary extends Component {
-  constructor(props) {
-    super(props);
-    this.state = { hasError: false };
-  }
-
-  static getDerivedStateFromError(error) {
-    return { hasError: true };
-  }
-
-  componentDidCatch(error, errorInfo) {
-    if (this.props.onError) {
-      this.props.onError({
-        message: error.message,
-        stack: error.stack,
-        error: error,
-        timestamp: new Date().toISOString()
-      });
-    }
-
-    setTimeout(() => {
-      this.setState({ hasError: false });
-    }, 100);
-  }
-
-  render() {
-    return this.props.children;
-  }
-}
-
-const serializeArgs = (args) => {
-  return args.map(arg => {
-    try {
-      if (arg === null) return 'null';
-      if (arg === undefined) return 'undefined';
-      if (typeof arg === 'string' || typeof arg === 'number' || typeof arg === 'boolean') {
-        return arg;
-      }
-      if (arg instanceof Error) {
-        return {
-          __type: 'Error',
-          name: arg.name,
-          message: arg.message,
-          stack: arg.stack
-        };
-      }
-      if (typeof arg === 'object') {
-        try {
-          return JSON.parse(JSON.stringify(arg));
-        } catch {
-          return String(arg);
-        }
-      }
-      return String(arg);
-    } catch (e) {
-      return '[Unserializable]';
-    }
-  });
-};
-
-// Helper function to extract file and line info from stack trace
-const extractFileInfo = (stack) => {
-  if (!stack) return { filename: null, lineno: null, colno: null };
-  
-  try {
-    const lines = stack.split('\n');
-    for (let line of lines) {
-      if (line.includes('ErrorCapture') || line.trim() === 'Error') continue;
-      
-      const match = line.match(/(?:at\s+.*?\s+)?\(?([^)]+):(\d+):(\d+)\)?/);
-      if (match) {
-        return {
-          filename: match[1],
-          lineno: parseInt(match[2]),
-          colno: parseInt(match[3])
-        };
-      }
-    }
-  } catch (e) {
-    // Ignore parsing errors
-  }
-  
-  return { filename: null, lineno: null, colno: null };
-};
-
-const useGlobalErrorCapture = () => {
-  const dispatch = useDispatch();
-
-  useEffect(() => {
-    const originalConsoleError = console.error;
-
-    console.error = (...args) => {
-      const currentStack = new Error().stack;
-      
-      originalConsoleError.apply(console, args);
-
-      if (currentStack && currentStack.includes('useIpcEvents.js')) {
-        return;
-      }
-
-      const errorMessage = args.join(' ');
-      if (errorMessage.includes('removeConsoleLogListener')) {
-        return;
-      }
-
-      const { filename, lineno, colno } = extractFileInfo(currentStack);
-
-      const serializedArgs = serializeArgs(args);
-
-      dispatch(addDebugError({
-        message: errorMessage,
-        stack: currentStack,
-        filename: filename,
-        lineno: lineno,
-        colno: colno,
-        args: serializedArgs,
-        timestamp: new Date().toISOString()
-      }));
-    };
-
-    return () => {
-      console.error = originalConsoleError;
-    };
-  }, [dispatch]);
-};
-
-const ErrorCapture = ({ children }) => {
-  const dispatch = useDispatch();
-  
-  useGlobalErrorCapture();
-
-  const handleReactError = (errorData) => {
-    dispatch(addDebugError(errorData));
-  };
-
-  return (
-    <ErrorBoundary onError={handleReactError}>
-      {children}
-    </ErrorBoundary>
-  );
-};
-
-export default ErrorCapture; 
--- a/packages/bruno-app/src/components/FolderSettings/Auth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/FolderSettings/Auth/StyledWrapper.js
@@ -11,12 +11,6 @@ const Wrapper = styled.div`
    border: solid 1px ${(props) => props.theme.input.border};
    background-color: ${(props) => props.theme.input.bg};
  }
-  .inherit-mode-text {
-    color: ${(props) => props.theme.colors.text.yellow};
-  }
-  .auth-mode-label {
-    color: ${(props) => props.theme.colors.text.yellow};
-  }
 `;

 export default Wrapper; 
--- a/packages/bruno-app/src/components/FolderSettings/Auth/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Auth/index.js
@@ -7,17 +7,8 @@ import { updateFolderAuth } from 'providers/ReduxStore/slices/collections';
 import { useDispatch } from 'react-redux';
 import OAuth2PasswordCredentials from 'components/RequestPane/Auth/OAuth2/PasswordCredentials/index';
 import OAuth2ClientCredentials from 'components/RequestPane/Auth/OAuth2/ClientCredentials/index';
-import OAuth2Implicit from 'components/RequestPane/Auth/OAuth2/Implicit/index';
 import GrantTypeSelector from 'components/RequestPane/Auth/OAuth2/GrantTypeSelector/index';
 import AuthMode from '../AuthMode';
-import BasicAuth from 'components/RequestPane/Auth/BasicAuth';
-import BearerAuth from 'components/RequestPane/Auth/BearerAuth';
-import DigestAuth from 'components/RequestPane/Auth/DigestAuth';
-import NTLMAuth from 'components/RequestPane/Auth/NTLMAuth';
-import WsseAuth from 'components/RequestPane/Auth/WsseAuth';
-import ApiKeyAuth from 'components/RequestPane/Auth/ApiKeyAuth';
-import AwsV4Auth from 'components/RequestPane/Auth/AwsV4Auth';
-import { findItemInCollection, findParentItemInCollection, humanizeRequestAuthMode } from 'utils/collections/index';

 const GrantTypeComponentMap = ({ collection, folder }) => {
  const dispatch = useDispatch();
@@ -36,8 +27,6 @@ const GrantTypeComponentMap = ({ collection, folder }) => {
      return <OAuth2AuthorizationCode save={save} item={folder} request={request} updateAuth={updateFolderAuth} collection={collection} folder={folder} />;
    case 'client_credentials':
      return <OAuth2ClientCredentials save={save} item={folder} request={request} updateAuth={updateFolderAuth} collection={collection} folder={folder} />;
-    case 'implicit':
-      return <OAuth2Implicit save={save} item={folder} request={request} updateAuth={updateFolderAuth} collection={collection} folder={folder} />;
    default:
      return <div>TBD</div>;
  }
@@ -48,132 +37,12 @@ const Auth = ({ collection, folder }) => {
  let request = get(folder, 'root.request', {});
  const authMode = get(folder, 'root.request.auth.mode');

-  const getTreePathFromCollectionToFolder = (collection, _folder) => {
-    let path = [];
-    let item = findItemInCollection(collection, _folder?.uid);
-    while (item) {
-      path.unshift(item);
-      item = findParentItemInCollection(collection, item?.uid);
-    }
-    return path;
-  };
-
-  const getEffectiveAuthSource = () => {
-    if (authMode !== 'inherit') return null;
-
-    const collectionAuth = get(collection, 'root.request.auth');
-    let effectiveSource = {
-      type: 'collection',
-      name: 'Collection',
-      auth: collectionAuth
-    };
-
-    // Get path from collection to current folder
-    const folderTreePath = getTreePathFromCollectionToFolder(collection, folder);
-    
-    // Check parent folders to find closest auth configuration
-    // Skip the last item which is the current folder
-    for (let i = 0; i < folderTreePath.length - 1; i++) {
-      const parentFolder = folderTreePath[i];
-      if (parentFolder.type === 'folder') {
-        const folderAuth = get(parentFolder, 'root.request.auth');
-        if (folderAuth && folderAuth.mode && folderAuth.mode !== 'inherit') {
-          effectiveSource = {
-            type: 'folder',
-            name: parentFolder.name,
-            auth: folderAuth
-          };
-          break;
-        }
-      }
-    }
-
-    return effectiveSource;
-  };
-
  const handleSave = () => {
    dispatch(saveFolderRoot(collection.uid, folder.uid));
  };

  const getAuthView = () => {
    switch (authMode) {
-      case 'basic': {
-        return (
-          <BasicAuth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
-      case 'bearer': {
-        return (
-          <BearerAuth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
-      case 'digest': {
-        return (
-          <DigestAuth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
-      case 'ntlm': {
-        return (
-          <NTLMAuth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
-      case 'wsse': {
-        return (
-          <WsseAuth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
-      case 'apikey': {
-        return (
-          <ApiKeyAuth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
-      case 'awsv4': {
-        return (
-          <AwsV4Auth
-            collection={collection}
-            item={folder}
-            updateAuth={updateFolderAuth}
-            request={request}
-            save={() => handleSave()}
-          />
-        );
-      }
      case 'oauth2': {
        return (
          <>
@@ -187,17 +56,6 @@ const Auth = ({ collection, folder }) => {
          </>
        );
      }
-      case 'inherit': {
-        const source = getEffectiveAuthSource();
-        return (
-          <>
-            <div className="flex flex-row w-full mt-2 gap-2">
-              <div>Auth inherited from {source.name}: </div>
-              <div className="inherit-mode-text">{humanizeRequestAuthMode(source.auth?.mode)}</div>
-            </div>
-          </>
-        );
-      }
      case 'none': {
        return null;
      }
@@ -206,7 +64,6 @@ const Auth = ({ collection, folder }) => {
    }
  };

-
  return (
    <StyledWrapper className="w-full">
      <div className="text-xs mb-4 text-muted">
--- a/packages/bruno-app/src/components/FolderSettings/AuthMode/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/AuthMode/index.js
@@ -35,51 +35,6 @@ const AuthMode = ({ collection, folder }) => {
    <StyledWrapper>
      <div className="inline-flex items-center cursor-pointer">
        <Dropdown onCreate={onDropdownCreate} icon={<Icon />} placement="bottom-end">      
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('awsv4');
-            }}
-          >
-            AWS Sig v4
-          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('basic');
-            }}
-          >
-            Basic Auth
-          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('bearer');
-            }}
-          >
-            Bearer Token
-          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('digest');
-            }}
-          >
-            Digest Auth
-          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('ntlm');
-            }}
-          >
-            NTLM Auth
-          </div>
          <div
            className="dropdown-item"
            onClick={() => {
@@ -89,33 +44,6 @@ const AuthMode = ({ collection, folder }) => {
          >
            OAuth 2.0
          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('wsse');
-            }}
-          >
-            WSSE Auth
-          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('apikey');
-            }}
-          >
-            API Key
-          </div>
-          <div
-            className="dropdown-item"
-            onClick={() => {
-              dropdownTippyRef.current.hide();
-              onModeChange('inherit');
-            }}
-          >
-            Inherit
-          </div>
          <div
            className="dropdown-item"
            onClick={() => {
--- a/packages/bruno-app/src/components/FolderSettings/Headers/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Headers/index.js
@@ -1,31 +1,20 @@
-import React, { useState } from 'react';
+import React from 'react';
 import get from 'lodash/get';
 import cloneDeep from 'lodash/cloneDeep';
 import { IconTrash } from '@tabler/icons';
 import { useDispatch } from 'react-redux';
 import { useTheme } from 'providers/Theme';
-import { addFolderHeader, updateFolderHeader, deleteFolderHeader, setFolderHeaders } from 'providers/ReduxStore/slices/collections';
+import { addFolderHeader, updateFolderHeader, deleteFolderHeader } from 'providers/ReduxStore/slices/collections';
 import { saveFolderRoot } from 'providers/ReduxStore/slices/collections/actions';
 import SingleLineEditor from 'components/SingleLineEditor';
 import StyledWrapper from './StyledWrapper';
 import { headers as StandardHTTPHeaders } from 'know-your-http-well';
-import { MimeTypes } from 'utils/codemirror/autocompleteConstants';
-import BulkEditor from 'components/BulkEditor/index';
 const headerAutoCompleteList = StandardHTTPHeaders.map((e) => e.header);

 const Headers = ({ collection, folder }) => {
  const dispatch = useDispatch();
  const { storedTheme } = useTheme();
  const headers = get(folder, 'root.request.headers', []);
-  const [isBulkEditMode, setIsBulkEditMode] = useState(false);
-
-  const toggleBulkEditMode = () => {
-    setIsBulkEditMode(!isBulkEditMode);
-  };
-
-  const handleBulkHeadersChange = (newHeaders) => {
-    dispatch(setFolderHeaders({ collectionUid: collection.uid, folderUid: folder.uid, headers: newHeaders }));
-  };

  const addHeader = () => {
    dispatch(
@@ -72,22 +61,6 @@ const Headers = ({ collection, folder }) => {
    );
  };

-  if (isBulkEditMode) {
-    return (
-      <StyledWrapper className="w-full">
-        <div className="text-xs mb-4 text-muted">
-          Request headers that will be sent with every request inside this folder.
-        </div>
-        <BulkEditor
-          params={headers}
-          onChange={handleBulkHeadersChange}
-          onToggle={toggleBulkEditMode}
-          onSave={handleSave}
-        />
-      </StyledWrapper>
-    );
-  }
-
  return (
    <StyledWrapper className="w-full">
      <div className="text-xs mb-4 text-muted">
@@ -144,7 +117,6 @@ const Headers = ({ collection, folder }) => {
                        }
                        collection={collection}
                        item={folder}
-                        autocomplete={MimeTypes}
                      />
                    </td>
                    <td>
@@ -167,14 +139,9 @@ const Headers = ({ collection, folder }) => {
            : null}
        </tbody>
      </table>
-      <div className="flex justify-between mt-2">
-        <button className="btn-add-header text-link pr-2 py-3 select-none" onClick={addHeader}>
-          + Add Header
-        </button>
-        <button className="text-link select-none" onClick={toggleBulkEditMode}>
-          Bulk Edit
-        </button>
-      </div>
+      <button className="btn-add-header text-link pr-2 py-3 mt-2 select-none" onClick={addHeader}>
+        + Add Header
+      </button>

      <div className="mt-6">
        <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
--- a/packages/bruno-app/src/components/FolderSettings/Script/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Script/index.js
@@ -55,7 +55,6 @@ const Script = ({ collection, folder }) => {
          onSave={handleSave}
          font={get(preferences, 'font.codeFont', 'default')}
          fontSize={get(preferences, 'font.codeFontSize')}
-          showHintsFor={['req', 'bru']}
        />
      </div>
      <div className="flex flex-col flex-1 mt-2 gap-y-2">
@@ -69,7 +68,6 @@ const Script = ({ collection, folder }) => {
          onSave={handleSave}
          font={get(preferences, 'font.codeFont', 'default')}
          fontSize={get(preferences, 'font.codeFontSize')}
-          showHintsFor={['req', 'res', 'bru']}
        />
      </div>

--- a/packages/bruno-app/src/components/FolderSettings/Tests/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Tests/index.js
@@ -38,7 +38,6 @@ const Tests = ({ collection, folder }) => {
        onSave={handleSave}
        font={get(preferences, 'font.codeFont', 'default')}
        fontSize={get(preferences, 'font.codeFontSize')}
-        showHintsFor={['req', 'res', 'bru']}
      />

      <div className="mt-6">
--- a/packages/bruno-app/src/components/FolderSettings/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/index.js
@@ -9,9 +9,17 @@ import StyledWrapper from './StyledWrapper';
 import Vars from './Vars';
 import Documentation from './Documentation';
 import Auth from './Auth';
-import StatusDot from 'components/StatusDot';
+import DotIcon from 'components/Icons/Dot';
 import get from 'lodash/get';

+const ContentIndicator = () => {
+  return (
+    <sup className="ml-[.125rem] opacity-80 font-medium">
+      <DotIcon width="10"></DotIcon>
+    </sup>
+  );
+};
+
 const FolderSettings = ({ collection, folder }) => {
  const dispatch = useDispatch();
  let tab = 'headers';
@@ -20,7 +28,7 @@ const FolderSettings = ({ collection, folder }) => {
    tab = folderLevelSettingsSelectedTab[folder?.uid];
  }

-  const folderRoot = folder?.root;
+  const folderRoot = collection?.items.find((item) => item.uid === folder?.uid)?.root;
  const hasScripts = folderRoot?.request?.script?.res || folderRoot?.request?.script?.req;
  const hasTests = folderRoot?.request?.tests;

@@ -74,7 +82,7 @@ const FolderSettings = ({ collection, folder }) => {
  };

  return (
-    <StyledWrapper className="flex flex-col h-full overflow-auto">
+    <StyledWrapper className="flex flex-col h-full">
      <div className="flex flex-col h-full relative px-4 py-4">
        <div className="flex flex-wrap items-center tabs" role="tablist">
          <div className={getTabClassname('headers')} role="tab" onClick={() => setTab('headers')}>
@@ -83,11 +91,11 @@ const FolderSettings = ({ collection, folder }) => {
          </div>
          <div className={getTabClassname('script')} role="tab" onClick={() => setTab('script')}>
            Script
-            {hasScripts && <StatusDot />}
+            {hasScripts && <ContentIndicator />}
          </div>
          <div className={getTabClassname('test')} role="tab" onClick={() => setTab('test')}>
            Test
-            {hasTests && <StatusDot />}
+            {hasTests && <ContentIndicator />}
          </div>
          <div className={getTabClassname('vars')} role="tab" onClick={() => setTab('vars')}>
            Vars
@@ -95,13 +103,13 @@ const FolderSettings = ({ collection, folder }) => {
          </div>
          <div className={getTabClassname('auth')} role="tab" onClick={() => setTab('auth')}>
            Auth
-            {hasAuth && <StatusDot />}
+            {hasAuth && <ContentIndicator />}
          </div>
          <div className={getTabClassname('docs')} role="tab" onClick={() => setTab('docs')}>
            Docs
          </div>
        </div>
-        <section className={`flex mt-4 h-full overflow-auto`}>{getTabPanel(tab)}</section>
+        <section className={`flex mt-4 h-full`}>{getTabPanel(tab)}</section>
      </div>
    </StyledWrapper>
  );
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`* @helloanoop @maintainer-bruno @bijin-bruno @lohit-bruno @naman-bruno`